summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-06 18:58:39 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-06 19:37:47 +0300
commit79247e9fa74c7b5472c5ee2bd98b27cef73788b1 (patch)
treecc4b835966d8749351514bf3fe2c2334c14532cc /unotools
parent88bea0a5a8b1e5c1fb601f4e4ba61ba7bce38a3a (diff)
Kill superfluous spacing before semicolons
Change-Id: I2d8b430e1a6c23569eb0a67a2dcf8702cf7abc41
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/cmdoptions.cxx26
-rw-r--r--unotools/source/config/configitem.cxx58
-rw-r--r--unotools/source/config/dynamicmenuoptions.cxx196
-rw-r--r--unotools/source/config/eventcfg.cxx18
-rw-r--r--unotools/source/config/extendedsecurityoptions.cxx12
-rw-r--r--unotools/source/config/fontcfg.cxx2
-rw-r--r--unotools/source/config/fontoptions.cxx26
-rw-r--r--unotools/source/config/historyoptions.cxx22
-rw-r--r--unotools/source/config/itemholder1.cxx4
-rw-r--r--unotools/source/config/lingucfg.cxx36
-rw-r--r--unotools/source/config/localisationoptions.cxx20
-rw-r--r--unotools/source/config/misccfg.cxx2
-rw-r--r--unotools/source/config/moduleoptions.cxx118
-rw-r--r--unotools/source/config/optionsdlg.cxx2
-rw-r--r--unotools/source/config/printwarningoptions.cxx10
-rw-r--r--unotools/source/config/securityoptions.cxx54
-rw-r--r--unotools/source/config/viewoptions.cxx52
-rw-r--r--unotools/source/i18n/localedatawrapper.cxx10
-rw-r--r--unotools/source/misc/fontdefs.cxx24
-rw-r--r--unotools/source/misc/mediadescriptor.cxx2
-rw-r--r--unotools/source/ucbhelper/tempfile.cxx4
-rw-r--r--unotools/source/ucbhelper/xtempfile.cxx4
22 files changed, 351 insertions, 351 deletions
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 242a920d2caa..18e99b34efaf 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -32,12 +32,12 @@
#include <algorithm>
#include <boost/unordered_map.hpp>
-using namespace ::std ;
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::beans ;
+using namespace ::std;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
#define ROOTNODE_CMDOPTIONS OUString("Office.Commands/Execute")
#define PATHDELIMITER OUString("/")
@@ -209,8 +209,8 @@ SvtCommandOptions_Impl::SvtCommandOptions_Impl()
// Copy values from list in right order to ouer internal member.
// Attention: List for names and values have an internal construction pattern!
- sal_Int32 nItem = 0 ;
- OUString sCmd ;
+ sal_Int32 nItem = 0;
+ OUString sCmd;
// Get names/values for disabled commands.
for( nItem=0; nItem < lNames.getLength(); ++nItem )
@@ -255,8 +255,8 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
// Copy values from list in right order to ouer internal member.
// Attention: List for names and values have an internal construction pattern!
- sal_Int32 nItem = 0 ;
- OUString sCmd ;
+ sal_Int32 nItem = 0;
+ OUString sCmd;
m_aDisabledCommands.Clear();
@@ -271,7 +271,7 @@ void SvtCommandOptions_Impl::Notify( const Sequence< OUString >& )
// dont forget to update all existing frames and her might cached dispatch objects!
// But look for already killed frames. We hold weak references instead of hard ones ...
for (SvtFrameVector::const_iterator pIt = m_lFrames.begin();
- pIt != m_lFrames.end() ;
+ pIt != m_lFrames.end();
++pIt )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame(pIt->get(), ::com::sun::star::uno::UNO_QUERY);
@@ -358,8 +358,8 @@ Sequence< OUString > SvtCommandOptions_Impl::impl_GetPropertyNames()
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtCommandOptions_Impl* SvtCommandOptions::m_pDataContainer = NULL ;
-sal_Int32 SvtCommandOptions::m_nRefCount = 0 ;
+SvtCommandOptions_Impl* SvtCommandOptions::m_pDataContainer = NULL;
+sal_Int32 SvtCommandOptions::m_nRefCount = 0;
// constructor
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 9c66c36be329..20c9af95700a 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -200,14 +200,14 @@ void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >&
// This method should be called for special ConfigItem-mode only!
OSL_ENSURE( ((m_nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES), "ConfigItem::impl_packLocalizedProperties()\nWrong call of this method detected!\n" );
- sal_Int32 nSourceCounter ; // used to step during input lists
- sal_Int32 nSourceSize ; // marks end of loop over input lists
- sal_Int32 nDestinationCounter ; // actual position in output lists
- sal_Int32 nPropertyCounter ; // counter of inner loop for Sequence< PropertyValue >
- sal_Int32 nPropertiesSize ; // marks end of inner loop
- Sequence< OUString > lPropertyNames ; // list of all locales for localized entry
- Sequence< PropertyValue > lProperties ; // localized values of an configuration entry packed for return
- Reference< XInterface > xLocalizedNode ; // if cfg entry is localized ... lInValues contains an XInterface!
+ sal_Int32 nSourceCounter; // used to step during input lists
+ sal_Int32 nSourceSize; // marks end of loop over input lists
+ sal_Int32 nDestinationCounter; // actual position in output lists
+ sal_Int32 nPropertyCounter; // counter of inner loop for Sequence< PropertyValue >
+ sal_Int32 nPropertiesSize; // marks end of inner loop
+ Sequence< OUString > lPropertyNames; // list of all locales for localized entry
+ Sequence< PropertyValue > lProperties; // localized values of an configuration entry packed for return
+ Reference< XInterface > xLocalizedNode; // if cfg entry is localized ... lInValues contains an XInterface!
// Optimise follow algorithm ... A LITTLE BIT :-)
// There exist two different possibilities:
@@ -235,9 +235,9 @@ void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >&
Reference< XNameContainer > xSetAccess( xLocalizedNode, UNO_QUERY );
if( xSetAccess.is() )
{
- lPropertyNames = xSetAccess->getElementNames() ;
- nPropertiesSize = lPropertyNames.getLength() ;
- lProperties.realloc( nPropertiesSize ) ;
+ lPropertyNames = xSetAccess->getElementNames();
+ nPropertiesSize = lPropertyNames.getLength();
+ lProperties.realloc( nPropertiesSize );
for( nPropertyCounter=0; nPropertyCounter<nPropertiesSize; ++nPropertyCounter )
{
@@ -246,9 +246,9 @@ void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >&
OUString sPropName = lInNames[nSourceCounter];
OUString sLocaleName = lPropertyNames[nPropertyCounter];
#endif
- lProperties[nPropertyCounter].Name = lPropertyNames[nPropertyCounter] ;
+ lProperties[nPropertyCounter].Name = lPropertyNames[nPropertyCounter];
OUString sLocaleValue;
- xSetAccess->getByName( lPropertyNames[nPropertyCounter] ) >>= sLocaleValue ;
+ xSetAccess->getByName( lPropertyNames[nPropertyCounter] ) >>= sLocaleValue;
lProperties[nPropertyCounter].Value <<= sLocaleValue;
}
@@ -273,13 +273,13 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString >
// This method should be called for special ConfigItem-mode only!
OSL_ENSURE( ((m_nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES), "ConfigItem::impl_unpackLocalizedProperties()\nWrong call of this method detected!\n" );
- sal_Int32 nSourceCounter ; // used to step during input lists
- sal_Int32 nSourceSize ; // marks end of loop over input lists
- sal_Int32 nDestinationCounter ; // actual position in output lists
- sal_Int32 nPropertyCounter ; // counter of inner loop for Sequence< PropertyValue >
- sal_Int32 nPropertiesSize ; // marks end of inner loop
- OUString sNodeName ; // base name of node ( e.g. "UIName/" ) ... expand to locale ( e.g. "UIName/de" )
- Sequence< PropertyValue > lProperties ; // localized values of an configuration entry getted from lInValues-Any
+ sal_Int32 nSourceCounter; // used to step during input lists
+ sal_Int32 nSourceSize; // marks end of loop over input lists
+ sal_Int32 nDestinationCounter; // actual position in output lists
+ sal_Int32 nPropertyCounter; // counter of inner loop for Sequence< PropertyValue >
+ sal_Int32 nPropertiesSize; // marks end of inner loop
+ OUString sNodeName; // base name of node ( e.g. "UIName/" ) ... expand to locale ( e.g. "UIName/de" )
+ Sequence< PropertyValue > lProperties; // localized values of an configuration entry getted from lInValues-Any
// Optimise follow algorithm ... A LITTLE BIT :-)
// There exist two different possibilities:
@@ -318,8 +318,8 @@ void ConfigItem::impl_unpackLocalizedProperties( const Sequence< OUString >
for( nPropertyCounter=0; nPropertyCounter<nPropertiesSize; ++nPropertyCounter )
{
- lOutNames [nDestinationCounter] = sNodeName + lProperties[nPropertyCounter].Name ;
- lOutValues[nDestinationCounter] = lProperties[nPropertyCounter].Value ;
+ lOutNames [nDestinationCounter] = sNodeName + lProperties[nPropertyCounter].Name;
+ lOutValues[nDestinationCounter] = lProperties[nPropertyCounter].Value;
++nDestinationCounter;
}
}
@@ -374,7 +374,7 @@ Sequence< sal_Bool > ConfigItem::GetReadOnlyStates(const com::sun::star::uno::Se
}
Reference< XInterface > xNode;
- Reference< XPropertySet > xSet ;
+ Reference< XPropertySet > xSet;
Reference< XPropertySetInfo > xInfo;
if (!sPath.isEmpty())
{
@@ -463,11 +463,11 @@ bool ConfigItem::PutProperties( const Sequence< OUString >& rNames,
bool bRet = xHierarchyAccess.is() && xTopNodeReplace.is();
if(bRet)
{
- Sequence< OUString > lNames ;
- Sequence< Any > lValues ;
- const OUString* pNames = NULL ;
- const Any* pValues = NULL ;
- sal_Int32 nNameCount ;
+ Sequence< OUString > lNames;
+ Sequence< Any > lValues;
+ const OUString* pNames = NULL;
+ const Any* pValues = NULL;
+ sal_Int32 nNameCount;
if(( m_nMode & CONFIG_MODE_ALL_LOCALES ) == CONFIG_MODE_ALL_LOCALES )
{
// If ConfigItem works in "ALL_LOCALES"-mode ... we must support a Sequence< PropertyValue >
@@ -830,7 +830,7 @@ bool ConfigItem::SetSetProperties(
const sal_Int32 nSubNodeCount = aSubNodeNames.getLength();
- for(sal_Int32 j = 0; j <nSubNodeCount ; j++)
+ for(sal_Int32 j = 0; j <nSubNodeCount; j++)
{
if(!xCont->hasByName(aSubNodeNames[j]))
{
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index ea3747bd1e64..b3135a082e70 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -31,12 +31,12 @@
#include <algorithm>
-using namespace ::std ;
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::beans ;
+using namespace ::std;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
#define ROOTNODE_MENUS OUString("Office.Common/Menus/")
#define PATHDELIMITER OUString("/")
@@ -73,18 +73,18 @@ struct SvtDynMenuEntry
const OUString& sNewImageIdentifier ,
const OUString& sNewTargetName )
{
- sURL = sNewURL ;
- sTitle = sNewTitle ;
- sImageIdentifier = sNewImageIdentifier ;
- sTargetName = sNewTargetName ;
+ sURL = sNewURL;
+ sTitle = sNewTitle;
+ sImageIdentifier = sNewImageIdentifier;
+ sTargetName = sNewTargetName;
}
public:
- OUString sName ;
- OUString sURL ;
- OUString sTitle ;
- OUString sImageIdentifier ;
- OUString sTargetName ;
+ OUString sName;
+ OUString sURL;
+ OUString sTitle;
+ OUString sImageIdentifier;
+ OUString sTargetName;
};
/*-****************************************************************************************************************
@@ -146,33 +146,33 @@ class SvtDynMenu
Sequence< PropertyValue > lProperties ( PROPERTYCOUNT );
Sequence< Sequence< PropertyValue > > lResult ( nSetupCount+nUserCount );
OUString sSeparator ( "private:separator" );
- OUString sEmpty ;
+ OUString sEmpty;
const vector< SvtDynMenuEntry >* pList = &lSetupEntries;
- lProperties[OFFSET_URL ].Name = PROPERTYNAME_URL ;
- lProperties[OFFSET_TITLE ].Name = PROPERTYNAME_TITLE ;
- lProperties[OFFSET_IMAGEIDENTIFIER].Name = PROPERTYNAME_IMAGEIDENTIFIER ;
- lProperties[OFFSET_TARGETNAME ].Name = PROPERTYNAME_TARGETNAME ;
+ lProperties[OFFSET_URL ].Name = PROPERTYNAME_URL;
+ lProperties[OFFSET_TITLE ].Name = PROPERTYNAME_TITLE;
+ lProperties[OFFSET_IMAGEIDENTIFIER].Name = PROPERTYNAME_IMAGEIDENTIFIER;
+ lProperties[OFFSET_TARGETNAME ].Name = PROPERTYNAME_TARGETNAME;
while( pList != NULL )
{
for( vector< SvtDynMenuEntry >::const_iterator pItem =pList->begin();
- pItem!=pList->end() ;
+ pItem!=pList->end();
++pItem )
{
if( pItem->sURL == sSeparator )
{
- lProperties[OFFSET_URL ].Value <<= sSeparator ;
- lProperties[OFFSET_TITLE ].Value <<= sEmpty ;
- lProperties[OFFSET_IMAGEIDENTIFIER ].Value <<= sEmpty ;
- lProperties[OFFSET_TARGETNAME ].Value <<= sEmpty ;
+ lProperties[OFFSET_URL ].Value <<= sSeparator;
+ lProperties[OFFSET_TITLE ].Value <<= sEmpty;
+ lProperties[OFFSET_IMAGEIDENTIFIER ].Value <<= sEmpty;
+ lProperties[OFFSET_TARGETNAME ].Value <<= sEmpty;
}
else
{
- lProperties[OFFSET_URL ].Value <<= pItem->sURL ;
- lProperties[OFFSET_TITLE ].Value <<= pItem->sTitle ;
+ lProperties[OFFSET_URL ].Value <<= pItem->sURL;
+ lProperties[OFFSET_TITLE ].Value <<= pItem->sTitle;
lProperties[OFFSET_IMAGEIDENTIFIER ].Value <<= pItem->sImageIdentifier;
- lProperties[OFFSET_TARGETNAME ].Value <<= pItem->sTargetName ;
+ lProperties[OFFSET_TARGETNAME ].Value <<= pItem->sTargetName;
}
lResult[nStep] = lProperties;
++nStep;
@@ -193,7 +193,7 @@ class SvtDynMenu
{
sal_Int32 nNr = 0;
for( vector< SvtDynMenuEntry >::const_iterator pItem =lUserEntries.begin();
- pItem!=lUserEntries.end() ;
+ pItem!=lUserEntries.end();
++pItem )
{
if( pItem->sName.startsWith( PATHPREFIX_USER ) )
@@ -213,7 +213,7 @@ class SvtDynMenu
private:
vector< SvtDynMenuEntry > lSetupEntries;
- vector< SvtDynMenuEntry > lUserEntries ;
+ vector< SvtDynMenuEntry > lUserEntries;
};
class SvtDynamicMenuOptions_Impl : public ConfigItem
@@ -267,7 +267,7 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
@onerror -
*//*-*****************************************************************************************************/
- Sequence< Sequence< PropertyValue > > GetMenu ( EDynamicMenuType eMenu ) const ;
+ Sequence< Sequence< PropertyValue > > GetMenu ( EDynamicMenuType eMenu ) const;
private:
@@ -334,9 +334,9 @@ class SvtDynamicMenuOptions_Impl : public ConfigItem
private:
- SvtDynMenu m_aNewMenu ;
- SvtDynMenu m_aWizardMenu ;
- SvtDynMenu m_aHelpBookmarksMenu ;
+ SvtDynMenu m_aNewMenu;
+ SvtDynMenu m_aWizardMenu;
+ SvtDynMenu m_aHelpBookmarksMenu;
};
// constructor
@@ -384,21 +384,21 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
// ... and so on ...
- sal_uInt32 nItem = 0 ;
- sal_uInt32 nPosition = 0 ;
+ sal_uInt32 nItem = 0;
+ sal_uInt32 nPosition = 0;
// Get names/values for new menu.
// 4 subkeys for every item!
for( nItem=0; nItem<nNewCount; ++nItem )
{
- SvtDynMenuEntry aItem ;
- lValues[nPosition] >>= aItem.sURL ;
+ SvtDynMenuEntry aItem;
+ lValues[nPosition] >>= aItem.sURL;
++nPosition;
- lValues[nPosition] >>= aItem.sTitle ;
+ lValues[nPosition] >>= aItem.sTitle;
++nPosition;
- lValues[nPosition] >>= aItem.sImageIdentifier ;
+ lValues[nPosition] >>= aItem.sImageIdentifier;
++nPosition;
- lValues[nPosition] >>= aItem.sTargetName ;
+ lValues[nPosition] >>= aItem.sTargetName;
++nPosition;
m_aNewMenu.AppendSetupEntry( aItem );
}
@@ -409,14 +409,14 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
// 4 subkeys for every item!
for( nItem=0; nItem<nWizardCount; ++nItem )
{
- SvtDynMenuEntry aItem ;
- lValues[nPosition] >>= aItem.sURL ;
+ SvtDynMenuEntry aItem;
+ lValues[nPosition] >>= aItem.sURL;
++nPosition;
- lValues[nPosition] >>= aItem.sTitle ;
+ lValues[nPosition] >>= aItem.sTitle;
++nPosition;
- lValues[nPosition] >>= aItem.sImageIdentifier ;
+ lValues[nPosition] >>= aItem.sImageIdentifier;
++nPosition;
- lValues[nPosition] >>= aItem.sTargetName ;
+ lValues[nPosition] >>= aItem.sTargetName;
++nPosition;
m_aWizardMenu.AppendSetupEntry( aItem );
}
@@ -427,14 +427,14 @@ SvtDynamicMenuOptions_Impl::SvtDynamicMenuOptions_Impl()
// 4 subkeys for every item!
for( nItem=0; nItem<nHelpBookmarksCount; ++nItem )
{
- SvtDynMenuEntry aItem ;
- lValues[nPosition] >>= aItem.sURL ;
+ SvtDynMenuEntry aItem;
+ lValues[nPosition] >>= aItem.sURL;
++nPosition;
- lValues[nPosition] >>= aItem.sTitle ;
+ lValues[nPosition] >>= aItem.sTitle;
++nPosition;
- lValues[nPosition] >>= aItem.sImageIdentifier ;
+ lValues[nPosition] >>= aItem.sImageIdentifier;
++nPosition;
- lValues[nPosition] >>= aItem.sTargetName ;
+ lValues[nPosition] >>= aItem.sTargetName;
++nPosition;
m_aHelpBookmarksMenu.AppendSetupEntry( aItem );
}
@@ -476,10 +476,10 @@ void SvtDynamicMenuOptions_Impl::Commit()
ClearNodeSet( SETNODE_WIZARDMENU );
ClearNodeSet( SETNODE_HELPBOOKMARKS );
- MenuEntry aItem ;
- OUString sNode ;
+ MenuEntry aItem;
+ OUString sNode;
Sequence< PropertyValue > lPropertyValues( PROPERTYCOUNT );
- sal_uInt32 nItem = 0 ;
+ sal_uInt32 nItem = 0;
// Copy "new" menu entries to save-list!
sal_uInt32 nNewCount = m_aNewMenu.size();
@@ -491,15 +491,15 @@ void SvtDynamicMenuOptions_Impl::Commit()
// ...
sNode = SETNODE_NEWMENU + PATHDELIMITER + PATHPREFIX + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
- lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ;
- lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER ;
- lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME ;
+ lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL;
+ lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE;
+ lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER;
+ lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME;
- lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ;
- lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier ;
- lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName ;
+ lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL;
+ lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle;
+ lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier;
+ lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName;
SetSetProperties( SETNODE_NEWMENU, lPropertyValues );
}
@@ -514,15 +514,15 @@ void SvtDynamicMenuOptions_Impl::Commit()
// ...
sNode = SETNODE_WIZARDMENU + PATHDELIMITER + PATHPREFIX + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
- lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ;
- lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER ;
- lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME ;
+ lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL;
+ lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE;
+ lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER;
+ lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME;
- lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ;
- lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier ;
- lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName ;
+ lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL;
+ lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle;
+ lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier;
+ lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName;
SetSetProperties( SETNODE_WIZARDMENU, lPropertyValues );
}
@@ -537,15 +537,15 @@ void SvtDynamicMenuOptions_Impl::Commit()
// ...
sNode = SETNODE_HELPBOOKMARKS + PATHDELIMITER + PATHPREFIX + OUString::valueOf( (sal_Int32)nItem ) + PATHDELIMITER;
- lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL ;
- lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER ;
- lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME ;
+ lPropertyValues[OFFSET_URL ].Name = sNode + PROPERTYNAME_URL;
+ lPropertyValues[OFFSET_TITLE ].Name = sNode + PROPERTYNAME_TITLE;
+ lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Name = sNode + PROPERTYNAME_IMAGEIDENTIFIER;
+ lPropertyValues[OFFSET_TARGETNAME ].Name = sNode + PROPERTYNAME_TARGETNAME;
- lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL ;
- lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle ;
- lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier ;
- lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName ;
+ lPropertyValues[OFFSET_URL ].Value <<= aItem.sURL;
+ lPropertyValues[OFFSET_TITLE ].Value <<= aItem.sTitle;
+ lPropertyValues[OFFSET_IMAGEIDENTIFIER ].Value <<= aItem.sImageIdentifier;
+ lPropertyValues[OFFSET_TARGETNAME ].Value <<= aItem.sTargetName;
SetSetProperties( SETNODE_HELPBOOKMARKS, lPropertyValues );
}
@@ -636,10 +636,10 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence
Sequence< OUString >& lDestination ,
const OUString& sSetNode )
{
- OUString sFixPath ;
- vector< OUString > lTemp ;
- sal_Int32 nSourceCount = lSource.getLength() ;
- sal_Int32 nDestinationStep = lDestination.getLength() ; // start on end of current list ...!
+ OUString sFixPath;
+ vector< OUString > lTemp;
+ sal_Int32 nSourceCount = lSource.getLength();
+ sal_Int32 nDestinationStep = lDestination.getLength(); // start on end of current list ...!
lDestination.realloc( (nSourceCount*PROPERTYCOUNT)+nDestinationStep ); // get enough memory for copy operations after nDestination ...
@@ -654,26 +654,26 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence
// Copy sorted entries to destination and expand every item with
// 4 supported sub properties.
- for( vector< OUString >::const_iterator pItem =lTemp.begin() ;
- pItem!=lTemp.end() ;
+ for( vector< OUString >::const_iterator pItem =lTemp.begin();
+ pItem!=lTemp.end();
++pItem )
{
- sFixPath = sSetNode ;
- sFixPath += PATHDELIMITER ;
- sFixPath += *pItem ;
- sFixPath += PATHDELIMITER ;
+ sFixPath = sSetNode;
+ sFixPath += PATHDELIMITER;
+ sFixPath += *pItem;
+ sFixPath += PATHDELIMITER;
- lDestination[nDestinationStep] = sFixPath ;
- lDestination[nDestinationStep] += PROPERTYNAME_URL ;
+ lDestination[nDestinationStep] = sFixPath;
+ lDestination[nDestinationStep] += PROPERTYNAME_URL;
++nDestinationStep;
- lDestination[nDestinationStep] = sFixPath ;
- lDestination[nDestinationStep] += PROPERTYNAME_TITLE ;
+ lDestination[nDestinationStep] = sFixPath;
+ lDestination[nDestinationStep] += PROPERTYNAME_TITLE;
++nDestinationStep;
- lDestination[nDestinationStep] = sFixPath ;
- lDestination[nDestinationStep] += PROPERTYNAME_IMAGEIDENTIFIER ;
+ lDestination[nDestinationStep] = sFixPath;
+ lDestination[nDestinationStep] += PROPERTYNAME_IMAGEIDENTIFIER;
++nDestinationStep;
- lDestination[nDestinationStep] = sFixPath ;
- lDestination[nDestinationStep] += PROPERTYNAME_TARGETNAME ;
+ lDestination[nDestinationStep] = sFixPath;
+ lDestination[nDestinationStep] += PROPERTYNAME_TARGETNAME;
++nDestinationStep;
}
}
@@ -682,8 +682,8 @@ void SvtDynamicMenuOptions_Impl::impl_SortAndExpandPropertyNames( const Sequence
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtDynamicMenuOptions_Impl* SvtDynamicMenuOptions::m_pDataContainer = NULL ;
-sal_Int32 SvtDynamicMenuOptions::m_nRefCount = 0 ;
+SvtDynamicMenuOptions_Impl* SvtDynamicMenuOptions::m_pDataContainer = NULL;
+sal_Int32 SvtDynamicMenuOptions::m_nRefCount = 0;
// constructor
diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 1b9c45521d55..292b80f8a853 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.cxx
@@ -32,11 +32,11 @@
#include <algorithm>
-using namespace ::std ;
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
+using namespace ::std;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
using namespace ::com::sun::star;
#define ROOTNODE_EVENTS OUString("Office.Events/ApplicationEvents")
@@ -149,7 +149,7 @@ void GlobalEventConfig_Impl::Notify( const Sequence< OUString >& )
// dont forget to update all existing frames and her might cached dispatch objects!
// But look for already killed frames. We hold weak references instead of hard ones ...
for (FrameVector::const_iterator pIt = m_lFrames.begin();
- pIt != m_lFrames.end() ;
+ pIt != m_lFrames.end();
++pIt )
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame(pIt->get(), ::com::sun::star::uno::UNO_QUERY);
@@ -238,7 +238,7 @@ void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, cons
}
OUString macroURL;
sal_Int32 nPropCount = props.getLength();
- for( sal_Int32 index = 0 ; index < nPropCount ; ++index )
+ for( sal_Int32 index = 0; index < nPropCount; ++index )
{
if ( props[ index ].Name.equalsAscii( "Script" ) )
props[ index ].Value >>= macroURL;
@@ -307,8 +307,8 @@ bool SAL_CALL GlobalEventConfig_Impl::hasElements( ) throw (RuntimeException)
// and now the wrapper
//initialize static member
-GlobalEventConfig_Impl* GlobalEventConfig::m_pImpl = NULL ;
-sal_Int32 GlobalEventConfig::m_nRefCount = 0 ;
+GlobalEventConfig_Impl* GlobalEventConfig::m_pImpl = NULL;
+sal_Int32 GlobalEventConfig::m_nRefCount = 0;
GlobalEventConfig::GlobalEventConfig()
{
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index ead33f8ee8b4..35d091fedd82 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.cxx
@@ -31,10 +31,10 @@
#include "itemholder1.hxx"
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
#define ROOTNODE_SECURITY OUString("Office.Security")
@@ -286,8 +286,8 @@ Sequence< OUString > SvtExtendedSecurityOptions_Impl::GetPropertyNames()
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtExtendedSecurityOptions_Impl* SvtExtendedSecurityOptions::m_pDataContainer = NULL ;
-sal_Int32 SvtExtendedSecurityOptions::m_nRefCount = 0 ;
+SvtExtendedSecurityOptions_Impl* SvtExtendedSecurityOptions::m_pDataContainer = NULL;
+sal_Int32 SvtExtendedSecurityOptions::m_nRefCount = 0;
// constructor
diff --git a/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 5ff645bc4807..fccab2d71125 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -700,7 +700,7 @@ static bool ImplKillTrailingWithExceptions( OUString& rName, const char* const*
else
{
// skip exception strings
- while( *++ppStr ) ;
+ while( *++ppStr );
}
}
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index b7a72446f037..e68810d9def7 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.cxx
@@ -27,10 +27,10 @@
#include <rtl/instance.hxx>
#include "itemholder1.hxx"
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
#define ROOTNODE_FONT OUString("Office.Common/Font")
@@ -95,11 +95,11 @@ class SvtFontOptions_Impl : public ConfigItem
@onerror -
*//*-*****************************************************************************************************/
- bool IsFontHistoryEnabled ( ) const ;
- void EnableFontHistory ( bool bState ) ;
+ bool IsFontHistoryEnabled ( ) const;
+ void EnableFontHistory ( bool bState );
- bool IsFontWYSIWYGEnabled ( ) const ;
- void EnableFontWYSIWYG ( bool bState ) ;
+ bool IsFontWYSIWYGEnabled ( ) const;
+ void EnableFontWYSIWYG ( bool bState );
private:
@@ -120,9 +120,9 @@ class SvtFontOptions_Impl : public ConfigItem
private:
- bool m_bReplacementTable ;
- bool m_bFontHistory ;
- bool m_bFontWYSIWYG ;
+ bool m_bReplacementTable;
+ bool m_bFontHistory;
+ bool m_bFontWYSIWYG;
};
// constructor
@@ -304,8 +304,8 @@ Sequence< OUString > SvtFontOptions_Impl::impl_GetPropertyNames()
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtFontOptions_Impl* SvtFontOptions::m_pDataContainer = NULL ;
-sal_Int32 SvtFontOptions::m_nRefCount = 0 ;
+SvtFontOptions_Impl* SvtFontOptions::m_pDataContainer = NULL;
+sal_Int32 SvtFontOptions::m_nRefCount = 0;
// constructor
diff --git a/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 3c41556924d3..c156158989ea 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -37,12 +37,12 @@
#include <comphelper/configurationhelper.hxx>
#include <comphelper/processfactory.hxx>
-using namespace ::std ;
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
-using namespace ::com::sun::star::beans ;
+using namespace ::std;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::beans;
namespace {
static const ::sal_Int32 s_nOffsetURL = 0;
@@ -137,7 +137,7 @@ sal_uInt32 SvtHistoryOptions_Impl::GetSize( EHistoryType eHistory )
if (!xListAccess.is())
return 0;
- sal_uInt32 nSize = 0 ;
+ sal_uInt32 nSize = 0;
try
{
@@ -262,14 +262,14 @@ void SvtHistoryOptions_Impl::Clear( EHistoryType eHistory )
if (xListAccess.is())
{
// clear ItemList
- xListAccess->getByName(OUString(s_sItemList)) >>= xNode ;
+ xListAccess->getByName(OUString(s_sItemList)) >>= xNode;
lOrders = xNode->getElementNames();
const sal_Int32 nLength = lOrders.getLength();
for(sal_Int32 i=0; i<nLength; ++i)
xNode->removeByName(lOrders[i]);
// clear OrderList
- xListAccess->getByName(OUString(s_sOrderList)) >>= xNode ;
+ xListAccess->getByName(OUString(s_sOrderList)) >>= xNode;
lOrders = xNode->getElementNames();
for(sal_Int32 j=0; j<nLength; ++j)
xNode->removeByName(lOrders[j]);
@@ -557,8 +557,8 @@ void SvtHistoryOptions_Impl::AppendItem(EHistoryType eHistory,
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtHistoryOptions_Impl* SvtHistoryOptions::m_pDataContainer = NULL ;
-sal_Int32 SvtHistoryOptions::m_nRefCount = 0 ;
+SvtHistoryOptions_Impl* SvtHistoryOptions::m_pDataContainer = NULL;
+sal_Int32 SvtHistoryOptions::m_nRefCount = 0;
// constructor
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 4164d1bb8f5f..64534ebcd135 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -102,7 +102,7 @@ void ItemHolder1::impl_addItem(EItem eItem)
TItems::const_iterator pIt;
for ( pIt = m_lItems.begin();
- pIt != m_lItems.end() ;
+ pIt != m_lItems.end();
++pIt )
{
const TItemInfo& rInfo = *pIt;
@@ -123,7 +123,7 @@ void ItemHolder1::impl_releaseAllItems()
TItems::iterator pIt;
for ( pIt = m_lItems.begin();
- pIt != m_lItems.end() ;
+ pIt != m_lItems.end();
++pIt )
{
TItemInfo& rInfo = *pIt;
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 97d261a2de78..1715e3ff8634 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -744,25 +744,25 @@ bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const
const SvtLinguOptions &rOpt = const_cast< SvtLinguConfigItem * >(this)->aOpt;
switch(nPropertyHandle)
{
- case UPH_IS_USE_DICTIONARY_LIST : bReadOnly = rOpt.bROIsUseDictionaryList ; break;
+ case UPH_IS_USE_DICTIONARY_LIST : bReadOnly = rOpt.bROIsUseDictionaryList; break;
case UPH_IS_IGNORE_CONTROL_CHARACTERS : bReadOnly = rOpt.bROIsIgnoreControlCharacters; break;
- case UPH_IS_HYPH_AUTO : bReadOnly = rOpt.bROIsHyphAuto ; break;
- case UPH_IS_HYPH_SPECIAL : bReadOnly = rOpt.bROIsHyphSpecial ; break;
- case UPH_IS_SPELL_AUTO : bReadOnly = rOpt.bROIsSpellAuto ; break;
- case UPH_IS_SPELL_SPECIAL : bReadOnly = rOpt.bROIsSpellSpecial ; break;
- case UPH_IS_WRAP_REVERSE : bReadOnly = rOpt.bROIsSpellReverse ; break;
- case UPH_DEFAULT_LANGUAGE : bReadOnly = rOpt.bRODefaultLanguage ; break;
- case UPH_IS_SPELL_CAPITALIZATION : bReadOnly = rOpt.bROIsSpellCapitalization ; break;
- case UPH_IS_SPELL_WITH_DIGITS : bReadOnly = rOpt.bROIsSpellWithDigits ; break;
- case UPH_IS_SPELL_UPPER_CASE : bReadOnly = rOpt.bROIsSpellUpperCase ; break;
- case UPH_HYPH_MIN_LEADING : bReadOnly = rOpt.bROHyphMinLeading ; break;
- case UPH_HYPH_MIN_TRAILING : bReadOnly = rOpt.bROHyphMinTrailing ; break;
- case UPH_HYPH_MIN_WORD_LENGTH : bReadOnly = rOpt.bROHyphMinWordLength ; break;
- case UPH_ACTIVE_DICTIONARIES : bReadOnly = rOpt.bROActiveDics ; break;
- case UPH_ACTIVE_CONVERSION_DICTIONARIES : bReadOnly = rOpt.bROActiveConvDics ; break;
- case UPH_DEFAULT_LOCALE : bReadOnly = rOpt.bRODefaultLanguage ; break;
- case UPH_DEFAULT_LOCALE_CJK : bReadOnly = rOpt.bRODefaultLanguage_CJK ; break;
- case UPH_DEFAULT_LOCALE_CTL : bReadOnly = rOpt.bRODefaultLanguage_CTL ; break;
+ case UPH_IS_HYPH_AUTO : bReadOnly = rOpt.bROIsHyphAuto; break;
+ case UPH_IS_HYPH_SPECIAL : bReadOnly = rOpt.bROIsHyphSpecial; break;
+ case UPH_IS_SPELL_AUTO : bReadOnly = rOpt.bROIsSpellAuto; break;
+ case UPH_IS_SPELL_SPECIAL : bReadOnly = rOpt.bROIsSpellSpecial; break;
+ case UPH_IS_WRAP_REVERSE : bReadOnly = rOpt.bROIsSpellReverse; break;
+ case UPH_DEFAULT_LANGUAGE : bReadOnly = rOpt.bRODefaultLanguage; break;
+ case UPH_IS_SPELL_CAPITALIZATION : bReadOnly = rOpt.bROIsSpellCapitalization; break;
+ case UPH_IS_SPELL_WITH_DIGITS : bReadOnly = rOpt.bROIsSpellWithDigits; break;
+ case UPH_IS_SPELL_UPPER_CASE : bReadOnly = rOpt.bROIsSpellUpperCase; break;
+ case UPH_HYPH_MIN_LEADING : bReadOnly = rOpt.bROHyphMinLeading; break;
+ case UPH_HYPH_MIN_TRAILING : bReadOnly = rOpt.bROHyphMinTrailing; break;
+ case UPH_HYPH_MIN_WORD_LENGTH : bReadOnly = rOpt.bROHyphMinWordLength; break;
+ case UPH_ACTIVE_DICTIONARIES : bReadOnly = rOpt.bROActiveDics; break;
+ case UPH_ACTIVE_CONVERSION_DICTIONARIES : bReadOnly = rOpt.bROActiveConvDics; break;
+ case UPH_DEFAULT_LOCALE : bReadOnly = rOpt.bRODefaultLanguage; break;
+ case UPH_DEFAULT_LOCALE_CJK : bReadOnly = rOpt.bRODefaultLanguage_CJK; break;
+ case UPH_DEFAULT_LOCALE_CTL : bReadOnly = rOpt.bRODefaultLanguage_CTL; break;
case UPH_IS_IGNORE_POST_POSITIONAL_WORD : bReadOnly = rOpt.bROIsIgnorePostPositionalWord; break;
case UPH_IS_AUTO_CLOSE_DIALOG : bReadOnly = rOpt.bROIsAutoCloseDialog; break;
case UPH_IS_SHOW_ENTRIES_RECENTLY_USED_FIRST : bReadOnly = rOpt.bROIsShowEntriesRecentlyUsedFirst; break;
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index 9559010b4710..5bb27301aac9 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.cxx
@@ -26,10 +26,10 @@
#include "itemholder1.hxx"
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
#define ROOTNODE_LOCALISATION OUString("Office.Common/View/Localisation")
#define DEFAULT_AUTOMNEMONIC false
@@ -94,8 +94,8 @@ class SvtLocalisationOptions_Impl : public ConfigItem
@onerror -
*//*-*****************************************************************************************************/
- bool IsAutoMnemonic ( ) const ;
- sal_Int32 GetDialogScale ( ) const ;
+ bool IsAutoMnemonic ( ) const;
+ sal_Int32 GetDialogScale ( ) const;
private:
@@ -116,8 +116,8 @@ class SvtLocalisationOptions_Impl : public ConfigItem
private:
- bool m_bAutoMnemonic ;
- sal_Int32 m_nDialogScale ;
+ bool m_bAutoMnemonic;
+ sal_Int32 m_nDialogScale;
};
// constructor
@@ -267,8 +267,8 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames()
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtLocalisationOptions_Impl* SvtLocalisationOptions::m_pDataContainer = NULL ;
-sal_Int32 SvtLocalisationOptions::m_nRefCount = 0 ;
+SvtLocalisationOptions_Impl* SvtLocalisationOptions::m_pDataContainer = NULL;
+sal_Int32 SvtLocalisationOptions::m_nRefCount = 0;
// constructor
diff --git a/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index 8ab0651695e7..bc38bf6c48a8 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.cxx
@@ -139,7 +139,7 @@ void SfxMiscCfg::Load()
{
case 0: bPaperSize = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperSize",
case 1: bPaperOrientation = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/PaperOrientation",
- case 2: bNotFound = *(sal_Bool*)pValues[nProp].getValue() ; break; //"Print/Warning/NotFound",
+ case 2: bNotFound = *(sal_Bool*)pValues[nProp].getValue(); break; //"Print/Warning/NotFound",
case 3: pValues[nProp] >>= nYear2000;break; //"DateFormat/TwoDigitYear",
}
}
diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index 0504c63285fd..119872f545f5 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.cxx
@@ -126,7 +126,7 @@ struct FactoryInfo
// b) add names and values of changed ones only and count it
// c) resize return list by using count
css::uno::Sequence< css::beans::PropertyValue > lProperties ( 4 );
- sal_Int8 nRealyChanged = 0 ;
+ sal_Int8 nRealyChanged = 0;
if( bChangedTemplateFile )
{
@@ -171,11 +171,11 @@ struct FactoryInfo
}
// Don't forget to reset changed flags! Otherwise we save it again and again and ...
- bChangedTemplateFile = false ;
- bChangedWindowAttributes = false ;
- bChangedEmptyDocumentURL = false ;
- bChangedDefaultFilter = false ;
- bChangedIcon = false ;
+ bChangedTemplateFile = false;
+ bChangedWindowAttributes = false;
+ bChangedEmptyDocumentURL = false;
+ bChangedDefaultFilter = false;
+ bChangedIcon = false;
lProperties.realloc( nRealyChanged );
return lProperties;
@@ -195,14 +195,14 @@ struct FactoryInfo
// If you call set-methods - we check for changes of valkues and mark it.
// But if you wish to set it without that ... you must initialize it!
- void initInstalled ( bool bNewInstalled ) { bInstalled = bNewInstalled ; }
- void initFactory ( const OUString& sNewFactory ) { sFactory = sNewFactory ; }
- void initShortName ( const OUString& sNewShortName ) { sShortName = sNewShortName ; }
- void initWindowAttributes ( const OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes ; }
- void initEmptyDocumentURL ( const OUString& sNewEmptyDocumentURL ) { sEmptyDocumentURL = sNewEmptyDocumentURL ; }
- void initDefaultFilter ( const OUString& sNewDefaultFilter ) { sDefaultFilter = sNewDefaultFilter ; }
+ void initInstalled ( bool bNewInstalled ) { bInstalled = bNewInstalled; }
+ void initFactory ( const OUString& sNewFactory ) { sFactory = sNewFactory; }
+ void initShortName ( const OUString& sNewShortName ) { sShortName = sNewShortName; }
+ void initWindowAttributes ( const OUString& sNewWindowAttributes ) { sWindowAttributes = sNewWindowAttributes; }
+ void initEmptyDocumentURL ( const OUString& sNewEmptyDocumentURL ) { sEmptyDocumentURL = sNewEmptyDocumentURL; }
+ void initDefaultFilter ( const OUString& sNewDefaultFilter ) { sDefaultFilter = sNewDefaultFilter; }
void setDefaultFilterReadonly( const bool bVal){bDefaultFilterReadonly = bVal;}
- void initIcon ( sal_Int32 nNewIcon ) { nIcon = nNewIcon ; }
+ void initIcon ( sal_Int32 nNewIcon ) { nIcon = nNewIcon; }
void initTemplateFile( const OUString& sNewTemplateFile )
{
@@ -223,7 +223,7 @@ struct FactoryInfo
if( sTemplateFile != sNewTemplateFile )
{
sTemplateFile = sNewTemplateFile;
- bChangedTemplateFile = true ;
+ bChangedTemplateFile = true;
}
};
@@ -232,7 +232,7 @@ struct FactoryInfo
if( sWindowAttributes != sNewWindowAttributes )
{
sWindowAttributes = sNewWindowAttributes;
- bChangedWindowAttributes = true ;
+ bChangedWindowAttributes = true;
}
};
@@ -241,7 +241,7 @@ struct FactoryInfo
if( sDefaultFilter != sNewDefaultFilter )
{
sDefaultFilter = sNewDefaultFilter;
- bChangedDefaultFilter = true ;
+ bChangedDefaultFilter = true;
}
};
@@ -255,21 +255,21 @@ struct FactoryInfo
return xSubstVars;
}
- bool bInstalled ;
- OUString sFactory ;
- OUString sShortName ;
- OUString sTemplateFile ;
- OUString sWindowAttributes ;
- OUString sEmptyDocumentURL ;
- OUString sDefaultFilter ;
- sal_Int32 nIcon ;
-
- bool bChangedTemplateFile :1 ;
- bool bChangedWindowAttributes :1 ;
- bool bChangedEmptyDocumentURL :1 ;
- bool bChangedDefaultFilter :1 ;
- bool bChangedIcon :1 ;
- bool bDefaultFilterReadonly :1 ;
+ bool bInstalled;
+ OUString sFactory;
+ OUString sShortName;
+ OUString sTemplateFile;
+ OUString sWindowAttributes;
+ OUString sEmptyDocumentURL;
+ OUString sDefaultFilter;
+ sal_Int32 nIcon;
+
+ bool bChangedTemplateFile :1;
+ bool bChangedWindowAttributes :1;
+ bool bChangedEmptyDocumentURL :1;
+ bool bChangedDefaultFilter :1;
+ bool bChangedIcon :1;
+ bool bDefaultFilterReadonly :1;
css::uno::Reference< css::util::XStringSubstitution > xSubstVars;
};
@@ -442,9 +442,9 @@ void SvtModuleOptions_Impl::Commit()
// Step over all factories and get her really changed values only.
// Build list of these ones and use it for commit.
css::uno::Sequence< css::beans::PropertyValue > lCommitProperties( FACTORYCOUNT*PROPERTYCOUNT );
- FactoryInfo* pInfo = NULL ;
- sal_Int32 nRealCount = 0 ;
- OUString sBasePath ;
+ FactoryInfo* pInfo = NULL;
+ sal_Int32 nRealCount = 0;
+ OUString sBasePath;
for( sal_Int32 nFactory=0; nFactory<FACTORYCOUNT; ++nFactory )
{
pInfo = &(m_lFactories[nFactory]);
@@ -741,19 +741,19 @@ void SvtModuleOptions_Impl::SetFactoryDefaultFilter( SvtModuleOptions::EFa
*//*-*************************************************************************************************************/
css::uno::Sequence< OUString > SvtModuleOptions_Impl::impl_ExpandSetNames( const css::uno::Sequence< OUString >& lSetNames )
{
- sal_Int32 nCount = lSetNames.getLength() ;
+ sal_Int32 nCount = lSetNames.getLength();
css::uno::Sequence< OUString > lPropNames ( nCount*PROPERTYCOUNT );
- OUString* pPropNames = lPropNames.getArray() ;
- sal_Int32 nPropStart = 0 ;
+ OUString* pPropNames = lPropNames.getArray();
+ sal_Int32 nPropStart = 0;
for( sal_Int32 nName=0; nName<nCount; ++nName )
{
- pPropNames[nPropStart+PROPERTYHANDLE_SHORTNAME ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_SHORTNAME ;
- pPropNames[nPropStart+PROPERTYHANDLE_TEMPLATEFILE ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_TEMPLATEFILE ;
+ pPropNames[nPropStart+PROPERTYHANDLE_SHORTNAME ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_SHORTNAME;
+ pPropNames[nPropStart+PROPERTYHANDLE_TEMPLATEFILE ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_TEMPLATEFILE;
pPropNames[nPropStart+PROPERTYHANDLE_WINDOWATTRIBUTES] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_WINDOWATTRIBUTES;
pPropNames[nPropStart+PROPERTYHANDLE_EMPTYDOCUMENTURL] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_EMPTYDOCUMENTURL;
- pPropNames[nPropStart+PROPERTYHANDLE_DEFAULTFILTER ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_DEFAULTFILTER ;
- pPropNames[nPropStart+PROPERTYHANDLE_ICON ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_ICON ;
+ pPropNames[nPropStart+PROPERTYHANDLE_DEFAULTFILTER ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_DEFAULTFILTER;
+ pPropNames[nPropStart+PROPERTYHANDLE_ICON ] = lSetNames[nName] + PATHSEPARATOR + PROPERTYNAME_ICON;
nPropStart += PROPERTYCOUNT;
}
@@ -783,60 +783,60 @@ bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtMod
{
bool bState;
- eFactory = SvtModuleOptions::E_WRITER ;
+ eFactory = SvtModuleOptions::E_WRITER;
bState = ( sName == FACTORYNAME_WRITER );
if( !bState )
{
- eFactory = SvtModuleOptions::E_WRITERWEB ;
+ eFactory = SvtModuleOptions::E_WRITERWEB;
bState = ( sName == FACTORYNAME_WRITERWEB );
}
// no else!
if( !bState )
{
- eFactory = SvtModuleOptions::E_WRITERGLOBAL ;
+ eFactory = SvtModuleOptions::E_WRITERGLOBAL;
bState = ( sName == FACTORYNAME_WRITERGLOBAL );
}
// no else!
if( !bState )
{
- eFactory = SvtModuleOptions::E_CALC ;
+ eFactory = SvtModuleOptions::E_CALC;
bState = ( sName == FACTORYNAME_CALC );
}
// no else!
if( !bState )
{
- eFactory = SvtModuleOptions::E_DRAW ;
+ eFactory = SvtModuleOptions::E_DRAW;
bState = ( sName == FACTORYNAME_DRAW );
}
// no else!
if( !bState )
{
- eFactory = SvtModuleOptions::E_IMPRESS ;
+ eFactory = SvtModuleOptions::E_IMPRESS;
bState = ( sName == FACTORYNAME_IMPRESS );
}
// no else!
if( !bState )
{
- eFactory = SvtModuleOptions::E_MATH ;
+ eFactory = SvtModuleOptions::E_MATH;
bState = ( sName == FACTORYNAME_MATH );
}
// no else!
if( !bState )
{
- eFactory = SvtModuleOptions::E_CHART ;
+ eFactory = SvtModuleOptions::E_CHART;
bState = ( sName == FACTORYNAME_CHART );
}
// no else!
if( !bState )
{
- eFactory = SvtModuleOptions::E_DATABASE ;
+ eFactory = SvtModuleOptions::E_DATABASE;
bState = ( sName == FACTORYNAME_DATABASE );
}
// no else!
if( !bState )
{
- eFactory = SvtModuleOptions::E_STARTMODULE ;
+ eFactory = SvtModuleOptions::E_STARTMODULE;
bState = ( sName == FACTORYNAME_STARTMODULE);
}
@@ -881,10 +881,10 @@ void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence< OUString >& lFa
// Attention: If a propertyset of a factory will be ignored we must step to next start position of next factory infos!
// see "nPropertyStart += PROPERTYCOUNT" ...
- sal_Int32 nPropertyStart = 0 ;
+ sal_Int32 nPropertyStart = 0;
sal_Int32 nNodeCount = lFactories.getLength();
- FactoryInfo* pInfo = NULL ;
- SvtModuleOptions::EFactory eFactory ;
+ FactoryInfo* pInfo = NULL;
+ SvtModuleOptions::EFactory eFactory;
for( sal_Int32 nSetNode=0; nSetNode<nNodeCount; ++nSetNode )
{
@@ -939,7 +939,7 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable()
for (i=0; i<c; ++i)
{
OUString& rFactoryName = lFactories[i];
- SvtModuleOptions::EFactory eFactory ;
+ SvtModuleOptions::EFactory eFactory;
if (!ClassifyFactoryByName(rFactoryName, eFactory))
continue;
@@ -955,8 +955,8 @@ void SvtModuleOptions_Impl::MakeReadonlyStatesAvailable()
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtModuleOptions_Impl* SvtModuleOptions::m_pDataContainer = NULL ;
-sal_Int32 SvtModuleOptions::m_nRefCount = 0 ;
+SvtModuleOptions_Impl* SvtModuleOptions::m_pDataContainer = NULL;
+sal_Int32 SvtModuleOptions::m_nRefCount = 0;
/*-************************************************************************************************************
@short standard constructor and destructor
@@ -1219,7 +1219,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByURL(const OUString
css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext();
css::uno::Reference< css::container::XNameAccess > xFilterCfg;
- css::uno::Reference< css::container::XNameAccess > xTypeCfg ;
+ css::uno::Reference< css::container::XNameAccess > xTypeCfg;
try
{
xFilterCfg = css::uno::Reference< css::container::XNameAccess >(
@@ -1297,7 +1297,7 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByModel(const css::u
const css::uno::Sequence< OUString > lServices = xInfo->getSupportedServiceNames();
const OUString* pServices = lServices.getConstArray();
- for (sal_Int32 i=0; i<lServices.getLength() ; ++i)
+ for (sal_Int32 i=0; i<lServices.getLength(); ++i)
{
SvtModuleOptions::EFactory eApp = SvtModuleOptions::ClassifyFactoryByServiceName(pServices[i]);
if (eApp != E_UNKNOWN_FACTORY)
diff --git a/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 886c0c2e7953..c318e6f1c70e 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.cxx
@@ -28,7 +28,7 @@
#include "itemholder1.hxx"
using namespace utl;
-using namespace com::sun::star::beans ;
+using namespace com::sun::star::beans;
using namespace com::sun::star::uno;
#define CFG_FILENAME OUString( "Office.OptionsDialog" )
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index d66ff822dc85..297d8cbafcc7 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.cxx
@@ -28,10 +28,10 @@
// namespaces
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
#define ROOTNODE_START OUString("Office.Common/Print")
@@ -321,7 +321,7 @@ bool SvtPrintWarningOptions::IsModifyDocumentOnPrintingAllowed() const
void SvtPrintWarningOptions::SetModifyDocumentOnPrintingAllowed( bool bState )
{
MutexGuard aGuard( GetOwnStaticMutex() );
- m_pDataContainer->SetModifyDocumentOnPrintingAllowed( bState ) ;
+ m_pDataContainer->SetModifyDocumentOnPrintingAllowed( bState );
}
namespace
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 8fe31a372013..56c4ef53218e 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -35,10 +35,10 @@
// namespaces
-using namespace ::utl ;
-using namespace ::rtl ;
-using namespace ::osl ;
-using namespace ::com::sun::star::uno ;
+using namespace ::utl;
+using namespace ::rtl;
+using namespace ::osl;
+using namespace ::com::sun::star::uno;
#define ROOTNODE_SECURITY OUString("Office.Common/Security/Scripting")
#define DEFAULT_SECUREURL Sequence< OUString >()
@@ -145,21 +145,21 @@ class SvtSecurityOptions_Impl : public ConfigItem
// public interface
- bool IsReadOnly ( SvtSecurityOptions::EOption eOption ) const ;
+ bool IsReadOnly ( SvtSecurityOptions::EOption eOption ) const;
- Sequence< OUString > GetSecureURLs ( ) const ;
- void SetSecureURLs ( const Sequence< OUString >& seqURLList ) ;
- inline sal_Int32 GetMacroSecurityLevel ( ) const ;
- void SetMacroSecurityLevel ( sal_Int32 _nLevel ) ;
+ Sequence< OUString > GetSecureURLs ( ) const;
+ void SetSecureURLs ( const Sequence< OUString >& seqURLList );
+ inline sal_Int32 GetMacroSecurityLevel ( ) const;
+ void SetMacroSecurityLevel ( sal_Int32 _nLevel );
- inline bool IsMacroDisabled ( ) const ;
+ inline bool IsMacroDisabled ( ) const;
- Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors ( ) const ;
- void SetTrustedAuthors ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors ) ;
+ Sequence< SvtSecurityOptions::Certificate > GetTrustedAuthors ( ) const;
+ void SetTrustedAuthors ( const Sequence< SvtSecurityOptions::Certificate >& rAuthors );
- bool IsOptionSet ( SvtSecurityOptions::EOption eOption ) const ;
- bool SetOption ( SvtSecurityOptions::EOption eOption, bool bValue ) ;
- bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const ;
+ bool IsOptionSet ( SvtSecurityOptions::EOption eOption ) const;
+ bool SetOption ( SvtSecurityOptions::EOption eOption, bool bValue );
+ bool IsOptionEnabled ( SvtSecurityOptions::EOption eOption ) const;
/*-****************************************************************************************************
@short return list of key names of ouer configuration management which represent our module tree
@@ -224,8 +224,8 @@ class SvtSecurityOptions_Impl : public ConfigItem
void SetConfirmationEnabled( bool bSet );
bool IsExecutePlugins() const;
void SetExecutePlugins( bool bSet );
- EBasicSecurityMode GetBasicMode ( ) const ;
- void SetBasicMode ( EBasicSecurityMode eMode ) ;
+ EBasicSecurityMode GetBasicMode ( ) const;
+ void SetBasicMode ( EBasicSecurityMode eMode );
};
// constructor
@@ -280,7 +280,7 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
// Copy values from list in right order to our internal member.
sal_Int32 nPropertyCount = seqValues.getLength();
- for( sal_Int32 nProperty = 0 ; nProperty < nPropertyCount ; ++nProperty )
+ for( sal_Int32 nProperty = 0; nProperty < nPropertyCount; ++nProperty )
SetProperty( nProperty, seqValues[ nProperty ], seqRO[ nProperty ] );
LoadAuthors();
@@ -309,7 +309,7 @@ void SvtSecurityOptions_Impl::SetProperty( sal_Int32 nProperty, const Any& rValu
rValue >>= m_seqSecureURLs;
SvtPathOptions aOpt;
sal_uInt32 nCount = m_seqSecureURLs.getLength();
- for( sal_uInt32 nItem = 0 ; nItem < nCount ; ++nItem )
+ for( sal_uInt32 nItem = 0; nItem < nCount; ++nItem )
m_seqSecureURLs[ nItem ] = aOpt.SubstituteVariable( m_seqSecureURLs[ nItem ] );
m_bROSecureURLs = bRO;
}
@@ -441,7 +441,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void )
sal_Int32 i1;
sal_Int32 i2;
OUString aSep( "/" );
- for( i1 = 0, i2 = 0 ; i1 < c1 ; ++i1 )
+ for( i1 = 0, i2 = 0; i1 < c1; ++i1 )
{
lAllAuthors[ i2 ] = PROPERTYNAME_MACRO_TRUSTEDAUTHORS + aSep + lAuthors[ i1 ] + aSep + PROPERTYNAME_TRUSTEDAUTHOR_SUBJECTNAME;
++i2;
@@ -456,7 +456,7 @@ void SvtSecurityOptions_Impl::LoadAuthors( void )
{
comphelper::SequenceAsVector< SvtSecurityOptions::Certificate > v;
SvtSecurityOptions::Certificate aCert( 3 );
- for( i1 = 0, i2 = 0 ; i1 < c1 ; ++i1 )
+ for( i1 = 0, i2 = 0; i1 < c1; ++i1 )
{
lValues[ i2 ] >>= aCert[ 0 ];
++i2;
@@ -579,7 +579,7 @@ void SvtSecurityOptions_Impl::Notify( const Sequence< OUString >& seqPropertyNam
DBG_ASSERT( !(seqPropertyNames.getLength()!=seqValues.getLength()), "SvtSecurityOptions_Impl::Notify()\nI miss some values of configuration keys!\n" );
// Step over list of property names and get right value from coreesponding value list to set it on internal members!
sal_Int32 nCount = seqPropertyNames.getLength();
- for( sal_Int32 nProperty = 0 ; nProperty < nCount ; ++nProperty )
+ for( sal_Int32 nProperty = 0; nProperty < nCount; ++nProperty )
SetProperty( GetHandle( seqPropertyNames[ nProperty ] ), seqValues[ nProperty ], seqRO[ nProperty ] );
// read set of trusted authors separately
@@ -599,7 +599,7 @@ void SvtSecurityOptions_Impl::Commit()
ClearNodeSet( PROPERTYNAME_MACRO_TRUSTEDAUTHORS );
- for( sal_Int32 nProperty = 0 ; nProperty < nOrgCount ; ++nProperty )
+ for( sal_Int32 nProperty = 0; nProperty < nOrgCount; ++nProperty )
{
switch( nProperty )
{
@@ -611,7 +611,7 @@ void SvtSecurityOptions_Impl::Commit()
Sequence< OUString > lURLs( m_seqSecureURLs );
SvtPathOptions aOpt;
sal_Int32 nURLsCnt = lURLs.getLength();
- for( sal_Int32 nItem = 0 ; nItem < nURLsCnt ; ++nItem )
+ for( sal_Int32 nItem = 0; nItem < nURLsCnt; ++nItem )
lURLs[ nItem ] = aOpt.UseVariable( lURLs[ nItem ] );
lValues[ nRealCount ] <<= lURLs;
}
@@ -698,7 +698,7 @@ void SvtSecurityOptions_Impl::Commit()
sal_Int32 nCnt = m_seqTrustedAuthors.getLength();
if( nCnt )
{
- for( sal_Int32 i = 0 ; i < nCnt ; ++i )
+ for( sal_Int32 i = 0; i < nCnt; ++i )
{
OUString aPrefix(
PROPERTYNAME_MACRO_TRUSTEDAUTHORS "/a"
@@ -974,8 +974,8 @@ Sequence< OUString > SvtSecurityOptions_Impl::GetPropertyNames()
// DON'T DO IT IN YOUR HEADER!
// see definition for further information
-SvtSecurityOptions_Impl* SvtSecurityOptions::m_pDataContainer = NULL ;
-sal_Int32 SvtSecurityOptions::m_nRefCount = 0 ;
+SvtSecurityOptions_Impl* SvtSecurityOptions::m_pDataContainer = NULL;
+sal_Int32 SvtSecurityOptions::m_nRefCount = 0;
SvtSecurityOptions::SvtSecurityOptions()
{
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 1273c0418e77..0a650b955c17 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.cxx
@@ -70,14 +70,14 @@
// initialization!
-SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Dialogs = NULL ;
-sal_Int32 SvtViewOptions::m_nRefCount_Dialogs = 0 ;
-SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_TabDialogs = NULL ;
-sal_Int32 SvtViewOptions::m_nRefCount_TabDialogs = 0 ;
-SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_TabPages = NULL ;
-sal_Int32 SvtViewOptions::m_nRefCount_TabPages = 0 ;
-SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Windows = NULL ;
-sal_Int32 SvtViewOptions::m_nRefCount_Windows = 0 ;
+SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Dialogs = NULL;
+sal_Int32 SvtViewOptions::m_nRefCount_Dialogs = 0;
+SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_TabDialogs = NULL;
+sal_Int32 SvtViewOptions::m_nRefCount_TabDialogs = 0;
+SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_TabPages = NULL;
+sal_Int32 SvtViewOptions::m_nRefCount_TabPages = 0;
+SvtViewOptionsBase_Impl* SvtViewOptions::m_pDataContainer_Windows = NULL;
+sal_Int32 SvtViewOptions::m_nRefCount_Windows = 0;
// private declarations!
@@ -102,12 +102,12 @@ class IMPL_TViewData
// create "default" item
IMPL_TViewData()
{
- m_sWindowState = DEFAULT_WINDOWSTATE ;
- m_lUserData = DEFAULT_USERDATA ;
- m_nPageID = DEFAULT_PAGEID ;
- m_bVisible = DEFAULT_VISIBLE ;
+ m_sWindowState = DEFAULT_WINDOWSTATE;
+ m_lUserData = DEFAULT_USERDATA;
+ m_nPageID = DEFAULT_PAGEID;
+ m_bVisible = DEFAULT_VISIBLE;
- m_bDefault = true ;
+ m_bDefault = true;
}
// write access - with reseting of default state
@@ -149,9 +149,9 @@ class IMPL_TViewData
// read access
OUString getWindowState() { return m_sWindowState; }
- css::uno::Sequence< css::beans::NamedValue > getUserData () { return m_lUserData ; }
- sal_Int32 getPageID () { return m_nPageID ; }
- bool getVisible () { return m_bVisible ; }
+ css::uno::Sequence< css::beans::NamedValue > getUserData () { return m_lUserData; }
+ sal_Int32 getPageID () { return m_nPageID; }
+ bool getVisible () { return m_bVisible; }
// special operation for easy access on user data
void setUserItem( const OUString& sName ,
@@ -170,7 +170,7 @@ class IMPL_TViewData
{
if( m_lUserData[nStep].Name == sName )
{
- m_lUserData[nStep].Value = aValue ;
+ m_lUserData[nStep].Value = aValue;
bExist = true;
break;
}
@@ -180,8 +180,8 @@ class IMPL_TViewData
if( !bExist )
{
m_lUserData.realloc( nCount+1 );
- m_lUserData[nCount].Name = sName ;
- m_lUserData[nCount].Value = aValue ;
+ m_lUserData[nCount].Name = sName;
+ m_lUserData[nCount].Value = aValue;
}
}
@@ -206,12 +206,12 @@ class IMPL_TViewData
bool isDefault() { return m_bDefault; }
private:
- OUString m_sWindowState ;
- css::uno::Sequence< css::beans::NamedValue > m_lUserData ;
- sal_Int32 m_nPageID ;
- bool m_bVisible ;
+ OUString m_sWindowState;
+ css::uno::Sequence< css::beans::NamedValue > m_lUserData;
+ sal_Int32 m_nPageID;
+ bool m_bVisible;
- bool m_bDefault ;
+ bool m_bDefault;
};
struct IMPL_TStringHashCode
@@ -276,8 +276,8 @@ class SvtViewOptionsBase_Impl
css::uno::Reference< css::container::XNameAccess > m_xSet;
#ifdef DEBUG_VIEWOPTIONS
- sal_Int32 m_nReadCount ;
- sal_Int32 m_nWriteCount ;
+ sal_Int32 m_nReadCount;
+ sal_Int32 m_nWriteCount;
#endif
};
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index 671ed8a91c99..14f118703b77 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -572,7 +572,7 @@ void LocaleDataWrapper::getCurrSymbolsImpl()
aCurrBankSymbol = aCurrSymbol;
nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault;
nCurrDigits = 2;
- return ;
+ return;
}
}
aCurrSymbol = pCurrArr[nElem].Symbol;
@@ -672,7 +672,7 @@ void LocaleDataWrapper::getCurrFormatsImpl()
outputCheckMessage( appendLocaleInfo( aMsg ) );
}
nCurrPositiveFormat = nCurrNegativeFormat = nCurrFormatDefault;
- return ;
+ return;
}
// find a negative code (medium preferred) and a default (medium preferred) (not necessarily the same)
NumberFormatCode const * const pFormatArr = aFormatSeq.getArray();
@@ -920,7 +920,7 @@ void LocaleDataWrapper::getDateFormatsImpl()
outputCheckMessage( appendLocaleInfo( aMsg ) );
}
nDateFormat = nLongDateFormat = DMY;
- return ;
+ return;
}
// find the edit (21), a default (medium preferred),
// a medium (default preferred), and a long (default preferred)
@@ -1154,7 +1154,7 @@ inline sal_Unicode* ImplAddString( sal_Unicode* pBuf, const OUString& rStr )
if ( rStr.getLength() == 1 )
*pBuf++ = rStr[0];
else if (rStr.isEmpty())
- ;
+;
else
{
memcpy( pBuf, rStr.getStr(), rStr.getLength() * sizeof(sal_Unicode) );
@@ -1246,7 +1246,7 @@ sal_Unicode* LocaleDataWrapper::ImplAddFormatNum( sal_Unicode* pBuf,
if (bUseThousandSep)
aGroupPos = utl::DigitGroupingIterator::createForwardSequence(
nNumLen2, getDigitGrouping());
- for ( ; i < nNumLen2; ++i )
+ for (; i < nNumLen2; ++i )
{
*pBuf = *pNumBuf;
pBuf++;
diff --git a/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index ef7a3ae8a5bf..0f4206e6c2e6 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -377,11 +377,11 @@ void GetEnglishSearchFontName( OUString& rName )
// Upper to Lower
if ( (c >= 'A') && (c <= 'Z') )
c += 'a' - 'A';
- //rName[ i ] = c ;
+ //rName[ i ] = c;
- OUStringBuffer aTmpStr( rName.getStr() ) ;
- aTmpStr[ i ] = c ;
- rName = aTmpStr.makeStringAndClear() ;
+ OUStringBuffer aTmpStr( rName.getStr() );
+ aTmpStr[ i ] = c;
+ rName = aTmpStr.makeStringAndClear();
}
else
@@ -397,20 +397,20 @@ void GetEnglishSearchFontName( OUString& rName )
if ( (c >= 'A') && (c <= 'Z') )
{
c += 'a' - 'A';
- //rName[ i ] = c ;
+ //rName[ i ] = c;
- OUStringBuffer aTmpStr( rName.getStr() ) ;
- aTmpStr[ i ] = c ;
- rName = aTmpStr.makeStringAndClear() ;
+ OUStringBuffer aTmpStr( rName.getStr() );
+ aTmpStr[ i ] = c;
+ rName = aTmpStr.makeStringAndClear();
}
else if( ((c < '0') || (c > '9')) && (c != ';') ) // not 0-9 or semicolon
{
// Remove white spaces and special characters
- OUStringBuffer aTmpStr( rName.getStr() ) ;
+ OUStringBuffer aTmpStr( rName.getStr() );
aTmpStr.remove(i,1);
- rName = aTmpStr.makeStringAndClear() ;
+ rName = aTmpStr.makeStringAndClear();
nLen--;
continue;
@@ -436,7 +436,7 @@ void GetEnglishSearchFontName( OUString& rName )
FontNameDictionary::const_iterator it = aDictionary.find( rName );
if( it != aDictionary.end() )
- rName = OUString::createFromAscii ( it->second ) ;
+ rName = OUString::createFromAscii ( it->second );
}
}
@@ -503,7 +503,7 @@ static void ImplAppendFontToken( OUString& rName, const OUString& rNewToken )
{
if ( !rName.isEmpty() )
{
- rName += ";" ;
+ rName += ";";
}
rName += rNewToken;
}
diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx
index 3e6dd3c285b8..de5a1f502c32 100644
--- a/unotools/source/misc/mediadescriptor.cxx
+++ b/unotools/source/misc/mediadescriptor.cxx
@@ -638,7 +638,7 @@ bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, bool bLockFi
// (if its allowed to do so).
// But handle errors in a "hidden mode". Because
// we try it readonly later - if read/write isnt an option.
- css::uno::Reference< css::io::XStream > xStream ;
+ css::uno::Reference< css::io::XStream > xStream;
css::uno::Reference< css::io::XInputStream > xInputStream;
bool bReadOnly = false;
diff --git a/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index a5ef10f1fba4..5591c310ac9e 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.cxx
@@ -205,7 +205,7 @@ void CreateTempName_Impl( OUString& rName, bool bKeep, bool bDir = true )
u %= nMax;
OUString aTmp( aName );
aTmp += OUString::number(u, nRadix);
- aTmp += ".tmp" ;
+ aTmp += ".tmp";
if ( bDir )
{
@@ -282,7 +282,7 @@ void lcl_createName(TempFile_Impl& _rImpl,const OUString& rLeadingChars, bool _b
if ( pExtension )
aTmp += *pExtension;
else
- aTmp += ".tmp" ;
+ aTmp += ".tmp";
if ( bDirectory )
{
FileBase::RC err = Directory::create( aTmp );
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index a40d6b0213b9..4d4f4faed467 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -55,7 +55,7 @@ throw ( css::uno::RuntimeException, std::exception )
{
css::uno::Any aResult( OTempFileBase::queryInterface( aType ) );
if (!aResult.hasValue())
- aResult = cppu::PropertySetMixin< css::io::XTempFile >::queryInterface( aType ) ;
+ aResult = cppu::PropertySetMixin< css::io::XTempFile >::queryInterface( aType );
return aResult;
};
void SAL_CALL OTempFileService::acquire( )
@@ -77,7 +77,7 @@ throw ( css::uno::RuntimeException, std::exception )
static ::cppu::OTypeCollection* pTypeCollection = NULL;
if ( pTypeCollection == NULL )
{
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ) ;
+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( pTypeCollection == NULL )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 02:26:50 +0000