This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 1a8fad3a45 Fixed typos, cleanup
1a8fad3a45 is described below
commit 1a8fad3a45e319912d991e04345d6f7da96dd531
Author: mseidel <msei...@apache.org>
AuthorDate: Thu Mar 27 15:12:15 2025 +0100
Fixed typos, cleanup
(cherry picked from commit e901e6e41c1fd2ceb1d01c5bbfa2b102c167f93f)
---
main/connectivity/source/inc/TSortIndex.hxx | 25 +--
.../test/deployment/update/publisher/readme.txt | 58 +++---
main/desktop/test/deployment/update/readme.txt | 37 ++--
.../sun/star/comp/xsltfilter/XSLTransformer.java | 26 ++-
main/framework/source/services/pathsettings.cxx | 88 ++++-----
main/sd/source/core/drawdoc.cxx | 214 +++++++++------------
main/solenv/bin/modules/installer/windows/media.pm | 16 +-
main/svx/source/inc/fmshimp.hxx | 111 +++++------
main/sw/source/ui/inc/usrpref.hxx | 63 +++---
9 files changed, 306 insertions(+), 332 deletions(-)
diff --git a/main/connectivity/source/inc/TSortIndex.hxx
b/main/connectivity/source/inc/TSortIndex.hxx
index 0fef396bfe..ea75c9feeb 100644
--- a/main/connectivity/source/inc/TSortIndex.hxx
+++ b/main/connectivity/source/inc/TSortIndex.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef CONNECTIVITY_TSORTINDEX_HXX
#define CONNECTIVITY_TSORTINDEX_HXX
@@ -55,15 +54,15 @@ namespace connectivity
typedef ::std::vector<OKeyType>
TKeyTypeVector;
private:
- TIntValuePairVector m_aKeyValues;
- TKeyTypeVector m_aKeyType;
- ::std::vector<TAscendingOrder> m_aAscending;
- sal_Bool m_bFrozen;
+ TIntValuePairVector m_aKeyValues;
+ TKeyTypeVector m_aKeyType;
+ ::std::vector<TAscendingOrder> m_aAscending;
+ sal_Bool
m_bFrozen;
public:
OSortIndex( const ::std::vector<OKeyType>& _aKeyType,
- const ::std::vector<TAscendingOrder>& _aAscending);
+ const ::std::vector<TAscendingOrder>&
_aAscending);
~OSortIndex();
@@ -91,7 +90,7 @@ namespace connectivity
void Freeze();
/**
- CreateKeySet creates the keyset which vaalues could be
used to travel in your table/result
+ CreateKeySet creates the keyset which values could be
used to travel in your table/result
The returned keyset is frozen.
*/
::vos::ORef<OKeySet> CreateKeySet();
@@ -109,7 +108,7 @@ namespace connectivity
sal_Int32 GetValue(sal_Int32 nPos) const;
inline const ::std::vector<OKeyType>& getKeyType() const {
return m_aKeyType; }
- inline TAscendingOrder
getAscending(::std::vector<TAscendingOrder>::size_type _nPos) const { return
m_aAscending[_nPos]; }
+ inline TAscendingOrder
getAscending(::std::vector<TAscendingOrder>::size_type _nPos) const { return
m_aAscending[_nPos]; }
};
@@ -133,3 +132,5 @@ namespace connectivity
};
}
#endif // CONNECTIVITY_TSORTINDEX_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/desktop/test/deployment/update/publisher/readme.txt
b/main/desktop/test/deployment/update/publisher/readme.txt
index 1a659d8e87..e4f307ed89 100644
--- a/main/desktop/test/deployment/update/publisher/readme.txt
+++ b/main/desktop/test/deployment/update/publisher/readme.txt
@@ -5,7 +5,7 @@
Both element contain localized child elements.
-The following table shows what localized item is used, when the Office the
locale
+The following table shows what localized item is used, when the Office the
locale
en-US uses.
@@ -15,7 +15,7 @@ Installed office en-US
| publisher | release notes
=============================================
pub1.oxt | en-US | en-US
----------------------------------------------
+---------------------------------------------
pub2.oxt | en-US-region1 | en-US-region1
---------------------------------------------
pub3.oxt | en | en
@@ -41,7 +41,7 @@ pub8.oxt
================================================================================
Need not be committed in extensions/www/testarea/desktop.
-pub8.oxt is intended for tests with extensions.services.openoffice.org.
+pub8.oxt is intended for tests with extensions.openoffice.org.
It does not contain <update-information>. That is, the Extension Manager will
obtain
the update information from the repository as feed:
@@ -54,15 +54,15 @@ Test
----
Repository:
--Create the new extension in the repository.
+-Create the new extension in the repository.
-Provide a company name and a URL to the company website. This setting should
be ignored
- when generating the udpate feed. Instead the publisher name from the
extension is used.
+ when generating the update feed. Instead the publisher name from the
extension is used.
Enter "Publisher Title" : some arbitrary company
"Publisher URL": any arbitrary URL but not:
http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US.html
-
--Create a new release for the extension. Upload the version 2.0
(update/pub8.oxt).
- Provide release notes. These release notes should later not be seen when
clicking on
+
+-Create a new release for the extension. Upload the version 2.0
(update/pub8.oxt).
+ Provide release notes. These release notes should later not be seen when
clicking on
the release notes link.
@@ -77,7 +77,7 @@ Result:
The Update Dialog should show the publisher name as provided in the
description.xml. For example,
when lang=en-US was selected: My OpenOffice en-US
-A release notes link is displayed with an URL to the release notes as provided
in
+A release notes link is displayed with an URL to the release notes as provided
in
the description.xml. For example, when lang=en-US was selected:
"http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US.html
@@ -101,15 +101,15 @@ Test
----
Repository:
--Create the new extension in the repository.
+-Create the new extension in the repository.
-Provide a company name and a URL to the company website. This setting should
be ignored
- when generating the udpate feed. Instead the publisher name from the
extension is used.
+ when generating the update feed. Instead the publisher name from the
extension is used.
Enter "Publisher Title" : some arbitrary company name
"Publisher URL": any arbitrary URL but not:
http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US.html
-
--Create a new release for the extension. Upload the version 2.0
(update/pub9.oxt).
- Provide release notes. These release notes should later be displayed when
clicking on
+
+-Create a new release for the extension. Upload the version 2.0
(update/pub9.oxt).
+ Provide release notes. These release notes should later be displayed when
clicking on
the release notes link.
@@ -146,12 +146,12 @@ Test
----
Repository:
--Create the new extension in the repository.
--Provide a company name and a URL to the company website. They should then be
in the udpate
- feed.
-
--Create a new release for the extension. Upload the version 2.0
(update/pub10.oxt).
- Provide release notes. These release notes should NOT be displayed when
clicking on
+-Create the new extension in the repository.
+-Provide a company name and a URL to the company website. They should then be
in the update
+ feed.
+
+-Create a new release for the extension. Upload the version 2.0
(update/pub10.oxt).
+ Provide release notes. These release notes should NOT be displayed when
clicking on
the release notes link. Instead the release notes provided by pub10.oxt
should be displayed.
@@ -165,8 +165,8 @@ Office:
Result:
The Update Dialog should show the publisher name as provided in the repository.
-A release notes link is displayed with an URL to the release notes as provided
in the
-pub10.oxt. For example, when the locale of the office is en-US then this page
will be
+A release notes link is displayed with an URL to the release notes as provided
in the
+pub10.oxt. For example, when the locale of the office is en-US then this page
will be
displayed:
For example,
when lang=en-US was selected: My OpenOffice en-US
@@ -189,13 +189,13 @@ Test
----
Repository:
--Create the new extension in the repository.
--Provide a company name and a URL to the company website. They should then be
in the udpate
- feed.
-
--Create a new release for the extension. Upload the version 2.0
(update/pub11.oxt).
- Provide release notes. These release notes should be displayed when clicking
on
- the release notes link.
+-Create the new extension in the repository.
+-Provide a company name and a URL to the company website. They should then be
in the update
+ feed.
+
+-Create a new release for the extension. Upload the version 2.0
(update/pub11.oxt).
+ Provide release notes. These release notes should be displayed when clicking
on
+ the release notes link.
Office:
diff --git a/main/desktop/test/deployment/update/readme.txt
b/main/desktop/test/deployment/update/readme.txt
index 83c4b83e8e..83d41ddba1 100644
--- a/main/desktop/test/deployment/update/readme.txt
+++ b/main/desktop/test/deployment/update/readme.txt
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,51 +7,50 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-The extensions in the subdirectories of the update folder are used for
-testing the online update feature of extensions. The folder such as
+The extensions in the subdirectories of the update folder are used for
+testing the online update feature of extensions. The folder such as
simple,
license,
-defect, etc. contain extensions which can be installed in OOo. The
-corresponding update information file and the update are located on
+defect, etc. contain extensions which can be installed in AOO. The
+corresponding update information file and the update are located on
the extensions.openoffice.org website (cvs: extensions/www/testarea). For
example:
desktop/test/deployment/update/simple/plain1.oxt
-is version 1 of this extension and it references
+is version 1 of this extension and it references
-http://extensions.openoffice.org/testarea/desktop/simple/update/plain1.update.xml
+https://extensions.openoffice.org/testarea/desktop/simple/update/plain1.update.xml
-which in turn references version 2 at
+which in turn references version 2 at
-http://extensions.openoffice.org/testarea/desktop/simple/update/plain1.oxt
+https://extensions.openoffice.org/testarea/desktop/simple/update/plain1.oxt
-To have all in one place the update information file and the update are also
contained
+To have all in one place the update information file and the update are also
contained
in the desktop project. They are in the update subfolder of the different test
folders.
For example
.../update/simple/update
.../update/license/update
-.../update/updatefeed/udpate
+.../update/updatefeed/update
-The different test folders for the update are also committed in project
extensions/www
-so that the files can be obtain via an URL. The structure and the contents is
about the
-same as the content
-of desktop/test/deployment/udpate
+The different test folders for the update are also committed in project
extensions/www
+so that the files can be obtain via an URL. The structure and the contents is
about the
+same as the content
+of desktop/test/deployment/update
For example in
extensions/www/testarea/desktop
diff --git
a/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
b/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
index c40ec3f55a..d0cedc96ab 100644
---
a/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
+++
b/main/filter/source/xsltfilter/com/sun/star/comp/xsltfilter/XSLTransformer.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,23 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
package com.sun.star.comp.xsltfilter;
-
-
-//Standard Java classes
+// Standard Java classes
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
@@ -51,7 +49,7 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-//StarOffice Interfaces and UNO
+// OpenOffice Interfaces and UNO
import com.sun.star.beans.NamedValue;
import com.sun.star.comp.loader.FactoryHelper;
import com.sun.star.io.XActiveDataControl;
@@ -72,7 +70,7 @@ import com.sun.star.uno.AnyConverter;
import com.sun.star.uno.Type;
import com.sun.star.uno.UnoRuntime;
-//Uno to java Adaptor
+// Uno to java Adaptor
import com.sun.star.lib.uno.adapter.XInputStreamToInputStreamAdapter;
import com.sun.star.lib.uno.adapter.XOutputStreamToOutputStreamAdapter;
import javax.xml.transform.Templates;
@@ -89,7 +87,7 @@ public class XSLTransformer
/**
* This component provides java based XSL transformations
- * A SAX based interface is not feasible when crossing language bordes
+ * A SAX based interface is not feasible when crossing language borders
* since too much time would be wasted by bridging the events between
environments
* example: 190 pages document, 82000 events 8seconds transform 40(!) sec.
bridging
*
@@ -217,7 +215,7 @@ public class XSLTransformer
@Override
public void run() {
- // Local variabes used outside try block in finally block
+ // Local variables used outside try block in finally block
InputStream is = null;
Source source = null;
BufferedOutputStream os = null;
@@ -246,7 +244,7 @@ public class XSLTransformer
is = new BufferedInputStream(
new XInputStreamToInputStreamAdapter(m_xis));
- //Source xmlsource = new StreamSource(xmlinput);
+ //Source xmlsource = new StreamSource(xmlinput);
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setValidating(false);
spf.setNamespaceAware(true);
@@ -284,7 +282,7 @@ public class XSLTransformer
(transformation = ((Transformation)
ref.get())) == null ||
((Transformation) ref.get()).lastmod <
lastmod) {
// we cannot find a valid reference for this
stylesheet
- // or the stylsheet was updated
+ // or the stylesheet was updated
if (ref != null) {
xsltReferences.remove(stylesheeturl);
}
@@ -307,7 +305,7 @@ public class XSLTransformer
xsltTemplate = transformation.cachedXSLT;
transformer =
xsltTemplate.newTransformer();
transformer.setOutputProperty("encoding", "UTF-8");
- //
transformer.setURIResolver(XSLTransformer.this);
+ // transformer.setURIResolver(XSLTransformer.this);
// invalid to set 'null' as parameter as 'null' is not a
valid Java object
if (sourceurl != null) {
diff --git a/main/framework/source/services/pathsettings.cxx
b/main/framework/source/services/pathsettings.cxx
index 8b1fbe4490..6b8bbae785 100644
--- a/main/framework/source/services/pathsettings.cxx
+++ b/main/framework/source/services/pathsettings.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_framework.hxx"
// ______________________________________________
@@ -85,7 +83,7 @@ const sal_Int32 IDGROUP_COUNT = 4;
sal_Int32 impl_getPropGroup(sal_Int32 nID)
{
- return (nID % IDGROUP_COUNT);
+ return (nID % IDGROUP_COUNT);
}
// ______________________________________________
@@ -129,7 +127,7 @@ DEFINE_INIT_SERVICE ( PathSettings,
/*Attention
I think we don't need any
mutex or lock here ... because we are called by our own static method
impl_createInstance()
to create a new instance
of this class by our own supported service factory.
- see macro
DEFINE_XSERVICEINFO_MULTISERVICE and "impl_initService()" for further
informations!
+ see macro
DEFINE_XSERVICEINFO_MULTISERVICE and "impl_initService()" for further
information!
*/
// fill cache
@@ -240,9 +238,9 @@ void PathSettings::impl_readAll()
// NO substitution here ! It's done outside ...
OUStringList PathSettings::impl_readOldFormat(const ::rtl::OUString& sPath)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "ocke.jans...@sun.com",
"PathSettings::impl_readOldFormat" );
- css::uno::Reference< css::container::XNameAccess > xCfg( fa_getCfgOld() );
- OUStringList aPathVal;
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework",
"ocke.jans...@sun.com", "PathSettings::impl_readOldFormat" );
+ css::uno::Reference< css::container::XNameAccess > xCfg( fa_getCfgOld()
);
+ OUStringList aPathVal;
if( xCfg->hasByName(sPath) )
{
@@ -261,7 +259,7 @@ OUStringList PathSettings::impl_readOldFormat(const
::rtl::OUString& sPath)
}
}
- return aPathVal;
+ return aPathVal;
}
//-----------------------------------------------------------------------------
@@ -289,16 +287,16 @@ PathSettings::PathInfo
PathSettings::impl_readNewFormat(const ::rtl::OUString& s
// read state props
xPath->getByName(CFGPROP_ISSINGLEPATH) >>= aPathVal.bIsSinglePath;
-
+
// analyze finalized/mandatory states
aPathVal.bIsReadonly = sal_False;
css::uno::Reference< css::beans::XProperty > xInfo(xPath,
css::uno::UNO_QUERY);
if (xInfo.is())
{
css::beans::Property aInfo = xInfo->getAsProperty();
- sal_Bool bFinalized = ((aInfo.Attributes &
css::beans::PropertyAttribute::READONLY ) ==
css::beans::PropertyAttribute::READONLY );
+ sal_Bool bFinalized = ((aInfo.Attributes &
css::beans::PropertyAttribute::READONLY ) ==
css::beans::PropertyAttribute::READONLY );
//sal_Bool bMandatory = ((aInfo.Attributes &
css::beans::PropertyAttribute::REMOVEABLE) !=
css::beans::PropertyAttribute::REMOVEABLE);
-
+
// Note: Till we support finalized / mandatory on our API more in
detail we handle
// all states simple as READONLY ! But because all really needed paths
are "mandatory" by default
// we have to handle "finalized" as the real "readonly" indicator .
@@ -317,9 +315,9 @@ void PathSettings::impl_storePath(const
PathSettings::PathInfo& aPath)
css::uno::Reference< css::container::XNameAccess > xCfgNew =
fa_getCfgNew();
css::uno::Reference< css::container::XNameAccess > xCfgOld =
fa_getCfgOld();
- // try to replace path-parts with well known and uspported variables.
- // So an office can be moved easialy to another location without losing
- // it's related paths.
+ // try to replace path-parts with well known and supported variables.
+ // So an office can be moved easily to another location without losing
+ // its related paths.
PathInfo aResubstPath(aPath);
impl_subst(aResubstPath, sal_True);
@@ -405,7 +403,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const
::rtl::OUString& sPa
aPath.sPathName = sPath;
// replace all might existing variables with real values
// Do it before these old paths will be compared against the
- // new path configuration. Otherwise some striungs uses different
variables ... but substitution
+ // new path configuration. Otherwise some strings uses different
variables ... but substitution
// will produce strings with same content (because some variables are
redundant!)
impl_subst(aPath, sal_False);
}
@@ -424,7 +422,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const
::rtl::OUString& sPa
OUStringList lOldVals = impl_readOldFormat(sPath);
// replace all might existing variables with real values
// Do it before these old paths will be compared against the
- // new path configuration. Otherwise some striungs uses different
variables ... but substitution
+ // new path configuration. Otherwise some strings uses different
variables ... but substitution
// will produce strings with same content (because some variables are
redundant!)
impl_subst(lOldVals, fa_getSubstitution(), sal_False);
impl_mergeOldUserPaths(aPath, lOldVals);
@@ -846,7 +844,7 @@ void PathSettings::impl_setPathValue( sal_Int32
nID ,
throw css::container::NoSuchElementException();
// We work on a copied path ... so we can be sure that errors during this
operation
- // does not make our internal cache invalid .-)
+ // does not make our internal cache invalid .-)
PathSettings::PathInfo aChangePath(*pOrgPath);
switch(impl_getPropGroup(nID))
@@ -948,7 +946,7 @@ void PathSettings::impl_setPathValue( sal_Int32
nID ,
*/
// first we should try to store the changed (copied!) path ...
- // In case an error occure on saving time an exception is thrown ...
+ // In case an error occurs on saving time an exception is thrown ...
// If no exception occurs we can update our internal cache (means
// we can overwrite pOrgPath !
impl_storePath(aChangePath);
@@ -968,38 +966,38 @@ sal_Bool PathSettings::impl_isValidPath(const
OUStringList& lPath) const
return sal_False;
}
- return sal_True;
+ return sal_True;
}
//-----------------------------------------------------------------------------
sal_Bool PathSettings::impl_isValidPath(const ::rtl::OUString& sPath) const
{
- // allow empty path to reset a path.
+ // allow empty path to reset a path.
// idea by LLA to support empty paths
-// if (sPath.getLength() == 0)
-// {
-// return sal_True;
-// }
-
- return (! INetURLObject(sPath).HasError());
+// if (sPath.getLength() == 0)
+// {
+// return sal_True;
+// }
+
+ return (! INetURLObject(sPath).HasError());
}
//-----------------------------------------------------------------------------
::rtl::OUString impl_extractBaseFromPropName(const ::rtl::OUString& sPropName)
{
- sal_Int32 i = -1;
-
- i = sPropName.indexOf(POSTFIX_INTERNAL_PATHES);
- if (i > -1)
- return sPropName.copy(0, i);
- i = sPropName.indexOf(POSTFIX_USER_PATHES);
- if (i > -1)
- return sPropName.copy(0, i);
- i = sPropName.indexOf(POSTFIX_WRITE_PATH);
- if (i > -1)
- return sPropName.copy(0, i);
-
- return sPropName;
+ sal_Int32 i = -1;
+
+ i = sPropName.indexOf(POSTFIX_INTERNAL_PATHES);
+ if (i > -1)
+ return sPropName.copy(0, i);
+ i = sPropName.indexOf(POSTFIX_USER_PATHES);
+ if (i > -1)
+ return sPropName.copy(0, i);
+ i = sPropName.indexOf(POSTFIX_WRITE_PATH);
+ if (i > -1)
+ return sPropName.copy(0, i);
+
+ return sPropName;
}
//-----------------------------------------------------------------------------
@@ -1101,7 +1099,7 @@ css::uno::Reference< css::util::XStringSubstitution >
PathSettings::fa_getSubsti
if (! xSubst.is())
{
// create the needed substitution service.
- // We must replace all used variables inside readed path values.
+ // We must replace all used variables inside read path values.
// In case we can't do so ... the whole office can't work really.
// That's why it seems to be OK to throw a RuntimeException then.
xSubst = css::uno::Reference< css::util::XStringSubstitution >(
@@ -1181,3 +1179,5 @@ css::uno::Reference< css::container::XNameAccess >
PathSettings::fa_getCfgNew()
}
} // namespace framework
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sd/source/core/drawdoc.cxx b/main/sd/source/core/drawdoc.cxx
index 30146c9b82..33aa743051 100644
--- a/main/sd/source/core/drawdoc.cxx
+++ b/main/sd/source/core/drawdoc.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sd.hxx"
@@ -176,9 +174,9 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
{
// #109538#
mpDrawPageListWatcher = ::std::auto_ptr<ImpDrawPageListWatcher>(
- new ImpDrawPageListWatcher(*this));
+ new ImpDrawPageListWatcher(*this));
mpMasterPageListWatcher = ::std::auto_ptr<ImpMasterPageListWatcher>(
- new ImpMasterPageListWatcher(*this));
+ new ImpMasterPageListWatcher(*this));
SetObjectShell(pDrDocSh); // for the VCDrawModel
@@ -192,15 +190,15 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
SdOptions* pOptions = SD_MOD()->GetSdOptions(meDocType);
pOptions->GetScale( nX, nY );
- // #92067# Allow UI scale only for draw documents.
- if( eType == DOCUMENT_TYPE_DRAW )
- SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( nX, nY ) );
// user-defined
- else
- SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( 1, 1 ) );
// default
+ // #92067# Allow UI scale only for draw documents.
+ if( eType == DOCUMENT_TYPE_DRAW )
+ SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( nX, nY )
); // user-defined
+ else
+ SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( 1, 1 )
); // default
SetScaleUnit(MAP_100TH_MM);
SetScaleFraction(Fraction(1, 1));
- SetDefaultFontHeight(847); // 24p
+ SetDefaultFontHeight(847); // 24p
pItemPool->SetDefaultMetric(SFX_MAPUNIT_100TH_MM);
pItemPool->FreezeIdRanges();
@@ -218,16 +216,16 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
// set linguistic options
{
- const SvtLinguConfig aLinguConfig;
+ const SvtLinguConfig aLinguConfig;
SvtLinguOptions aOptions;
aLinguConfig.GetOptions( aOptions );
SetLanguage(
MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage,
- ::com::sun::star::i18n::ScriptType::LATIN), EE_CHAR_LANGUAGE );
+ ::com::sun::star::i18n::ScriptType::LATIN),
EE_CHAR_LANGUAGE );
SetLanguage(
MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CJK,
- ::com::sun::star::i18n::ScriptType::ASIAN), EE_CHAR_LANGUAGE_CJK );
+ ::com::sun::star::i18n::ScriptType::ASIAN),
EE_CHAR_LANGUAGE_CJK );
SetLanguage(
MsLangId::resolveSystemLanguageByScriptType(aOptions.nDefaultLanguage_CTL,
- ::com::sun::star::i18n::ScriptType::COMPLEX), EE_CHAR_LANGUAGE_CTL
);
+ ::com::sun::star::i18n::ScriptType::COMPLEX),
EE_CHAR_LANGUAGE_CTL );
mbOnlineSpell = aOptions.bIsSpellAuto;
}
@@ -247,7 +245,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
// for korean and japanese languages we have a different default for
apply spacing between asian, latin and ctl text
if( ( LANGUAGE_KOREAN == eRealCTLLanguage ) || ( LANGUAGE_KOREAN_JOHAB
== eRealCTLLanguage ) || ( LANGUAGE_JAPANESE == eRealCTLLanguage ) )
{
- GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem(
sal_False, EE_PARA_ASIANCJKSPACING ) );
+ GetPool().GetSecondaryPool()->SetPoolDefaultItem(
SvxScriptSpaceItem( sal_False, EE_PARA_ASIANCJKSPACING ) );
}
// set DefTab and SpellOptions
@@ -257,13 +255,13 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
try
{
- Reference< XSpellChecker1 > xSpellChecker(
LinguMgr::GetSpellChecker() );
- if ( xSpellChecker.is() )
- rOutliner.SetSpeller( xSpellChecker );
+ Reference< XSpellChecker1 > xSpellChecker(
LinguMgr::GetSpellChecker() );
+ if ( xSpellChecker.is() )
+ rOutliner.SetSpeller( xSpellChecker );
- Reference< XHyphenator > xHyphenator( LinguMgr::GetHyphenator() );
- if( xHyphenator.is() )
- rOutliner.SetHyphenator( xHyphenator );
+ Reference< XHyphenator > xHyphenator( LinguMgr::GetHyphenator()
);
+ if( xHyphenator.is() )
+ rOutliner.SetHyphenator( xHyphenator );
SetForbiddenCharsTable( new SvxForbiddenCharactersTable(
::comphelper::getProcessServiceFactory() ) );
}
@@ -276,8 +274,8 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
if (mpDocSh)
{
- sfx2::LinkManager *linkMgr = new sfx2::LinkManager(mpDocSh);
- linkMgr->SetAutoAskUpdateAllLinks();
+ sfx2::LinkManager *linkMgr = new sfx2::LinkManager(mpDocSh);
+ linkMgr->SetAutoAskUpdateAllLinks();
SetLinkManager( linkMgr );
}
@@ -291,18 +289,18 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
nCntrl &= ~EE_CNTRL_ONLINESPELLING;
nCntrl &= ~ EE_CNTRL_ULSPACESUMMATION;
- if ( meDocType != DOCUMENT_TYPE_IMPRESS )
- SetSummationOfParagraphs( sal_False );
- else
- {
- SetSummationOfParagraphs( pOptions->IsSummationOfParagraphs() );
- if ( pOptions->IsSummationOfParagraphs() )
- nCntrl |= EE_CNTRL_ULSPACESUMMATION;
- }
+ if ( meDocType != DOCUMENT_TYPE_IMPRESS )
+ SetSummationOfParagraphs( sal_False );
+ else
+ {
+ SetSummationOfParagraphs( pOptions->IsSummationOfParagraphs() );
+ if ( pOptions->IsSummationOfParagraphs() )
+ nCntrl |= EE_CNTRL_ULSPACESUMMATION;
+ }
rOutliner.SetControlWord(nCntrl);
- // Initialize the printer independent layout mode.
- SetPrinterIndependentLayout (pOptions->GetPrinterIndependentLayout());
+ // Initialize the printer independent layout mode.
+ SetPrinterIndependentLayout (pOptions->GetPrinterIndependentLayout());
// Set the StyleSheetPool to the HitTestOutliner.
// The link to the StyleRequest handler of the document will be set
@@ -314,13 +312,13 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
try
{
- Reference< XSpellChecker1 > xSpellChecker(
LinguMgr::GetSpellChecker() );
- if ( xSpellChecker.is() )
- pHitTestOutliner->SetSpeller( xSpellChecker );
+ Reference< XSpellChecker1 > xSpellChecker(
LinguMgr::GetSpellChecker() );
+ if ( xSpellChecker.is() )
+ pHitTestOutliner->SetSpeller( xSpellChecker );
- Reference< XHyphenator > xHyphenator( LinguMgr::GetHyphenator() );
- if( xHyphenator.is() )
- pHitTestOutliner->SetHyphenator( xHyphenator );
+ Reference< XHyphenator > xHyphenator( LinguMgr::GetHyphenator()
);
+ if( xHyphenator.is() )
+ pHitTestOutliner->SetHyphenator( xHyphenator );
}
catch(...)
{
@@ -373,9 +371,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType,
SfxObjectShell* pDrDocSh)
}
/*************************************************************************
-|*
|* Destructor
-|*
\************************************************************************/
SdDrawDocument::~SdDrawDocument()
@@ -419,7 +415,7 @@ SdDrawDocument::~SdDrawDocument()
{
// if necessary delete FrameViews
pFrameView =
- static_cast< ::sd::FrameView*>(mpFrameViewList->GetObject(i));
+ static_cast<
::sd::FrameView*>(mpFrameViewList->GetObject(i));
if (pFrameView)
delete pFrameView;
@@ -455,11 +451,9 @@ SdDrawDocument::~SdDrawDocument()
}
/*************************************************************************
-|*
|* This methods creates a new document (SdDrawDocument) and gives back a
|* pointer to it. The Drawing Engine uses this method to be able to put
|* the document or parts of it into Clipboard/DragServer.
-|*
\************************************************************************/
SdrModel* SdDrawDocument::AllocModel() const
@@ -470,17 +464,17 @@ SdrModel* SdDrawDocument::AllocModel() const
{
// the document will created for Drag&Drop/Clipboard,
// for this the document has to know a DocShell (SvPersist)
- SfxObjectShell* pObj = NULL;
+ SfxObjectShell* pObj = NULL;
::sd::DrawDocShell* pNewDocSh = NULL;
- if( meDocType == DOCUMENT_TYPE_IMPRESS )
- mpCreatingTransferable->SetDocShell( new ::sd::DrawDocShell(
- SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) );
+ if( meDocType == DOCUMENT_TYPE_IMPRESS )
+ mpCreatingTransferable->SetDocShell( new
::sd::DrawDocShell(
+ SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType )
);
else
- mpCreatingTransferable->SetDocShell( new ::sd::GraphicDocShell(
- SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType ) );
+ mpCreatingTransferable->SetDocShell( new
::sd::GraphicDocShell(
+ SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType )
);
- pNewDocSh = static_cast< ::sd::DrawDocShell*>( pObj =
mpCreatingTransferable->GetDocShell() );
+ pNewDocSh = static_cast< ::sd::DrawDocShell*>( pObj =
mpCreatingTransferable->GetDocShell() );
pNewDocSh->DoInitNew( NULL );
pNewModel = pNewDocSh->GetDoc();
@@ -503,7 +497,7 @@ SdrModel* SdDrawDocument::AllocModel() const
pNewStylePool->CopyLayoutSheets(aOldLayoutName,
*pOldStylePool, aCreatedSheets );
}
- pNewModel->NewOrLoadCompleted( DOC_LOADED ); // loaded from
source document
+ pNewModel->NewOrLoadCompleted( DOC_LOADED ); // loaded from
source document
}
else if( mbAllocDocSh )
{
@@ -511,7 +505,7 @@ SdrModel* SdDrawDocument::AllocModel() const
SdDrawDocument* pDoc = (SdDrawDocument*) this;
pDoc->SetAllocDocSh(sal_False);
pDoc->mxAllocedDocShRef = new ::sd::DrawDocShell(
- SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType);
+ SFX_CREATE_MODE_EMBEDDED, sal_True, meDocType);
pDoc->mxAllocedDocShRef->DoInitNew(NULL);
pNewModel = pDoc->mxAllocedDocShRef->GetDoc();
}
@@ -524,11 +518,9 @@ SdrModel* SdDrawDocument::AllocModel() const
}
/*************************************************************************
-|*
|* This methods creates a new page (SdPage) and gives back a pointer to it.
|* The Drawing Engine uses this method when loading to create pages (whose
-|* types are not knowed for it because these are DERIVATIONS of SdrPage).
-|*
+|* types are not known for it because these are DERIVATIONS of SdrPage).
\************************************************************************/
SdrPage* SdDrawDocument::AllocPage(FASTBOOL bMasterPage)
@@ -537,9 +529,7 @@ SdrPage* SdDrawDocument::AllocPage(FASTBOOL bMasterPage)
}
/*************************************************************************
-|*
|* SetChanged(), the modele was changed
-|*
\************************************************************************/
void SdDrawDocument::SetChanged(sal_Bool bFlag)
@@ -563,24 +553,20 @@ void SdDrawDocument::SetChanged(sal_Bool bFlag)
}
/*************************************************************************
-|*
|* NbcSetChanged(), the model changed, don't call anybody else
-|*
\************************************************************************/
void SdDrawDocument::NbcSetChanged(sal_Bool bFlag)
{
- // #100237# forward to baseclass
- FmFormModel::SetChanged(bFlag);
+ // #100237# forward to baseclass
+ FmFormModel::SetChanged(bFlag);
}
/*************************************************************************
-|*
|* NewOrLoadCompleted
|*
|* Will be called when the document was loaded respectively when it is
|* certain that it will not be loaded any longer.
-|*
\************************************************************************/
void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
@@ -646,7 +632,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode
eMode)
String aName( SdResId(STR_STANDARD_STYLESHEET_NAME));
SetDefaultStyleSheet(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(aName,
SD_STYLE_FAMILY_GRAPHICS)));
- // #119287# Set default StyleSheet for SdrGrafObj and SdrOle2Obj
+ // #119287# Set default StyleSheet for SdrGrafObj and SdrOle2Obj
SetDefaultStyleSheetForSdrGrafObjAndSdrOle2Obj(static_cast<SfxStyleSheet*>(mxStyleSheetPool->Find(String(
SdResId(STR_POOLSHEET_OBJNOLINENOFILL)), SD_STYLE_FAMILY_GRAPHICS)));
// initialize Draw-Outliner and Document Outliner,
@@ -736,14 +722,14 @@ void SdDrawDocument::UpdateAllLinks()
{
pDocLockedInsertingLinks = this; // lock inserting links. only
links in this document should by resolved
- pLinkManager->UpdateAllLinks(); // query box: update all links?
+ pLinkManager->UpdateAllLinks(); // query box: update all links?
if( pDocLockedInsertingLinks == this )
- pDocLockedInsertingLinks = NULL; // unlock inserting
links
+ pDocLockedInsertingLinks = NULL; // unlock inserting
links
}
}
-/** this loops over the presentation objectes of a page and repairs some new
settings
+/** this loops over the presentation objects of a page and repairs some new
settings
from old binary files and resets all default strings for empty
presentation objects.
*/
void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage, SdStyleSheetPool*
pSPool )
@@ -790,7 +776,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage,
SdStyleSheetPool* pSPool
if( pOPO && pOPO->GetOutlinerMode() ==
OUTLINERMODE_DONTKNOW )
pOPO->SetOutlinerMode(
OUTLINERMODE_TITLEOBJECT );
- // sal_True: in doing so do not delete
hard attributes
+ // sal_True: in doing so do not delete
hard attributes
if (pTitleSheet)
pObj->SetStyleSheet(pTitleSheet, sal_True);
}
@@ -836,10 +822,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage,
SdStyleSheetPool* pSPool
}
/*************************************************************************
-|*
|* Local Outliner that is used for the outline mode.
|* If necessary, insert OutlinerViews into this outliner !
-|*
\************************************************************************/
::sd::Outliner* SdDrawDocument::GetOutliner(sal_Bool bCreateOutliner)
@@ -860,10 +844,8 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage,
SdStyleSheetPool* pSPool
/*************************************************************************
-|*
|* Internal Outliner that is used for creating text objects.
|* No OutlinerViews will be inserted into this Outliner!
-|*
\************************************************************************/
::sd::Outliner* SdDrawDocument::GetInternalOutliner(sal_Bool bCreateOutliner)
@@ -890,7 +872,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage,
SdStyleSheetPool* pSPool
// MT: Who fills it with spam has to empty it right after:
// Advantages:
- // a) No uncessary clear calls.
+ // a) No unnecessary clear calls.
// b) No spam in memory.
DBG_ASSERT( !mpInternalOutliner || ( (
mpInternalOutliner->GetParagraphCount() == 1 ) && (
mpInternalOutliner->GetText( mpInternalOutliner->GetParagraph( 0 ) ).Len() == 0
) ), "InternalOutliner: Nicht leer!" );
@@ -898,9 +880,7 @@ void SdDrawDocument::NewOrLoadCompleted( SdPage* pPage,
SdStyleSheetPool* pSPool
}
/*************************************************************************
-|*
|* OnlineSpelling on/off
-|*
\************************************************************************/
void SdDrawDocument::SetOnlineSpell(sal_Bool bIn)
@@ -955,9 +935,7 @@ void SdDrawDocument::SetOnlineSpell(sal_Bool bIn)
/*************************************************************************
-|*
|* OnlineSpelling: Marking on/off
-|*
\************************************************************************/
uno::Reference< uno::XInterface > SdDrawDocument::createUnoModel()
@@ -987,14 +965,14 @@ SvxNumType SdDrawDocument::GetPageNumType() const
void SdDrawDocument::SetPrinterIndependentLayout (sal_Int32 nMode)
{
// #108104#
- // DBG_ASSERT (mpDocSh!=NULL, "No available document shell to set ref
device at.");
+ // DBG_ASSERT (mpDocSh!=NULL, "No available document shell to set ref
device at.");
switch (nMode)
- {
- case ::com::sun::star::document::PrinterIndependentLayout::DISABLED:
- case ::com::sun::star::document::PrinterIndependentLayout::ENABLED:
- // Just store supported modes and inform the doc shell.
- mnPrinterIndependentLayout = nMode;
+ {
+ case
::com::sun::star::document::PrinterIndependentLayout::DISABLED:
+ case
::com::sun::star::document::PrinterIndependentLayout::ENABLED:
+ // Just store supported modes and inform the doc shell.
+ mnPrinterIndependentLayout = nMode;
// #108104#
// Since it is possible that a SdDrawDocument is
constructed without a
@@ -1005,17 +983,17 @@ void SdDrawDocument::SetPrinterIndependentLayout
(sal_Int32 nMode)
mpDocSh->UpdateRefDevice ();
}
- break;
+ break;
- default:
- // Ignore unknown values.
- break;
- }
+ default:
+ // Ignore unknown values.
+ break;
+ }
}
sal_Int32 SdDrawDocument::GetPrinterIndependentLayout (void)
{
- return mnPrinterIndependentLayout;
+ return mnPrinterIndependentLayout;
}
bool SdDrawDocument::IsStartWithPresentation() const
@@ -1047,29 +1025,29 @@ void SdDrawDocument::SetCalcFieldValueHdl(::Outliner*
pOutliner)
sal_uInt16 SdDrawDocument::GetAnnotationAuthorIndex( const rtl::OUString&
rAuthor )
{
- // force current user to have first color
- if( maAnnotationAuthors.empty() )
- {
- SvtUserOptions aUserOptions;
- maAnnotationAuthors.push_back( aUserOptions.GetFullName() );
- }
-
- sal_uInt16 idx = 0;
- for( std::vector< OUString >::iterator iter( maAnnotationAuthors.begin()
); iter != maAnnotationAuthors.end(); iter++ )
- {
- if( (*iter) == rAuthor )
- {
- break;
- }
- idx++;
- }
-
- if( idx == maAnnotationAuthors.size() )
- {
- maAnnotationAuthors.push_back( rAuthor );
- }
-
- return idx;
+ // force current user to have first color
+ if( maAnnotationAuthors.empty() )
+ {
+ SvtUserOptions aUserOptions;
+ maAnnotationAuthors.push_back( aUserOptions.GetFullName() );
+ }
+
+ sal_uInt16 idx = 0;
+ for( std::vector< OUString >::iterator iter(
maAnnotationAuthors.begin() ); iter != maAnnotationAuthors.end(); iter++ )
+ {
+ if( (*iter) == rAuthor )
+ {
+ break;
+ }
+ idx++;
+ }
+
+ if( idx == maAnnotationAuthors.size() )
+ {
+ maAnnotationAuthors.push_back( rAuthor );
+ }
+
+ return idx;
}
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/solenv/bin/modules/installer/windows/media.pm
b/main/solenv/bin/modules/installer/windows/media.pm
index a02f29af10..a1aaffb909 100644
--- a/main/solenv/bin/modules/installer/windows/media.pm
+++ b/main/solenv/bin/modules/installer/windows/media.pm
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,20 +7,18 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
-
package installer::windows::media;
use installer::exiter;
@@ -197,7 +195,7 @@ sub get_maximum_filenumber
$maxfile = $allfiles / $maxcabfilenumber;
- $maxfile++; # for securitry
+ $maxfile++; # for security
return $maxfile;
}
@@ -208,7 +206,7 @@ sub get_maximum_filenumber
sub get_last_sequence
{
- my ( $cabfilename, $alludpatelastsequences ) = @_;
+ my ( $cabfilename, $allupdatelastsequences ) = @_;
my $sequence = $installer::globals::lastsequence{$cabfilename};
@@ -247,7 +245,7 @@ sub create_media_table
my $counter = 0;
# Sorting of files collector files required !
- # Attention: The order in the cab file is not guaranteed
(especially in udpate process)
+ # Attention: The order in the cab file is not guaranteed
(especially in update process)
for ( my $i = 0; $i <= $#{$filesref}; $i++ )
{
diff --git a/main/svx/source/inc/fmshimp.hxx b/main/svx/source/inc/fmshimp.hxx
index 6bd9106cef..ff60fb337f 100644
--- a/main/svx/source/inc/fmshimp.hxx
+++ b/main/svx/source/inc/fmshimp.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef _SVX_FMSHIMP_HXX
#define _SVX_FMSHIMP_HXX
@@ -94,7 +93,7 @@ DECLARE_STL_VECTOR( ::com::sun::star::uno::Reference<
::com::sun::star::form::XF
#define GA_ENABLE_ROCTRLR 8
-// flags for controlling the behaviour when calling loadForms
+// flags for controlling the behavior when calling loadForms
#define FORMS_LOAD 0x0000 // default: simply load
#define FORMS_SYNC 0x0000 // default: do in
synchronous
@@ -140,7 +139,7 @@ typedef ::cppu::WeakComponentImplHelper4<
::com::sun::star::beans::XPropertyChan
//========================================================================
class SAL_DLLPRIVATE FmXFormShell_Base_Disambiguation : public
FmXFormShell_BD_BASE
{
- using ::com::sun::star::beans::XPropertyChangeListener::disposing;
+ using ::com::sun::star::beans::XPropertyChangeListener::disposing;
protected:
FmXFormShell_Base_Disambiguation( ::osl::Mutex& _rMutex );
virtual void SAL_CALL disposing();
@@ -149,7 +148,7 @@ protected:
//========================================================================
namespace svx
{
- class FmTextControlShell;
+ class FmTextControlShell;
}
//========================================================================
@@ -166,7 +165,7 @@ class SAL_DLLPRIVATE FmXFormShell :public
FmXFormShell_BASE
,public
::svx::IControllerFeatureInvalidation
{
friend class FmFormView;
- friend class FmXFormView;
+ friend class FmXFormView;
friend class WizardUsageConfigItem;
class SuspendPropertyTracking;
@@ -197,47 +196,47 @@ class SAL_DLLPRIVATE FmXFormShell :public
FmXFormShell_BASE
::osl::Mutex m_aMutex;
sal_uLong m_nInvalidationEvent;
- sal_uLong m_nActivationEvent;
+ sal_uLong m_nActivationEvent;
::std::queue< FmLoadAction >
m_aLoadingPages;
FmFormShell* m_pShell;
- ::svx::FmTextControlShell* m_pTextShell;
+ ::svx::FmTextControlShell* m_pTextShell;
- ::svx::ControllerFeatures m_aActiveControllerFeatures;
- ::svx::ControllerFeatures m_aNavControllerFeatures;
+ ::svx::ControllerFeatures m_aActiveControllerFeatures;
+ ::svx::ControllerFeatures m_aNavControllerFeatures;
// aktuelle Form, Controller
// nur im alive mode verfuegbar
- ::com::sun::star::uno::Reference<
::com::sun::star::form::runtime::XFormController > m_xActiveController;
- ::com::sun::star::uno::Reference<
::com::sun::star::form::runtime::XFormController > m_xNavigationController;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >
m_xActiveForm;
+ ::com::sun::star::uno::Reference<
::com::sun::star::form::runtime::XFormController > m_xActiveController;
+ ::com::sun::star::uno::Reference<
::com::sun::star::form::runtime::XFormController > m_xNavigationController;
+ ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >
m_xActiveForm;
// Aktueller container einer Page
// nur im designmode verfuegbar
::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexAccess> m_xForms;
// the currently selected objects, as to be displayed in the property
browser
- InterfaceBag
m_aCurrentSelection;
- /// the currently selected form, or the form which all currently selected
controls belong to, or <NULL/>
- ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >
m_xCurrentForm;
- /// the last selection/marking of controls only. Necessary to implement
the "Control properties" slot
- InterfaceBag
m_aLastKnownMarkedControls;
+ InterfaceBag
m_aCurrentSelection;
+ // the currently selected form, or the form which all currently
selected controls belong to, or <NULL/>
+ ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >
m_xCurrentForm;
+ // the last selection/marking of controls only. Necessary to implement
the "Control properties" slot
+ InterfaceBag
m_aLastKnownMarkedControls;
// und das ist ebenfalls fuer's 'gefunden' : Beim Finden in
GridControls brauche ich die Spalte, bekomme aber
// nur die Nummer des Feldes, die entspricht der Nummer der
Spalte + <offset>, wobei der Offset von der Position
// des GridControls im Formular abhaengt. Also hier eine
Umrechnung.
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>
m_xLastGridFound;
- // the frame we live in
+ // the frame we live in
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame>
m_xAttachedFrame;
- // Administration of external form views (see the SID_FM_VIEW_AS_GRID-slot)
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >
m_xExternalViewController; // the controller for the
external form view
- ::com::sun::star::uno::Reference<
::com::sun::star::form::runtime::XFormController >
m_xExtViewTriggerController; // the nav controller at the time the
external display was triggered
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
m_xExternalDisplayedForm; // the form which the external
view is based on
+ // Administration of external form views (see the
SID_FM_VIEW_AS_GRID-slot)
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController
> m_xExternalViewController; // the controller for
the external form view
+ ::com::sun::star::uno::Reference<
::com::sun::star::form::runtime::XFormController >
m_xExtViewTriggerController; // the nav controller at the time the external
display was triggered
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >
m_xExternalDisplayedForm; // the form which the
external view is based on
mutable ::svxform::DocumentType
- m_eDocumentType; /// the type of document we're
living in
+ m_eDocumentType; // the type of document we're
living in
sal_Int16 m_nLockSlotInvalidation;
sal_Bool m_bHadPropertyBrowserInDesignMode : 1;
@@ -296,8 +295,8 @@ protected:
virtual void SAL_CALL propertyChange(const
::com::sun::star::beans::PropertyChangeEvent& evt) throw(
::com::sun::star::uno::RuntimeException );
// ::com::sun::star::form::XFormControllerListener
- virtual void SAL_CALL formActivated(const
::com::sun::star::lang::EventObject& rEvent) throw(
::com::sun::star::uno::RuntimeException );
- virtual void SAL_CALL formDeactivated(const
::com::sun::star::lang::EventObject& rEvent) throw(
::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL formActivated(const
::com::sun::star::lang::EventObject& rEvent) throw(
::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL formDeactivated(const
::com::sun::star::lang::EventObject& rEvent) throw(
::com::sun::star::uno::RuntimeException );
// OComponentHelper
virtual void SAL_CALL disposing();
@@ -310,8 +309,8 @@ public:
void viewActivated( FmFormView&
_rCurrentView, sal_Bool _bSyncAction = sal_False );
void viewDeactivated( FmFormView&
_rCurrentView, sal_Bool _bDeactivateController = sal_True );
- // IControllerFeatureInvalidation
- virtual void invalidateFeatures( const ::std::vector< sal_Int32 >&
_rFeatures );
+ // IControllerFeatureInvalidation
+ virtual void invalidateFeatures( const ::std::vector< sal_Int32 >&
_rFeatures );
void ExecuteTabOrderDialog( // execute SID_FM_TAB_DIALOG
const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XTabControllerModel >& _rxForForm
@@ -326,19 +325,19 @@ public:
*/
void UpdateForms( sal_Bool _bInvalidate );
- void ExecuteSearch(); // execute SID_FM_SEARCH
- void CreateExternalView(); // execute SID_FM_VIEW_AS_GRID
+ void ExecuteSearch(); // execute SID_FM_SEARCH
+ void CreateExternalView(); // execute SID_FM_VIEW_AS_GRID
sal_Bool GetY2KState(sal_uInt16& n);
void SetY2KState(sal_uInt16 n);
protected:
- // activation handling
+ // activation handling
inline sal_Bool hasEverBeenActivated( ) const { return
!m_bFirstActivation; }
inline void setHasBeenActivated( ) { m_bFirstActivation =
sal_False; }
- // form handling
- /// load or unload the forms on a page
+ // form handling
+ // load or unload the forms on a page
void loadForms( FmFormPage* _pPage, const
sal_uInt16 _nBehaviour = FORMS_LOAD | FORMS_SYNC );
void smartControlReset( const
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >&
_rxModels );
@@ -397,24 +396,24 @@ public:
*/
bool setCurrentSelectionFromMark(const SdrMarkList& rMarkList);
- /// returns the currently selected form, or the form which all currently
selected controls belong to, or <NULL/>
+ // returns the currently selected form, or the form which all currently
selected controls belong to, or <NULL/>
::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >
getCurrentForm() const { return m_xCurrentForm; }
void forgetCurrentForm();
- /// returns whether the last known marking contained only controls
+ // returns whether the last known marking contained only controls
sal_Bool onlyControlsAreMarked() const { return
!m_aLastKnownMarkedControls.empty(); }
- /// determines whether the current selection consists of exactly the given
object
+ // determines whether the current selection consists of exactly the given
object
bool isSolelySelected(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& _rxObject
);
- /// handles a MouseButtonDown event of the FmFormView
- void handleMouseButtonDown( const SdrViewEvent& _rViewEvent );
- /// handles the request for showing the "Properties"
- void handleShowPropertiesRequest();
+ // handles a MouseButtonDown event of the FmFormView
+ void handleMouseButtonDown( const SdrViewEvent& _rViewEvent );
+ // handles the request for showing the "Properties"
+ void handleShowPropertiesRequest();
- sal_Bool hasForms() const {return m_xForms.is() && m_xForms->getCount() !=
0;}
+ sal_Bool hasForms() const {return m_xForms.is() && m_xForms->getCount()
!= 0;}
sal_Bool hasDatabaseBar() const {return m_bDatabaseBar;}
sal_Bool canNavigate() const {return m_xNavigationController.is();}
@@ -439,17 +438,17 @@ public:
static PopupMenu* GetConversionMenu();
// ein Menue, das alle ControlConversion-Eintraege enthaelt
- /// checks whethere a given control conversion slot can be applied to the
current selection
+ // checks whethere a given control conversion slot can be applied to the
current selection
bool canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot
);
- /// enables or disables all conversion slots in a menu, according to the
current selection
+ // enables or disables all conversion slots in a menu, according to the
current selection
void checkControlConversionSlotsForCurrentSelection( Menu& rMenu );
- /// executes a control conversion slot for a given object
+ // executes a control conversion slot for a given object
bool executeControlConversionSlot( const
::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >&
_rxObject, sal_uInt16 _nSlotId );
/** executes a control conversion slot for the current selection
@precond canConvertCurrentSelectionToControl( <arg>_nSlotId</arg> )
must return <TRUE/>
*/
bool executeControlConversionSlot( sal_uInt16 _nSlotId );
- /// checks whether the given slot id denotes a control conversion slot
+ // checks whether the given slot id denotes a control conversion slot
static bool isControlConversionSlot( sal_uInt16 _nSlotId );
void ExecuteTextAttribute( SfxRequest& _rReq );
@@ -458,12 +457,12 @@ public:
void ForgetActiveControl();
void SetControlActivationHandler( const Link& _rHdl );
- /// classifies our host document
+ // classifies our host document
::svxform::DocumentType
getDocumentType() const;
bool isEnhancedForm() const;
- /// determines whether our host document is currently read-only
+ // determines whether our host document is currently read-only
bool IsReadonlyDoc() const;
// das Setzen des curObject/selObject/curForm erfolgt verzoegert
(SetSelectionDelayed), mit den folgenden
@@ -477,16 +476,16 @@ public:
// if the form belongs to the controller (extern) displaying a
grid, the according internal form will
// be displayed, _xForm else
- // check if the current control of the active controller has the focus
- bool HasControlFocus() const;
+ // check if the current control of the active controller has the focus
+ bool HasControlFocus() const;
private:
DECL_LINK(OnFoundData, FmFoundRecordInformation*);
DECL_LINK(OnCanceledNotFound, FmFoundRecordInformation*);
DECL_LINK(OnSearchContextRequest, FmSearchContext*);
DECL_LINK(OnTimeOut, void*);
- DECL_LINK(OnFirstTimeActivation, void*);
- DECL_LINK(OnFormsCreated, FmFormPage*);
+ DECL_LINK(OnFirstTimeActivation, void*);
+ DECL_LINK(OnFormsCreated, FmFormPage*);
void LoopGrids(sal_Int16 nWhat);
@@ -514,7 +513,7 @@ private:
*/
void impl_defaultCurrentForm_nothrow();
- /** sets m_xCurrentForm to the provided form, and udpates everything which
+ /** sets m_xCurrentForm to the provided form, and updates everything which
depends on the current form
*/
void impl_updateCurrentForm( const ::com::sun::star::uno::Reference<
::com::sun::star::form::XForm >& _rxNewCurForm );
@@ -602,3 +601,5 @@ public:
};
#endif // _SVX_FMSHIMP_HXX
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/sw/source/ui/inc/usrpref.hxx
b/main/sw/source/ui/inc/usrpref.hxx
index 03a6be7c7b..7013d488d8 100644
--- a/main/sw/source/ui/inc/usrpref.hxx
+++ b/main/sw/source/ui/inc/usrpref.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,24 +7,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
#ifndef _USRPREF_HXX
#define _USRPREF_HXX
-
-
#include <unotools/configitem.hxx>
#include <fldupde.hxx>
#include "viewopt.hxx"
@@ -44,11 +41,11 @@ class SwContentViewConfig : public utl::ConfigItem
SwContentViewConfig(sal_Bool bWeb, SwMasterUsrPref& rParent);
~SwContentViewConfig();
- // utl::ConfigItem
- virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString
> &rPropertyNames );
- virtual void Commit();
+ // utl::ConfigItem
+ virtual void Notify( const com::sun::star::uno::Sequence<
rtl::OUString > &rPropertyNames );
+ virtual void Commit();
- void Load();
+ void Load();
void
SetModified(){ConfigItem::SetModified();}
};
/* -----------------------------28.09.00 09:45--------------------------------
@@ -132,24 +129,24 @@ class SwMasterUsrPref : public SwViewOption
friend class SwCursorConfig;
friend class SwWebColorConfig;
- SwFldUpdateFlags eFldUpdateFlags; //udpate of fields and charts
+ SwFldUpdateFlags eFldUpdateFlags; // update of fields and charts
sal_Int32 nLinkUpdateMode;
FieldUnit eUserMetric;
- FieldUnit eHScrollMetric;
- sal_Bool bIsHScrollMetricSet;
- FieldUnit eVScrollMetric;
- sal_Bool bIsVScrollMetricSet;
+ FieldUnit eHScrollMetric;
+ sal_Bool bIsHScrollMetricSet;
+ FieldUnit eVScrollMetric;
+ sal_Bool bIsVScrollMetricSet;
- sal_Int32 nDefTab; //default tab stop
distance
+ sal_Int32 nDefTab; // default tab stop
distance
- sal_Bool bIsSquaredPageMode; //default page mode for text grid
- sal_Bool bIsAlignMathObjectsToBaseline;
+ sal_Bool bIsSquaredPageMode; // default page mode for text grid
+ sal_Bool bIsAlignMathObjectsToBaseline;
- SwContentViewConfig aContentConfig;
- SwLayoutViewConfig aLayoutConfig;
- SwGridConfig aGridConfig;
- SwCursorConfig aCursorConfig;
- SwWebColorConfig* pWebColorConfig;
+ SwContentViewConfig aContentConfig;
+ SwLayoutViewConfig aLayoutConfig;
+ SwGridConfig aGridConfig;
+ SwCursorConfig aCursorConfig;
+ SwWebColorConfig* pWebColorConfig;
public:
SwMasterUsrPref(sal_Bool bWeb);
@@ -259,23 +256,25 @@ public:
if(!bNoModify)
aLayoutConfig.SetModified();
}
-
- //default page mode for text grid
+
+ // default page mode for text grid
sal_Bool IsSquaredPageMode() const {return bIsSquaredPageMode;}
- void SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify =
sal_False )
- {
+ void SetDefaultPageMode( sal_Bool bVal, sal_Bool bNoModify =
sal_False )
+ {
bIsSquaredPageMode = bVal;
if(!bNoModify)
- aLayoutConfig.SetModified();
+ aLayoutConfig.SetModified();
}
sal_Bool IsAlignMathObjectsToBaseline() const { return
bIsAlignMathObjectsToBaseline; }
- void SetAlignMathObjectsToBaseline( sal_Bool bVal, sal_Bool
bNoModify = sal_False )
- {
+ void SetAlignMathObjectsToBaseline( sal_Bool bVal, sal_Bool
bNoModify = sal_False )
+ {
bIsAlignMathObjectsToBaseline = bVal;
if(!bNoModify)
- aLayoutConfig.SetModified();
+ aLayoutConfig.SetModified();
}
};
#endif
+
+/* vim: set noet sw=4 ts=4: */
