[Libreoffice-commits] .: Branch 'integration/dev300_m101' - avmedia/source basic/source connectivity/source connectivity/workben desktop/source desktop/util editeng/source framework/inc framework/source sfx2/inc sfx2/source svx/inc svx/source xmlhelp/source xmloff/source xmlscript/source
Thorsten Behrens
thorsten at kemper.freedesktop.org
Thu Mar 10 04:38:18 PST 2011
avmedia/source/framework/mediaitem.cxx | 4
basic/source/app/appedit.cxx | 4
basic/source/classes/sb.cxx | 10 -
basic/source/comp/codegen.cxx | 2
basic/source/sbx/sbxint.cxx | 2
basic/source/sbx/sbxscan.cxx | 2
basic/source/uno/namecont.cxx | 2
connectivity/source/cpool/ZConnectionPool.cxx | 8
connectivity/source/cpool/ZConnectionPool.hxx | 2
connectivity/source/drivers/evoab/LColumns.cxx | 2
connectivity/source/drivers/mozab/MResultSet.cxx | 28 +-
connectivity/source/drivers/mozab/MResultSet.hxx | 4
connectivity/source/drivers/mozab/makefile.mk | 2
connectivity/source/drivers/mozab/makefile_mozab.mk | 2
connectivity/workben/iniParser/makefile.mk | 2
connectivity/workben/testmoz/makefile.mk | 6
desktop/source/app/app.cxx | 4
desktop/source/app/officeipcthread.cxx | 12 -
desktop/source/deployment/gui/dp_gui_dialog.src | 10 -
desktop/source/deployment/gui/dp_gui_extlistbox.cxx | 6
desktop/source/deployment/gui/license_dialog.cxx | 8
desktop/source/deployment/registry/help/dp_help.cxx | 12 -
desktop/source/deployment/registry/script/dp_script.cxx | 2
desktop/source/migration/migration.cxx | 4
desktop/source/migration/migration_impl.hxx | 2
desktop/source/so_comp/oemjob.cxx | 2
desktop/util/makefile.mk | 2
editeng/source/editeng/editattr.hxx | 34 +--
editeng/source/editeng/editdoc.cxx | 2
editeng/source/editeng/editdoc.hxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/editview.cxx | 2
editeng/source/editeng/impedit.cxx | 2
editeng/source/editeng/impedit.hxx | 2
editeng/source/editeng/impedit4.cxx | 4
editeng/source/outliner/outliner.cxx | 10 -
framework/inc/classes/addonmenu.hxx | 6
framework/inc/classes/addonsoptions.hxx | 6
framework/inc/uielement/newmenucontroller.hxx | 4
framework/inc/uielement/toolbarmanager.hxx | 4
framework/source/classes/menumanager.cxx | 2
framework/source/dispatch/windowcommanddispatch.cxx | 2
framework/source/helper/actiontriggerhelper.cxx | 2
framework/source/helper/titlebarupdate.cxx | 2
framework/source/helper/vclstatusindicator.cxx | 4
framework/source/loadenv/loadenv.cxx | 2
framework/source/services/backingwindow.cxx | 28 +-
framework/source/uielement/controlmenucontroller.cxx | 28 +-
framework/source/uielement/logoimagestatusbarcontroller.cxx | 4
framework/source/uielement/logotextstatusbarcontroller.cxx | 4
framework/source/uielement/simpletextstatusbarcontroller.cxx | 4
framework/source/uielement/toolbarmanager.cxx | 8
sfx2/inc/mailmodelapi.hxx | 2
sfx2/inc/sfx2/viewsh.hxx | 4
sfx2/source/appl/appuno.cxx | 4
sfx2/source/appl/helpinterceptor.hxx | 2
sfx2/source/control/bindings.cxx | 2
sfx2/source/dialog/about.cxx | 6
sfx2/source/dialog/dinfdlg.cxx | 2
sfx2/source/dialog/taskpane.cxx | 4
sfx2/source/dialog/templdlg.cxx | 2
sfx2/source/dialog/titledockwin.cxx | 6
sfx2/source/doc/objcont.cxx | 12 -
sfx2/source/menu/mnumgr.cxx | 6
sfx2/source/menu/virtmenu.cxx | 4
sfx2/source/toolbox/imgmgr.cxx | 12 -
sfx2/source/view/viewsh.cxx | 2
svx/inc/galtheme.hxx | 2
svx/inc/svditer.hxx | 2
svx/inc/svx/gallery1.hxx | 8
svx/inc/svx/gridctrl.hxx | 2
svx/inc/svx/svdhdl.hxx | 4
svx/inc/svx/svxdlg.hxx | 4
svx/source/dialog/_contdlg.cxx | 2
svx/source/dialog/fontwork.cxx | 4
svx/source/dialog/imapwnd.cxx | 2
svx/source/dialog/srchdlg.cxx | 2
svx/source/engine3d/float3d.cxx | 2
svx/source/fmcomp/fmgridcl.cxx | 4
svx/source/fmcomp/gridcell.cxx | 2
svx/source/fmcomp/gridctrl.cxx | 2
svx/source/form/filtnav.cxx | 4
svx/source/form/fmshell.cxx | 2
svx/source/form/navigatortree.cxx | 2
svx/source/form/navigatortreemodel.cxx | 2
svx/source/gallery2/galbrws2.cxx | 42 ++--
svx/source/gallery2/galtheme.cxx | 8
svx/source/inc/charmapacc.hxx | 4
svx/source/inc/fmexpl.hxx | 2
svx/source/items/zoomslideritem.cxx | 2
svx/source/sdr/contact/viewcontactofsdrpage.cxx | 12 -
svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx | 6
svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx | 4
svx/source/svdraw/svdedtv2.cxx | 4
svx/source/svdraw/svdhdl.cxx | 14 -
svx/source/svdraw/svdpntv.cxx | 6
svx/source/tbxctrls/extrusioncontrols.cxx | 4
svx/source/tbxctrls/extrusioncontrols.src | 10 -
svx/source/tbxctrls/fillctrl.cxx | 2
svx/source/tbxctrls/fontworkgallery.cxx | 2
svx/source/tbxctrls/fontworkgallery.src | 4
svx/source/tbxctrls/grafctrl.cxx | 44 ++--
svx/source/unodraw/unopage.cxx | 2
svx/source/xoutdev/_xpoly.cxx | 2
svx/source/xoutdev/xattr.cxx | 4
xmlhelp/source/cxxhelp/provider/databases.cxx | 110 +++++------
xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 66 +++---
xmlhelp/source/treeview/tvread.cxx | 60 +++---
xmloff/source/draw/sdxmlexp.cxx | 8
xmloff/source/draw/ximp3dscene.cxx | 4
xmloff/source/draw/ximpstyl.cxx | 6
xmloff/source/style/impastp1.cxx | 2
xmloff/source/style/impastpl.hxx | 2
xmloff/source/text/txtimp.cxx | 2
xmlscript/source/xmldlg_imexp/exp_share.hxx | 14 -
xmlscript/source/xmldlg_imexp/xmldlg_export.cxx | 50 ++---
116 files changed, 470 insertions(+), 470 deletions(-)
New commits:
commit ff62ed4745a9b2367c68ef3eb863d29022f0fa7d
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Wed Mar 9 14:56:21 2011 +0100
Revert idle whitespace changes
Reverting all hunks that solely change whitespace, prior to
performing the m101 merge from OOo.
diff --git a/avmedia/source/framework/mediaitem.cxx b/avmedia/source/framework/mediaitem.cxx
index 8501fd0..601366f 100644
--- a/avmedia/source/framework/mediaitem.cxx
+++ b/avmedia/source/framework/mediaitem.cxx
@@ -162,10 +162,10 @@ bool MediaItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
aSeq[ 6 ] >>= mbLoop;
aSeq[ 7 ] >>= mbMute;
aSeq[ 8 ] >>= meZoom;
-
+
bRet = true;
}
-
+
return bRet;
}
diff --git a/basic/source/app/appedit.cxx b/basic/source/app/appedit.cxx
index aafa434..4367754 100644
--- a/basic/source/app/appedit.cxx
+++ b/basic/source/app/appedit.cxx
@@ -190,12 +190,12 @@ FileType AppEdit::GetFileType()
long AppEdit::InitMenu( Menu* pMenu )
{
AppWin::InitMenu (pMenu );
-
+
if( pDataEdit )
{
USHORT UndoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetUndoActionCount();
USHORT RedoCount = ((TextEdit*)pDataEdit)->aEdit.pTextEngine->GetUndoManager().GetRedoActionCount();
-
+
pMenu->EnableItem( RID_EDITUNDO, UndoCount > 0 );
pMenu->EnableItem( RID_EDITREDO, RedoCount > 0 );
}
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 193cbfa..bbc44d6 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -80,7 +80,7 @@ SbxObject* StarBASIC::getVBAGlobals( )
if ( GetUNOConstant("ThisComponent", aThisDoc) )
{
Reference< XMultiServiceFactory > xDocFac( aThisDoc, UNO_QUERY );
- if ( xDocFac.is() )
+ if ( xDocFac.is() )
{
try
{
@@ -835,7 +835,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ::rtl::OUString& r
}
SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo, const rtl::OUString& rSrc )
{
-
+
OSL_TRACE("create module %s type mInfo %d", rtl::OUStringToOString( rName, RTL_TEXTENCODING_UTF8 ).getStr(), mInfo.ModuleType );
SbModule* p = NULL;
switch ( mInfo.ModuleType )
@@ -855,7 +855,7 @@ SbModule* StarBASIC::MakeModule32( const String& rName, const ModuleInfo& mInfo,
break;
default:
p = new SbModule( rName, isVBAEnabled() );
-
+
}
p->SetSource32( rSrc );
p->SetParent( this );
@@ -1346,7 +1346,7 @@ USHORT StarBASIC::GetVBErrorCode( SbError nError )
nRet = 0;
}
}
-
+
// search loop
const SFX_VB_ErrorItem* pErrItem;
USHORT nIndex = 0;
@@ -1782,7 +1782,7 @@ BasicCollection::BasicCollection( const XubString& rClass )
nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemoveStr ) );
}
Initialize();
-
+
}
BasicCollection::~BasicCollection()
diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx
index acd909e..d292448 100644
--- a/basic/source/comp/codegen.cxx
+++ b/basic/source/comp/codegen.cxx
@@ -244,7 +244,7 @@ void SbiCodeGen::Save()
if( nPass == 1 )
aPropName = aPropName.Copy( aIfaceName.Len() + 1 );
SbProcedureProperty* pProcedureProperty = NULL;
- OSL_TRACE("*** getProcedureProperty for thing %s",
+ OSL_TRACE("*** getProcedureProperty for thing %s",
rtl::OUStringToOString( aPropName,RTL_TEXTENCODING_UTF8 ).getStr() );
pProcedureProperty = rMod.GetProcedureProperty( aPropName, ePropType );
}
diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx
index cc973d2..67f8932 100644
--- a/basic/source/sbx/sbxint.cxx
+++ b/basic/source/sbx/sbxint.cxx
@@ -157,7 +157,7 @@ start:
else
nRes = (INT16) ImpRound( dVal );
break;
- }
+ }
case SbxLPSTR:
case SbxSTRING:
case SbxBYREF | SbxSTRING:
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 93567e8..c18e271 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -889,7 +889,7 @@ void SbxValue::Format( XubString& rRes, const XubString* pFmt ) const
sal_Unicode cComma = rData.getNumDecimalSep().GetBuffer()[0];
sal_Unicode c1000 = rData.getNumThousandSep().GetBuffer()[0];
String aCurrencyStrg = rData.getCurrSymbol();
-
+
// Initialisierung des Basic-Formater-Hilfsobjekts:
// hole die Resourcen f"ur die vordefinierten Ausgaben
// des Format()-Befehls, z.B. f"ur "On/Off".
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index ad65778..b91840d 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -2798,7 +2798,7 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString
OUString aRetStr = pImplLib->maOrignialStorageURL;
return aRetStr;
}
-
+
// XVBACompatibility
::sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException)
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index 6b51401..a1836f2 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -68,7 +68,7 @@ namespace
static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "Timeout" ));
return s_sNodeName;
}
-
+
}
//==========================================================================
//= OConnectionPool
@@ -196,7 +196,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const
if ( !xConnection.is() )
xConnection = createNewConnection(_rURL,_rInfo);
-
+
return xConnection;
}
//--------------------------------------------------------------------------
@@ -239,7 +239,7 @@ Reference< XConnection> OConnectionPool::createNewConnection(const ::rtl::OUStri
TConnectionMap::key_type nId;
OConnectionWrapper::createUniqueId(_rURL,aInfo,nId.m_pBuffer);
TConnectionPool aPack;
-
+
// insert the new connection and struct into the active connection map
aPack.nALiveCount = m_nALiveCount;
TActiveConnectionInfo aActiveInfo;
@@ -303,7 +303,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite
Reference< XComponent > xComponent(xConnection, UNO_QUERY);
if (xComponent.is())
xComponent->addEventListener(this);
-
+
TActiveConnectionInfo aActiveInfo;
aActiveInfo.aPos = _rIter;
aActiveInfo.xPooledConnection = xPooledConnection;
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 0df96c3..fc608ea 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -124,7 +124,7 @@ namespace connectivity
::com::sun::star::uno::Reference< ::com::sun::star::reflection::XProxyFactory > m_xProxyFactory;
sal_Int32 m_nTimeOut;
sal_Int32 m_nALiveCount;
-
+
private:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> createNewConnection(const ::rtl::OUString& _rURL,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo);
diff --git a/connectivity/source/drivers/evoab/LColumns.cxx b/connectivity/source/drivers/evoab/LColumns.cxx
index 5d69f28..d7a103f 100644
--- a/connectivity/source/drivers/evoab/LColumns.cxx
+++ b/connectivity/source/drivers/evoab/LColumns.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_connectivity.hxx"
-
+
#include "LColumns.hxx"
#include "LTable.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx
index 9c0da3a..e6cd5f0 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -122,7 +122,7 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< conne
,m_RowStates(0)
,m_bIsReadOnly(-1)
{
-
+
m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords());
}
// -------------------------------------------------------------------------
@@ -362,7 +362,7 @@ sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, Runtime
}
}
return sal_True;
-
+
}
// -------------------------------------------------------------------------
sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(SQLException, RuntimeException)
@@ -383,7 +383,7 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(
}
else
m_aQuery.resyncRow(cardNumber);
-
+
if ( validRow( cardNumber ) == sal_False )
return sal_False;
@@ -626,7 +626,7 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY);
DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY);
DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY);
-
+
return new OPropertyArrayHelper(aProps);
}
// -------------------------------------------------------------------------
@@ -1564,7 +1564,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset )
}
else //The requested row has not been retrived until now. We should get the right card for it.
nCurCard = nCurPos + deletedCount();
-
+
while ( nCurCard > nNumberOfRecords && !m_aQuery.queryComplete() ) {
m_aQuery.checkRowAvailable( nCurCard );
if ( m_aQuery.hadError() )
@@ -1604,7 +1604,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin
ResultSetEntryGuard aGuard( *this );
if ( fetchCurrentRow() == sal_False )
m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_GET_ROW, *this );
-
+
OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row");
return makeAny((sal_Int32)(m_aRow->get())[0]);
}
@@ -1642,7 +1642,7 @@ sal_Int32 OResultSet::compareBookmarks( const ::com::sun::star::uno::Any& lhs, c
nResult = 1;
else
nResult = 0;
-
+
return nResult;
}
sal_Bool OResultSet::hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -1670,7 +1670,7 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException)
{
OSL_TRACE("checkPendingUpdate, m_nRowPos = %u", m_nRowPos );
const sal_Int32 nCurrentRow = getCurrentCardNumber();
-
+
if ((m_nNewRow && nCurrentRow != m_nNewRow)
|| ( m_nUpdatedRow && m_nUpdatedRow != nCurrentRow))
{
@@ -1680,7 +1680,7 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException)
) );
::dbtools::throwGenericSQLException(sError,*this);
}
-
+
}
void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException)
{
@@ -1857,14 +1857,14 @@ void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLExcepti
m_RowStates = RowStates_Error;
m_pStatement->getOwnConnection()->throwSQLException( STR_ROW_CAN_NOT_SAVE, *this );
}
-
+
if (!m_aQuery.commitRow(nCurrentCard))
{
m_RowStates = RowStates_Error;
m_nUpdatedRow = 0;
m_pStatement->getOwnConnection()->throwSQLException( m_aQuery.getError(), *this );
}
-
+
m_nUpdatedRow = 0;
fetchCurrentRow();
OSL_TRACE("updateRow out, m_nRowPos = %u", m_nRowPos );
@@ -1876,7 +1876,7 @@ void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLExcepti
ResultSetEntryGuard aGuard( *this );
if (rowDeleted())
m_pStatement->getOwnConnection()->throwSQLException( STR_ROW_ALREADY_DELETED, *this );
-
+
const sal_Int32 nCurrentRow = getCurrentCardNumber();
//fetchRow(nCurrentRow);
if (!nCurrentRow)
@@ -1905,7 +1905,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE
OSL_TRACE("moveToInsertRow in, m_nRowPos = %u", m_nRowPos );
ResultSetEntryGuard aGuard( *this );
m_nOldRowPos = m_nRowPos;
-
+
if (!m_nNewRow) //no new row now, insert one
{
checkDisposed(OResultSet_BASE::rBHelper.bDisposed);
@@ -1918,7 +1918,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE
m_nNewRow = m_aQuery.createNewCard();
if (!m_nNewRow)
m_pStatement->getOwnConnection()->throwSQLException( STR_CAN_NOT_CREATE_ROW, *this );
-
+
m_RowStates = RowStates_Normal;
fillKeySet(m_nNewRow);
}
diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx
index a39cb0e..7f0f939 100644
--- a/connectivity/source/drivers/mozab/MResultSet.hxx
+++ b/connectivity/source/drivers/mozab/MResultSet.hxx
@@ -123,9 +123,9 @@ namespace connectivity
virtual ~OResultSet();
public:
DECLARE_SERVICE_INFO();
-
+
OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< ::connectivity::OSQLParseTreeIterator >& _pSQLIterator );
-
+
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *()
{
diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk
index 0a06f00..5ebc146 100644
--- a/connectivity/source/drivers/mozab/makefile.mk
+++ b/connectivity/source/drivers/mozab/makefile.mk
@@ -82,7 +82,7 @@ COMPONENT_CONFIG_SCHEMA=$(TARGET)2.xcs
SLOFILES=\
$(SLO)$/MDriver.obj \
$(SLO)$/MServices.obj
-
+
# --- MOZAB BASE Library -----------------------------------
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
diff --git a/connectivity/source/drivers/mozab/makefile_mozab.mk b/connectivity/source/drivers/mozab/makefile_mozab.mk
index b7ce6ab..c984f12 100644
--- a/connectivity/source/drivers/mozab/makefile_mozab.mk
+++ b/connectivity/source/drivers/mozab/makefile_mozab.mk
@@ -56,7 +56,7 @@ MOZINC = . \
-I$(MOZ_INC)$/uconv \
-I$(MOZ_INC)$/xpcom_obsolete \
-I$(MOZ_INC)$/content
-
+
.IF "$(GUI)" == "WNT"
CDEFS += \
-DMOZILLA_CLIENT \
diff --git a/connectivity/workben/iniParser/makefile.mk b/connectivity/workben/iniParser/makefile.mk
index 68fc0f3..d9ee3d0 100644
--- a/connectivity/workben/iniParser/makefile.mk
+++ b/connectivity/workben/iniParser/makefile.mk
@@ -56,6 +56,6 @@ APP1OBJS= $(OBJFILES)
APP1STDLIBS = $(APPSTDLIBS)
# --- Targets ------------------------------------------------------
-
+
.INCLUDE : target.mk
diff --git a/connectivity/workben/testmoz/makefile.mk b/connectivity/workben/testmoz/makefile.mk
index f313573..7d906a2 100644
--- a/connectivity/workben/testmoz/makefile.mk
+++ b/connectivity/workben/testmoz/makefile.mk
@@ -57,14 +57,14 @@ APP1OBJS= $(OBJFILES)
APP1STDLIBS = $(APPSTDLIBS)
-
+
APP2TARGET = mozThread
APP2OBJS = $(OBJ)$/initUNO.obj \
$(OBJ)$/mozthread.obj
-
+
APP2STDLIBS = $(APPSTDLIBS)
# --- Targets ------------------------------------------------------
-
+
.INCLUDE : target.mk
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index c028ca1..5cf0e95 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -323,9 +323,9 @@ CommandLineArgs* Desktop::GetCommandLineArgs()
{
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if ( !pArgs )
- {
+ {
pArgs = new CommandLineArgs;
- }
+ }
}
return pArgs;
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 76e464d..6830361 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -475,12 +475,12 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
aIniName += OUString( RTL_CONSTASCII_USTRINGPARAM( "rc" ));
#endif
}
-
+
::rtl::Bootstrap aPerfTuneIniFile( aIniName );
-
+
OUString aDefault( RTL_CONSTASCII_USTRINGPARAM( "0" ));
OUString aPreloadData;
-
+
aPerfTuneIniFile.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "FastPipeCommunication" )), aPreloadData, aDefault );
@@ -494,7 +494,7 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread()
}
else
aUserInstallPathHashCode = CreateMD5FromString( aDummy );
-
+
// Check result to create a hash code from the user install path
if ( aUserInstallPathHashCode.getLength() == 0 )
@@ -1019,7 +1019,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ
{
if( ! pGlobalOfficeIPCThread->AreRequestsEnabled() )
return bShutdown;
-
+
pGlobalOfficeIPCThread->mnPendingRequests += aDispatchList.size();
if ( !pGlobalOfficeIPCThread->mpDispatchWatcher )
{
@@ -1030,7 +1030,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ
// copy for execute
DispatchWatcher::DispatchList aTempList( aDispatchList );
aDispatchList.clear();
-
+
aGuard.clear();
// Execute dispatch requests
diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src
index cb9454f..94fdf87 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog.src
+++ b/desktop/source/deployment/gui/dp_gui_dialog.src
@@ -192,7 +192,7 @@ ModalDialog RID_DLG_LICENSE
VScroll = TRUE;
ReadOnly = TRUE;
};
-
+
FixedText FT_LICENSE_HEADER
{
Pos = MAP_APPFONT(COL1_X, ROW2_Y);
@@ -263,7 +263,7 @@ ModalDialog RID_DLG_LICENSE
MASKCOLOR
};
};
-
+
FixedImage FI_LICENSE_ARROW2
{
Pos = MAP_APPFONT (COL1_X, ROW4_Y) ;
@@ -284,7 +284,7 @@ ModalDialog RID_DLG_LICENSE
DefButton = TRUE;
Text [ en-US ] = "Accept";
};
-
+
CancelButton BTN_LICENSE_DECLINE
{
Pos = MAP_APPFONT(COL5_X, ROW6_Y);
@@ -292,7 +292,7 @@ ModalDialog RID_DLG_LICENSE
Text [ en-US ] = "Decline" ;
TabStop = TRUE;
};
-
+
};
@@ -343,7 +343,7 @@ WARNINGBOX RID_WARNINGBOX_DISABLE_SHARED_EXTENSION
"Click \'Cancel\' to stop disabling the extension.";
};
-
+
String RID_STR_UNSUPPORTED_PLATFORM
{
Text [ en-US ] = "The extension \'%Name\' does not work on this computer.";
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 134593a..3f0e45d 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -81,7 +81,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage,
beans::StringPair aInfo( m_xPackage->getPublisherInfo() );
m_sPublisher = aInfo.First;
m_sPublisherURL = aInfo.Second;
-
+
// get the icons for the package if there are any
uno::Reference< graphic::XGraphic > xGraphic = xPackage->getIcon( false );
if ( xGraphic.is() )
@@ -378,7 +378,7 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
if ( aText.getLength() )
aText += OUSTR("\n");
aText += m_vEntries[ nPos ]->m_sDescription;
-
+
Rectangle aRect = GetTextRect( Rectangle( Point(), aSize ), aText,
TEXT_DRAW_MULTILINE | TEXT_DRAW_WORDBREAK );
aTextHeight += aRect.GetHeight();
@@ -1133,7 +1133,7 @@ void ExtensionBox_Impl::checkEntries()
long nNewPos = -1;
long nPos = 0;
bool bNeedsUpdate = false;
-
+
::osl::ClearableMutexGuard guard(m_entriesMutex);
typedef std::vector< TEntry_Impl >::iterator ITER;
ITER iIndex = m_vEntries.begin();
diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx
index 32faa71..c835c11 100644
--- a/desktop/source/deployment/gui/license_dialog.cxx
+++ b/desktop/source/deployment/gui/license_dialog.cxx
@@ -102,7 +102,7 @@ struct LicenseDialogImpl : public ModalDialog
LicenseView m_mlLicense;
PushButton m_pbDown;
FixedLine m_flBottom;
-
+
OKButton m_acceptButton;
CancelButton m_declineButton;
@@ -121,7 +121,7 @@ struct LicenseDialogImpl : public ModalDialog
const ::rtl::OUString & sLicenseText);
virtual void Activate();
-
+
};
LicenseView::LicenseView( Window* pParent, const ResId& rResId )
@@ -222,7 +222,7 @@ LicenseDialogImpl::LicenseDialogImpl(
m_fiArrow2.Show(false);
m_mlLicense.SetText(sLicenseText);
m_ftHead.SetText(m_ftHead.GetText() + OUString('\n') + sExtensionName);
-
+
m_mlLicense.SetEndReachedHdl( LINK(this, LicenseDialogImpl, EndReachedHdl) );
m_mlLicense.SetScrolledHdl( LINK(this, LicenseDialogImpl, ScrolledHdl) );
m_pbDown.SetClickHdl( LINK(this, LicenseDialogImpl, PageDownHdl) );
@@ -300,7 +300,7 @@ LicenseDialog::LicenseDialog( Sequence<Any> const& args,
//______________________________________________________________________________
void LicenseDialog::setTitle( OUString const & ) throw (RuntimeException)
{
-
+
}
//______________________________________________________________________________
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index fce2ae0..58207e5 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -68,7 +68,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
BackendImpl * getMyBackend() const;
// HelpBackendDb::Data m_dbData;
-
+
// Package
virtual beans::Optional< beans::Ambiguous<sal_Bool> > isRegistered_(
::osl::ResettableMutexGuard & guard,
@@ -112,15 +112,15 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
Reference< ucb::XSimpleFileAccess > getFileAccess( void );
Reference< ucb::XSimpleFileAccess > m_xSFA;
-
+
const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo;
Sequence< Reference<deployment::XPackageTypeInfo> > m_typeInfos;
std::auto_ptr<HelpBackendDb> m_backendDb;
-
+
public:
BackendImpl( Sequence<Any> const & args,
Reference<XComponentContext> const & xComponentContext );
-
+
// XPackageRegistry
virtual Sequence< Reference<deployment::XPackageTypeInfo> > SAL_CALL
getSupportedPackageTypes() throw (RuntimeException);
@@ -175,7 +175,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
throw lang::IllegalArgumentException(
StrCannotDetectMediaType::get() + url,
static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) );
-
+
String type, subType;
INetContentTypeParameterList params;
if (INetContentTypes::parse( mediaType_, type, subType, ¶ms ))
@@ -276,7 +276,7 @@ bool BackendImpl::PackageImpl::extensionContainsCompiledHelp()
{
if (stat.getFileType() != ::osl::FileStatus::Directory)
continue;
-
+
//look if there is the folder help.idxl in the language folder
OUString compUrl(stat.getFileURL() + OUSTR("/help.idxl"));
::osl::Directory compiledFolder(compUrl);
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 31b3027..8a33807 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -82,7 +82,7 @@ class BackendImpl : public t_helper
bool startup,
::rtl::Reference<AbortChannel> const & abortChannel,
Reference<XCommandEnvironment> const & xCmdEnv );
-
+
public:
PackageImpl(
::rtl::Reference<BackendImpl> const & myBackend,
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index d9a2aa1..e755dda 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -410,7 +410,7 @@ bool MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigr
// get supported version names
uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW);
uno::Sequence< OUString > seqSupportedVersions = aMigrationAccess->getElementNames();
-
+
const OUString aVersionIdentifiers( RTL_CONSTASCII_USTRINGPARAM( "VersionIdentifiers" ));
const OUString aPriorityIdentifier( RTL_CONSTASCII_USTRINGPARAM( "Priority" ));
@@ -581,7 +581,7 @@ sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available
{
sal_Int32 nIndex( -1 );
sal_Int32 i( 0 );
-
+
migrations_available::const_iterator rIter = rAvailableMigrations.begin();
while ( rIter != rAvailableMigrations.end() )
{
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 564e2d7..a4619b4 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -196,7 +196,7 @@ class MigrationImpl
private:
strings_vr m_vrVersions;
NS_UNO::Reference< NS_CSS::lang::XMultiServiceFactory > m_xFactory;
-
+
migrations_available m_vMigrationsAvailable; // list of all available migrations
migrations_vr m_vrMigrations; // list of all migration specs from config
install_info m_aInfo; // info about the version being migrated
diff --git a/desktop/source/so_comp/oemjob.cxx b/desktop/source/so_comp/oemjob.cxx
index d2dc986..d50bab2 100644
--- a/desktop/source/so_comp/oemjob.cxx
+++ b/desktop/source/so_comp/oemjob.cxx
@@ -78,7 +78,7 @@ Sequence< OUString > OEMPreloadJob::GetSupportedServiceNames()
{
sal_Int32 nSize = (sizeof( interfaces ) / sizeof( const char *)) - 1;
Sequence< OUString > aResult( nSize );
-
+
for( sal_Int32 i = 0; i < nSize; i++ )
aResult[i] = OUString::createFromAscii( interfaces[i] );
return aResult;
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 0d36c14..df2fe68 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -200,7 +200,7 @@ ALLTAR : $(BIN)$/soffice_oo$(EXECPOST)
.IF "$(LINK_SO)"=="TRUE"
$(BIN)$/so$/soffice_mac$(EXECPOST) : $(APP1TARGETN)
$(COPY) $< $@
-
+
ALLTAR : $(BIN)$/so$/soffice_mac$(EXECPOST)
.ENDIF # "$(LINK_SO)"=="TRUE"
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index 07cc3f7..4434a94 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -180,7 +180,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribWeight
// -------------------------------------------------------------------------
class EditCharAttribWeight : public EditCharAttrib
@@ -190,7 +190,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribItalic
// -------------------------------------------------------------------------
class EditCharAttribItalic : public EditCharAttrib
@@ -201,7 +201,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribShadow
// -------------------------------------------------------------------------
class EditCharAttribShadow : public EditCharAttrib
@@ -212,7 +212,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribEscapement
// -------------------------------------------------------------------------
class EditCharAttribEscapement : public EditCharAttrib
@@ -223,7 +223,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribOutline
// -------------------------------------------------------------------------
class EditCharAttribOutline : public EditCharAttrib
@@ -234,7 +234,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribStrikeout
// -------------------------------------------------------------------------
class EditCharAttribStrikeout : public EditCharAttrib
@@ -245,7 +245,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribUnderline
// -------------------------------------------------------------------------
class EditCharAttribUnderline : public EditCharAttrib
@@ -289,7 +289,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribFontHeight
// -------------------------------------------------------------------------
class EditCharAttribFontHeight : public EditCharAttrib
@@ -300,7 +300,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribFontWidth
// -------------------------------------------------------------------------
class EditCharAttribFontWidth : public EditCharAttrib
@@ -311,7 +311,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribColor
// -------------------------------------------------------------------------
class EditCharAttribColor : public EditCharAttrib
@@ -322,7 +322,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribLanguage
// -------------------------------------------------------------------------
class EditCharAttribLanguage : public EditCharAttrib
@@ -333,7 +333,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribTab
// -------------------------------------------------------------------------
class EditCharAttribTab : public EditCharAttrib
@@ -344,7 +344,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribLineBreak
// -------------------------------------------------------------------------
class EditCharAttribLineBreak : public EditCharAttrib
@@ -355,7 +355,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribField
// -------------------------------------------------------------------------
class EditCharAttribField: public EditCharAttrib
@@ -390,7 +390,7 @@ public:
}
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribPairKerning
// -------------------------------------------------------------------------
class EditCharAttribPairKerning : public EditCharAttrib
@@ -401,7 +401,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribKerning
// -------------------------------------------------------------------------
class EditCharAttribKerning : public EditCharAttrib
@@ -412,7 +412,7 @@ public:
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev );
};
-// -------------------------------------------------------------------------
+ // -------------------------------------------------------------------------
// class EditCharAttribWordLineMode
// -------------------------------------------------------------------------
class EditCharAttribWordLineMode: public EditCharAttrib
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index e8078d7..bdfc4db 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1229,7 +1229,7 @@ EditDoc::EditDoc( SfxItemPool* pPool )
pItemPool = new EditEngineItemPool( FALSE );
bOwnerOfPool = TRUE;
}
-
+
nDefTab = DEFTAB;
bIsVertical = FALSE;
bIsFixedCellHeight = FALSE;
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx
index 8f9ab61..1268087 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -771,7 +771,7 @@ public:
SfxItemPool& GetItemPool() { return *pItemPool; }
const SfxItemPool& GetItemPool() const { return *pItemPool; }
-
+
void RemoveItemsFromPool( ContentNode* pNode );
void InsertAttrib( const SfxPoolItem& rItem, ContentNode* pNode, USHORT nStart, USHORT nEnd );
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 8ec92fc..6625894 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -113,7 +113,7 @@ SV_IMPL_VARARR( EECharAttribArray, EECharAttrib );
static SfxItemPool* pGlobalPool=0;
-// ----------------------------------------------------------------------
+ // ----------------------------------------------------------------------
// EditEngine
// ----------------------------------------------------------------------
EditEngine::EditEngine( SfxItemPool* pItemPool )
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 409e3be..0707f21 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -1150,7 +1150,7 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack )
uno::Reference< linguistic2::XDictionary > xDic( SvxGetOrCreatePosDic( xDicList ) );
if (xDic.is())
xDic->setActive( sal_True );
-
+
aDics = xDicList->getDictionaries();
pDic = aDics.getConstArray();
sal_uInt16 nCheckedLanguage = PIMPEE->GetLanguage( aPaM2 );
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 827dadf..3913174 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -73,7 +73,7 @@ inline void lcl_AllignToPixel( Point& rPoint, OutputDevice* pOutDev, short nDiff
rPoint = pOutDev->PixelToLogic( rPoint );
}
-// ----------------------------------------------------------------------
+ // ----------------------------------------------------------------------
// class ImpEditView
// ----------------------------------------------------------------------
ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, Window* pWindow ) :
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 5bed250..3104ea0 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -214,7 +214,7 @@ public:
EditView* GetView() { return pView; }
};
-// ----------------------------------------------------------------------
+ // ----------------------------------------------------------------------
// class ImpEditView
// ----------------------------------------------------------------------
class ImpEditView : public vcl::unohelper::DragAndDropClient
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index e07f783..523e67e 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2262,7 +2262,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView& rEditView,
aNext = EditPaM( aOldSel.Max().GetNode(), nEndOfSentence );
}
rEditView.pImpEditView->SetEditSelection( aNext );
-
+
FormatAndUpdate();
aEditDoc.SetModified(TRUE);
}
@@ -2277,7 +2277,7 @@ void ImpEditEngine::PutSpellingToSentenceStart( EditView& rEditView )
{
rEditView.pImpEditView->SetEditSelection( pSpellInfo->aLastSpellContentSelections.begin()->Min() );
}
-
+
#endif
}
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index b5cfad5..afbc798 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1905,13 +1905,13 @@ static bool isSameNumbering( const SvxNumberFormat& rN1, const SvxNumberFormat&
{
if( rN1.GetNumberingType() != rN2.GetNumberingType() )
return false;
-
+
if( rN1.GetNumStr(1) != rN2.GetNumStr(1) )
return false;
-
+
if( (rN1.GetPrefix() != rN2.GetPrefix()) || (rN1.GetSuffix() != rN2.GetSuffix()) )
return false;
-
+
return true;
}
@@ -1936,10 +1936,10 @@ sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pPar
break;
const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
-
+
if( pFmt == 0 )
continue; // ignore paragraphs without bullets
-
+
// check if numbering is the same
if( !isSameNumbering( *pFmt, *pParaFmt ) )
break;
diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/classes/addonmenu.hxx
index d636536..2214834 100644
--- a/framework/inc/classes/addonmenu.hxx
+++ b/framework/inc/classes/addonmenu.hxx
@@ -93,9 +93,9 @@ class AddonMenuManager
static sal_Bool HasAddonMenuElements();
static sal_Bool HasAddonHelpMenuElements();
-
+
static sal_Bool IsAddonMenuId( USHORT nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); }
-
+
// Check if the context string matches the provided xModel context
static sal_Bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const rtl::OUString& aContext );
@@ -104,7 +104,7 @@ class AddonMenuManager
// Create the Add-Ons menu
static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
-
+
// Merge the Add-Ons help menu items into the given menu bar at a defined pos
static void MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
MenuBar* pMergeMenuBar );
diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/classes/addonsoptions.hxx
index 5dab0b4..0912b4d 100644
--- a/framework/inc/classes/addonsoptions.hxx
+++ b/framework/inc/classes/addonsoptions.hxx
@@ -191,7 +191,7 @@ class AddonsOptions
*//*-*****************************************************************************************************/
sal_Bool HasAddonsMenu() const;
-
+
/*-****************************************************************************************************//**
@short returns if an addons help menu is available
@descr Call to retrieve if a addons menu is available
@@ -210,7 +210,7 @@ class AddonsOptions
@return number of addons toolbars
*//*-*****************************************************************************************************/
sal_Int32 GetAddonsToolBarCount() const ;
-
+
/*-****************************************************************************************************//**
@short returns the complete addons menu
@descr Call it to get all entries of the addon menu.
@@ -274,7 +274,7 @@ class AddonsOptions
@onerror We return sal_False
*//*-*****************************************************************************************************/
-
+
const MergeMenuInstructionContainer& GetMergeMenuInstructions() const;
/*-****************************************************************************************************//**
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index 6e31f04..86e049d 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -78,10 +78,10 @@ namespace framework
public:
NewMenuController( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceManager );
virtual ~NewMenuController();
-
+
// XServiceInfo
DECLARE_XSERVICEINFO
-
+
// XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 3e36760..27f87db 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -159,7 +159,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
sal_Int16 nWidth;
};
typedef std::vector< ControllerParams > ControllerParamsVector;
-
+
protected:
//added for 33668 by shizhoubo : 2008:04
DECL_LINK( Command, CommandEvent * );
@@ -251,7 +251,7 @@ class ToolBarManager : public ::com::sun::star::frame::XFrameActionListener
::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xModuleAcceleratorManager;
::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration > m_xGlobalAcceleratorManager;
};
-
+
}
#endif // __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx
index 9cde97e..26a5791 100644
--- a/framework/source/classes/menumanager.cxx
+++ b/framework/source/classes/menumanager.cxx
@@ -257,7 +257,7 @@ MenuManager::MenuManager(
// MenuManager* pSubMenuManager = new MenuManager( rFrame, pSubMenu, sal_True, sal_False );
AddMenu(pSubMenu,::rtl::OUString(),nItemId,sal_True,sal_False);
-
+
if ( bShowMenuImages && !pMenu->GetItemImage( nItemId ))
{
Image aImage = GetImageFromURL( rFrame, aItemCommand, FALSE );
diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx
index d71d542..70ba031 100644
--- a/framework/source/dispatch/windowcommanddispatch.cxx
+++ b/framework/source/dispatch/windowcommanddispatch.cxx
@@ -154,7 +154,7 @@ IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, void*, pParam)
return 0L;
const int nCommand = pData->GetDialogId();
- ::rtl::OUString sCommand;
+ ::rtl::OUString sCommand;
switch (nCommand)
{
diff --git a/framework/source/helper/actiontriggerhelper.cxx b/framework/source/helper/actiontriggerhelper.cxx
index 9812634..9693074 100644
--- a/framework/source/helper/actiontriggerhelper.cxx
+++ b/framework/source/helper/actiontriggerhelper.cxx
@@ -209,7 +209,7 @@ void InsertSubMenuItems( Menu* pSubMenu, USHORT& nItemId, Reference< XIndexConta
}
else
aImage = Image( aBitmap );
-
+
if ( !!aImage )
pSubMenu->SetItemImage( nNewItemId, aImage );
}
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 3a32702..ff36e94 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -396,7 +396,7 @@ void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFr
css::uno::Reference< css::awt::XWindow > xWindow = xFrame->getContainerWindow ();
if ( ! xWindow.is() )
return;
-
+
css::uno::Reference< css::frame::XTitle > xTitle(xFrame, css::uno::UNO_QUERY);
if ( ! xTitle.is() )
return;
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx
index 26baf43..af6c4a3 100644
--- a/framework/source/helper/vclstatusindicator.cxx
+++ b/framework/source/helper/vclstatusindicator.cxx
@@ -221,14 +221,14 @@ void VCLStatusIndicator::impl_recalcLayout(Window* pStatusBar ,
(!pParentWindow)
)
return;
-
+
Size aParentSize = pParentWindow->GetSizePixel();
pStatusBar->SetPosSizePixel(0,
0,
aParentSize.Width(),
aParentSize.Height());
}
-
+
} // namespace framework
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index f087aba..0ac14c6 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1768,7 +1768,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
else
pWindow->Show(sal_True, (bForceFrontAndFocus || bForceToFront) ? SHOW_FOREGROUNDTASK : 0 );
}
-
+
/* #i19976#
We tried to prevent a toFront() call in case the user putted the
loading document into the background ..
diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index 92bc722..490a09e 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -245,7 +245,7 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
// add some breathing space for the images
maButtonImageSize.Width() += 12;
maButtonImageSize.Height() += 12;
-
+
}
@@ -286,12 +286,12 @@ void BackingWindow::prepareRecentFileMenu()
mpRecentMenu = new PopupMenu();
mpRecentMenu->Clear();
maRecentFiles.clear();
-
+
// get recent file list and dispatch arguments
Sequence< Sequence< PropertyValue > > aHistoryList( SvtHistoryOptions().GetList( ePICKLIST ) );
sal_Int32 nPickListMenuItems = ( aHistoryList.getLength() > 99 ) ? 99 : aHistoryList.getLength();
-
+
if( ( nPickListMenuItems > 0 ) )
{
maRecentFiles.reserve( nPickListMenuItems );
@@ -299,11 +299,11 @@ void BackingWindow::prepareRecentFileMenu()
{
Sequence< PropertyValue >& rPickListEntry = aHistoryList[i];
rtl::OUString aURL, aFilter, aFilterOpt, aTitle;
-
+
for ( sal_Int32 j = 0; j < rPickListEntry.getLength(); j++ )
{
const Any& a = rPickListEntry[j].Value;
-
+
if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_URL )
a >>= aURL;
else if ( rPickListEntry[j].Name == HISTORY_PROPERTYNAME_FILTER )
@@ -330,7 +330,7 @@ void BackingWindow::prepareRecentFileMenu()
nArgs--;
rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
rArgsList[nArgs].Value = makeAny( aFilter );
-
+
if( aFilterOpt.getLength() )
{
nArgs--;
@@ -346,20 +346,20 @@ void BackingWindow::prepareRecentFileMenu()
nArgs--;
rArgsList[nArgs].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Referer" ));
rArgsList[nArgs].Value = makeAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:user" ) ) );
-
+
// and finally create an entry in the popupmenu
rtl::OUString aMenuTitle;
INetURLObject aURLObj( aURL );
-
+
if ( aURLObj.GetProtocol() == INET_PROT_FILE )
{
// Do handle file URL differently => convert it to a system
// path and abbreviate it with a special function:
String aFileSystemPath( aURLObj.getFSysPath( INetURLObject::FSYS_DETECT ) );
-
+
rtl::OUString aSystemPath( aFileSystemPath );
rtl::OUString aCompactedSystemPath;
-
+
oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, NULL );
if ( !nError )
aMenuTitle = String( aCompactedSystemPath );
@@ -461,7 +461,7 @@ void BackingWindow::initBackground()
loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton );
loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
-
+
maOpenButton.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
maOpenButton.SetSelectHdl( LINK( this, BackingWindow, SelectHdl ) );
maOpenButton.SetActivateHdl( LINK( this, BackingWindow, ActivateHdl ) );
@@ -649,7 +649,7 @@ void BackingWindow::initControls()
maBackgroundMiddle = BitmapEx();
Resize();
-
+
maWriterButton.GrabFocus();
}
@@ -688,7 +688,7 @@ void BackingWindow::layoutButton(
String aText( i_rStr.Len() ? i_rStr : SvFileInformationManager::GetDescription( INetURLObject( aURL ) ) );
i_rMnemns.CreateMnemonic( aText );
i_rBtn.SetText( aText );
-
+
long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side
@@ -873,7 +873,7 @@ void BackingWindow::Resize()
nYPos += nPDelta - nDiff;
nYPos += nWDelta/2 - nDiff;
-
+
if( mnLayoutStyle != 1 )
nYPos = maControlRect.Top() + mnBtnTop;
diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx
index 556414c..a2aa126 100644
--- a/framework/source/uielement/controlmenucontroller.cxx
+++ b/framework/source/uielement/controlmenucontroller.cxx
@@ -255,13 +255,13 @@ void ControlMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rP
{
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu );
PopupMenu* pVCLPopupMenu = 0;
-
+
SolarMutexGuard aSolarMutexGuard;
-
+
resetPopupMenu( rPopupMenu );
if ( pPopupMenu )
pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
-
+
if ( pVCLPopupMenu && m_pResPopupMenu )
*pVCLPopupMenu = *m_pResPopupMenu;
}
@@ -275,7 +275,7 @@ void SAL_CALL ControlMenuController::disposing( const EventObject& ) throw ( Run
m_xFrame.clear();
m_xDispatch.clear();
m_xServiceManager.clear();
-
+
if ( m_xPopupMenu.is() )
m_xPopupMenu->removeMenuListener( Reference< css::awt::XMenuListener >(( OWeakObject *)this, UNO_QUERY ));
m_xPopupMenu.clear();
@@ -300,9 +300,9 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
if ( nMenuId )
{
VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( m_xPopupMenu );
-
+
SolarMutexGuard aSolarMutexGuard;
-
+
PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu();
if ( !Event.IsEnabled && pVCLPopupMenu->GetItemPos( nMenuId ) != MENU_ITEM_NOTFOUND )
@@ -321,11 +321,11 @@ void SAL_CALL ControlMenuController::statusChanged( const FeatureStateEvent& Eve
if ( nPrevInConversion != MENU_ITEM_NOTFOUND )
break;
}
-
+
if ( MENU_ITEM_NOTFOUND == nPrevInConversion )
// none of the items which precede the nSID-slot in the source menu are present in our conversion menu
nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position
-
+
pVCLPopupMenu->InsertItem( nMenuId, m_pResPopupMenu->GetItemText( nMenuId ), m_pResPopupMenu->GetItemBits( nMenuId ), ++nPrevInConversion );
pVCLPopupMenu->SetItemImage( nMenuId, m_pResPopupMenu->GetItemImage( nMenuId ));
pVCLPopupMenu->SetHelpId( nMenuId, m_pResPopupMenu->GetHelpId( nMenuId ));
@@ -351,11 +351,11 @@ void ControlMenuController::impl_select(const Reference< XDispatch >& /*_xDispat
void SAL_CALL ControlMenuController::activate( const css::awt::MenuEvent& ) throw (RuntimeException)
{
osl::ResettableMutexGuard aLock( m_aMutex );
-
+
if ( m_xPopupMenu.is() )
{
SolarMutexGuard aSolarMutexGuard;
-
+
// Check if some modes have changed so we have to update our menu images
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
sal_Bool bShowMenuImages = rSettings.GetUseImagesInMenus();
@@ -394,25 +394,25 @@ void ControlMenuController::impl_setPopupMenu()
}
} // if ( m_pResPopupMenu == 0 )
}
-
+
void SAL_CALL ControlMenuController::updatePopupMenu() throw (::com::sun::star::uno::RuntimeException)
{
osl::ResettableMutexGuard aLock( m_aMutex );
throwIfDisposed();
-
+
if ( m_xFrame.is() && m_xPopupMenu.is() )
{
URL aTargetURL;
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
fillPopupMenu( m_xPopupMenu );
m_aURLToDispatchMap.free();
-
+
for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i)
{
aTargetURL.Complete = rtl::OUString::createFromAscii( aCommands[i] );
m_xURLTransformer->parseStrict( aTargetURL );
-
+
Reference< XDispatch > xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
if ( xDispatch.is() )
{
diff --git a/framework/source/uielement/logoimagestatusbarcontroller.cxx b/framework/source/uielement/logoimagestatusbarcontroller.cxx
index f913c61..51754eb 100644
--- a/framework/source/uielement/logoimagestatusbarcontroller.cxx
+++ b/framework/source/uielement/logoimagestatusbarcontroller.cxx
@@ -99,14 +99,14 @@ throw (::com::sun::star::uno::RuntimeException)
{
svt::StatusbarController::dispose();
}
-
+
// XEventListener
void SAL_CALL LogoImageStatusbarController::disposing( const EventObject& Source )
throw ( RuntimeException )
{
svt::StatusbarController::disposing( Source );
}
-
+
// XStatusListener
void SAL_CALL LogoImageStatusbarController::statusChanged( const FeatureStateEvent& )
throw ( RuntimeException )
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx
index 3828a8b..575ae35 100644
--- a/framework/source/uielement/logotextstatusbarcontroller.cxx
+++ b/framework/source/uielement/logotextstatusbarcontroller.cxx
@@ -109,14 +109,14 @@ throw (::com::sun::star::uno::RuntimeException)
{
svt::StatusbarController::dispose();
}
-
+
// XEventListener
void SAL_CALL LogoTextStatusbarController::disposing( const EventObject& Source )
throw ( RuntimeException )
{
svt::StatusbarController::disposing( Source );
}
-
+
// XStatusListener
void SAL_CALL LogoTextStatusbarController::statusChanged( const FeatureStateEvent& )
throw ( RuntimeException )
diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx
index 69cdb03..8f6fd07 100644
--- a/framework/source/uielement/simpletextstatusbarcontroller.cxx
+++ b/framework/source/uielement/simpletextstatusbarcontroller.cxx
@@ -125,14 +125,14 @@ throw (::com::sun::star::uno::RuntimeException)
{
svt::StatusbarController::dispose();
}
-
+
// XEventListener
void SAL_CALL SimpleTextStatusbarController::disposing( const EventObject& Source )
throw ( RuntimeException )
{
svt::StatusbarController::disposing( Source );
}
-
+
// XStatusListener
void SAL_CALL SimpleTextStatusbarController::statusChanged( const FeatureStateEvent& )
throw ( RuntimeException )
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 1efed61..3d55504 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -339,7 +339,7 @@ void ToolBarManager::Destroy()
/* #i99167# removed change for i93173 since there is some weird crash */
// #i93173# delete toolbar lazily as we can still be in one of its handlers
m_pToolBar->doLazyDelete();
-
+
Link aEmpty;
m_pToolBar->SetSelectHdl( aEmpty );
m_pToolBar->SetActivateHdl( aEmpty );
@@ -846,7 +846,7 @@ void ToolBarManager::RemoveControllers()
uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const ::rtl::OUString& rCmdURL )
{
Sequence< PropertyValue > aPropSeq;
-
+
// Retrieve properties for command
try
{
@@ -854,7 +854,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
{
Reference< XModuleManager > xModuleManager( m_xServiceManager->createInstance( SERVICENAME_MODULEMANAGER ), UNO_QUERY_THROW );
Reference< XInterface > xIfac( m_xFrame, UNO_QUERY );
-
+
m_bModuleIdentified = sal_True;
m_aModuleIdentifier = xModuleManager->identify( xIfac );
@@ -865,7 +865,7 @@ uno::Sequence< beans::PropertyValue > ToolBarManager::GetPropsForCommand( const
xNameAccess->getByName( m_aModuleIdentifier ) >>= m_xUICommandLabels;
}
}
-
+
if ( m_xUICommandLabels.is() )
{
if ( rCmdURL.getLength() > 0 )
diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/mailmodelapi.hxx
index 9072811..927a6ff 100644
--- a/sfx2/inc/mailmodelapi.hxx
+++ b/sfx2/inc/mailmodelapi.hxx
@@ -107,7 +107,7 @@ public:
SEND_MAIL_CANCELLED,
SEND_MAIL_ERROR
};
-
+
SfxMailModel();
~SfxMailModel();
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 441f136..f30d8ae 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -271,11 +271,11 @@ public:
/** forwards the current document, as returned by ->GetCurrentDocument, to SfxObjectShell::SetWorkingDocument
*/
void SetCurrentDocument() const;
-
+
/** get an XRenderable instance that can render this docuement
*/
virtual com::sun::star::uno::Reference< com::sun::star::view::XRenderable > GetRenderable();
-
+
virtual void MarginChanged();
const Size& GetMargin() const;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 8da42b9..d418c93 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1483,7 +1483,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, ::com::sun::sta
if ( rSet.GetItemState( SID_BLACK_LIST, sal_False, &pItem ) == SFX_ITEM_SET )
{
pValue[nActProp].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sBlackList));
-
+
com::sun::star::uno::Sequence< rtl::OUString > aList;
((SfxStringListItem*)pItem)->GetStringList( aList );
pValue[nActProp++].Value <<= aList ;
@@ -2147,7 +2147,7 @@ SFX2_DLLPUBLIC sal_Bool SAL_CALL component_writeInfo(
aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES"));
xNewKey = xKey->createKey( aTempStr );
xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.SpecialEmbeddedObject")) );
-
+
// IFrameObject
aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
aImpl += ::sfx2::IFrameObject::impl_getStaticImplementationName();
diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx
index 0e2fa49..9131357 100644
--- a/sfx2/source/appl/helpinterceptor.hxx
+++ b/sfx2/source/appl/helpinterceptor.hxx
@@ -91,7 +91,7 @@ public:
const com::sun::star::uno::Any& GetViewData()const {return m_aViewData;}
-
+
sal_Bool HasHistoryPred() const; // is there a predecessor for the current in the history
sal_Bool HasHistorySucc() const; // is there a successor for the current in the history
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 7eeb380..e4bb59b 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -1706,7 +1706,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
// iterate through the bound functions
sal_Bool bJobDone = sal_False;
while ( !bJobDone )
- {
+ {
SfxStateCache* pCache = (*pImp->pCaches)[pImp->nMsgPos];
DBG_ASSERT( pCache, "invalid SfxStateCache-position in job queue" );
sal_Bool bWasDirty = pCache->IsControllerDirty();
diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx
index ce44969..c701fdd 100644
--- a/sfx2/source/dialog/about.cxx
+++ b/sfx2/source/dialog/about.cxx
@@ -190,13 +190,13 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS
aVTCopyPnt.X() = ( aOutSiz.Width() - aVTCopySize.Width() ) / 2;
aVTCopyPnt.Y() = nY;
aVersionText.SetPosSizePixel( aVTCopyPnt, aVTCopySize );
-
+
nY += nCtrlMargin;
-
+
// OK-Button-Position (at the bottom and centered)
Size aOKSiz = aOKButton.GetSizePixel();
Point aOKPnt = aOKButton.GetPosPixel();
-
+
// FixedHyperlink with more info link
Point aLinkPnt = aInfoLink.GetPosPixel();
Size aLinkSize = aInfoLink.GetSizePixel();
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 0af270c..4365998 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1661,7 +1661,7 @@ util::Duration DurationDialog_Impl::GetDuration() const
CustomPropertiesDurationField::CustomPropertiesDurationField( Window* pParent, const ResId& rResId, CustomPropertyLine* pLine ) :
Edit( pParent, rResId ), m_pLine( pLine )
-
+
{
SetDuration( util::Duration(false, 0, 0, 0, 0, 0, 0, 0) );
}
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index d1de5e0..fa9126e 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -1011,7 +1011,7 @@ namespace sfx2
if ( i_pToolBox->GetCurItemId() == m_nViewMenuID )
{
i_pToolBox->EndSelection();
-
+
::std::auto_ptr< PopupMenu > pMenu = impl_createPopupMenu();
pMenu->SetSelectHdl( LINK( this, TaskPaneController_Impl, OnMenuItemSelected ) );
@@ -1255,7 +1255,7 @@ namespace sfx2
);
pMenu->RemoveDisabledEntries( FALSE, FALSE );
-
+
return pMenu;
}
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 34e5418..50a51cc 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -1747,7 +1747,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
*pIdx = i;
}
}
-
+
// Reset destroyed flag otherwise we use the pointer in the dtor
// where the local stack object is already destroyed. This would
// overwrite objects on the stack!! See #i100110
diff --git a/sfx2/source/dialog/titledockwin.cxx b/sfx2/source/dialog/titledockwin.cxx
index ed5940c..fa80e98 100644
--- a/sfx2/source/dialog/titledockwin.cxx
+++ b/sfx2/source/dialog/titledockwin.cxx
@@ -133,7 +133,7 @@ namespace sfx2
void TitledDockingWindow::impl_layout()
{
m_bLayoutPending = false;
-
+
m_aToolbox.ShowItem( 1, !IsFloatingMode() );
const Size aToolBoxSize( m_aToolbox.CalcWindowSizePixel() );
@@ -270,7 +270,7 @@ namespace sfx2
// resized.
impl_scheduleLayout();
Invalidate();
-
+
return nItemId;
}
@@ -338,7 +338,7 @@ namespace sfx2
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetZoomedPointFont( aFont );
-
+
// Color.
Color aColor;
if ( IsControlForeground() )
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index d0f4490..97484eb 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -669,7 +669,7 @@ BOOL SfxObjectShell::Print
boost::shared_ptr< vcl::PrinterController > pController( pAdaptor );
pAdaptor->StartPage();
-
+
pPrinter->SetMapMode(MapMode(MAP_10TH_MM));
Font aFont( DEFINE_CONST_UNICODE( "Arial" ), Size(0, 64)); // 18pt
aFont.SetWeight(WEIGHT_BOLD);
@@ -762,7 +762,7 @@ BOOL SfxObjectShell::Print
pStyle = pIter->Next();
}
pAdaptor->EndPage();
-
+
Printer::PrintJob( pController, rPrt.GetJobSetup() );
delete pIter;
@@ -1031,10 +1031,10 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin
xDocProps->setTemplateName( ::rtl::OUString() );
xDocProps->setTemplateDate( util::DateTime() );
xDocProps->resetUserData( ::rtl::OUString() );
-
+
// TODO/REFACTOR:
// Title?
-
+
if( ::utl::LocalFileHelper::IsLocalFile( rFileName ) )
{
String aFoundName;
@@ -1043,13 +1043,13 @@ void SfxObjectShell::ResetFromTemplate( const String& rTemplateName, const Strin
INetURLObject aObj( rFileName );
xDocProps->setTemplateURL( aObj.GetMainURL(INetURLObject::DECODE_TO_IURI) );
xDocProps->setTemplateName( rTemplateName );
-
+
::DateTime now;
xDocProps->setTemplateDate( util::DateTime(
now.Get100Sec(), now.GetSec(), now.GetMin(),
now.GetHour(), now.GetDay(), now.GetMonth(),
now.GetYear() ) );
-
+
SetQueryLoadTemplate( sal_True );
}
}
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 9db9f96..780aa03 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -180,10 +180,10 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl )
{
Image aRes;
-
+
::rtl::OUString aTmp;
osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
-
+
Graphic aGraphic;
const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) );
if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) )
@@ -238,7 +238,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
{
//! item ids should start with values > 0, since 0 has special meaning
const USHORT nId = i + 1;
-
+
String aItemText( GetThesaurusReplaceText_Impl( aSynonyms[i] ) );
pThesSubMenu->InsertItem( nId, aItemText );
::rtl::OUString aCmd(RTL_CONSTASCII_USTRINGPARAM(".uno:ThesaurusFromContext?WordReplace:string=") );
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index bd417dd..07937e7 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -191,7 +191,7 @@ SfxVirtualMenu::SfxVirtualMenu( USHORT nOwnId,
SfxVirtualMenu* pOwnParent, Menu& rMenu, BOOL bWithHelp,
SfxBindings &rBindings, BOOL bOLEServer, BOOL bRes, BOOL bIsAddonMenu ):
pItems(0),
- pImageControl(0),
+ pImageControl(0),
pBindings(&rBindings),
pResMgr(0),
pAutoDeactivate(0),
@@ -395,7 +395,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
if ( pPopup )
{
-
+
SfxMenuControl *pMnuCtrl =
SfxMenuControl::CreateControl(nSlotId, *pPopup, *pBindings);
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index dbb135a..022c626 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -69,11 +69,11 @@ public:
ImageList* GetImageList( BOOL bBig );
Image GetImage( USHORT nId, BOOL bBig );
void SetSymbolsSize_Impl( sal_Int16 );
-
+
DECL_LINK( OptionsChanged_Impl, void* );
DECL_LINK( SettingsChanged_Impl, void* );
-
+
SfxImageManager_Impl( SfxModule* pModule );
~SfxImageManager_Impl();
};
@@ -151,7 +151,7 @@ SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule ) :
{
for ( sal_uInt32 i = 0; i < IMAGELIST_COUNT; i++ )
m_pImageList[i] = 0;
-
+
m_aOpt.AddListenerLink( LINK( this, SfxImageManager_Impl, OptionsChanged_Impl ) );
Application::AddEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) );
}
@@ -198,7 +198,7 @@ Image SfxImageManager_Impl::GetImage( USHORT nId, BOOL bBig )
void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize )
{
SolarMutexGuard aGuard;
-
+
if ( nNewSymbolsSize != m_nSymbolsSize )
{
m_nSymbolsSize = nNewSymbolsSize;
@@ -341,7 +341,7 @@ Image SfxImageManager::SeekImage( USHORT nId ) const
void SfxImageManager::RegisterToolBox( ToolBox *pBox, USHORT nFlags )
{
SolarMutexGuard aGuard;
-
+
ToolBoxInf_Impl* pInf = new ToolBoxInf_Impl;
pInf->pToolBox = pBox;
pInf->nFlags = nFlags;
@@ -353,7 +353,7 @@ void SfxImageManager::RegisterToolBox( ToolBox *pBox, USHORT nFlags )
void SfxImageManager::ReleaseToolBox( ToolBox *pBox )
{
SolarMutexGuard aGuard;
-
+
for ( sal_uInt32 n=0; n < pImp->m_aToolBoxes.size(); n++ )
{
if ((pImp->m_aToolBoxes[n])->pToolBox == pBox )
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 6c01307..e257f28 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -2010,7 +2010,7 @@ void SfxViewShell::SetController( SfxBaseController* pController )
pImp->pController = pController;
pImp->pController->acquire();
pImp->bControllerSet = TRUE;
-
+
// there should be no old listener, but if there is one, it should be disconnected
if ( pImp->xClipboardListener.is() )
pImp->xClipboardListener->DisconnectViewShell();
diff --git a/svx/inc/galtheme.hxx b/svx/inc/galtheme.hxx
index 9a4f44a..6b3310a 100644
--- a/svx/inc/galtheme.hxx
+++ b/svx/inc/galtheme.hxx
@@ -174,7 +174,7 @@ public:
void LockBroadcaster() { mnBroadcasterLockCount++; }
SVX_DLLPUBLIC void UnlockBroadcaster( ULONG nUpdatePos = 0 );
BOOL IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
-
+
void SetDragPos( ULONG nPos ) { nDragPos = nPos; }
ULONG GetDragPos() const { return nDragPos; }
diff --git a/svx/inc/svditer.hxx b/svx/inc/svditer.hxx
index c1084ee..5d8e2c2 100644
--- a/svx/inc/svditer.hxx
+++ b/svx/inc/svditer.hxx
@@ -74,7 +74,7 @@ public:
void Reset() { mnIndex = (mbReverse ? maObjList.Count() : 0L); }
BOOL IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); }
SdrObject* Next() { return (SdrObject*)maObjList.GetObject(mbReverse ? --mnIndex : mnIndex++); }
-
+
sal_uInt32 Count() { return maObjList.Count(); }
};
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index b0f3ee5..58b6eaf 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -138,12 +138,12 @@ private:
rtl_TextEncoding nReadTextEncoding;
ULONG nLastFileNumber;
BOOL bMultiPath;
-
+
void ImplLoad( const String& rMultiPath );
void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly );
void ImplLoadImports();
void ImplWriteImportList();
-
+
SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName );
GalleryThemeEntry* ImplGetThemeEntry( ULONG nThemeId );
GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName );
@@ -177,10 +177,10 @@ public:
public:
INetURLObject GetImportURL( const String& rThemeName );
-
+
const INetURLObject& GetUserURL() const { return aUserURL; }
const INetURLObject& GetRelativeURL() const { return aRelURL; }
-
+
BOOL IsMultiPath() const { return bMultiPath; }
};
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index d13fa25..660e5df 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -594,7 +594,7 @@ protected:
const DbGridRowRef& GetSeekRow() const { return m_xSeekRow; }
const DbGridRowRef& GetPaintRow() const { return m_xPaintRow; }
CursorWrapper* GetSeekCursor() const { return m_pSeekCursor; }
-
+
void ConnectToFields();
void DisconnectFromFields();
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index 4d40eac..018e6b2 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -173,9 +173,9 @@ protected:
unsigned bSelect : 1; // Ein selektierter Polygonpunkt?
unsigned b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt
unsigned bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ...
-
+
bool mbMoveOutside; // forces this handle to be moved outside of the selection rectangle
-
+
// create marker for this kind
virtual void CreateB2dIAObject();
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 2024e4e..e62565c 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -357,7 +357,7 @@ public:
SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0;
virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0;
-
+
virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog
const SfxItemSet& rCoreSet )=0;
@@ -502,7 +502,7 @@ public:
virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0;
virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0;
-
+
virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) = 0;
};
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 20487c1..bfcb694 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -940,7 +940,7 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt )
IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG )
{
- SvtMiscOptions aMiscOptions;
+ SvtMiscOptions aMiscOptions;
aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
return 0L;
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index 4533b25..de82714 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -623,7 +623,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
{
// #i19251#
// INT32 nValue = pItem->GetValue();
-
+
// #i19251#
// The two involved fields/items are used double and contain/give different
// values regarding to the access method. Thus, here we need to separate the access
@@ -872,7 +872,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
XFormTextAdjust eAdjust = XFT_AUTOSIZE;
aAttr.Put(rOldObj.GetMergedItemSet());
-
+
const XFormTextStdFormItem& rOldForm = (const XFormTextStdFormItem&)
aAttr.Get(XATTR_FORMTXTSTDFORM);
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 580c431..2830da4 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -680,7 +680,7 @@ void IMapWindow::DoMacroAssign()
aNamesItem.AddEvent( String::CreateFromAscii( "MouseOver" ), String(), SFX_EVENT_MOUSEOVER_OBJECT );
aNamesItem.AddEvent( String::CreateFromAscii( "MouseOut" ), String(), SFX_EVENT_MOUSEOUT_OBJECT );
aSet.Put( aNamesItem );
-
+
SvxMacroItem aMacroItem(SID_ATTR_MACROITEM);
IMapObject* pIMapObj = GetIMapObj( pSdrObj );
aMacroItem.SetMacroTable( pIMapObj->GetMacroTable() );
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index ddf13d8..3a6fede 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -2349,7 +2349,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
case FUNIT_100TH_MM: eMapUnit = SFX_MAPUNIT_100TH_MM; break;
default: ;//prevent warning
}
-
+
ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) );
for ( USHORT i = 0; i < pList->Count(); ++i )
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d9efa62..562a75f 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -86,7 +86,7 @@ namespace {
SfxDispatcher* LocalGetDispatcher (const SfxBindings* pBindings)
{
SfxDispatcher* pDispatcher = NULL;
-
+
if (SfxViewFrame::Current() != NULL)
pDispatcher = SfxViewFrame::Current()->GetDispatcher();
else if (pBindings != NULL)
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 6530c69..6d64617 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1693,7 +1693,7 @@ void FmGridControl::InitColumnByField(
Reference< XPropertySet > xField;
_rxColumnModel->getPropertyValue( FM_PROP_BOUNDFIELD ) >>= xField;
-
+
if ( !xField.is() && /*sFieldName.getLength() && */_rxFieldsByNames->hasByName( sFieldName ) ) // #i93452# do not check for name length
_rxFieldsByNames->getByName( sFieldName ) >>= xField;
@@ -2013,7 +2013,7 @@ namespace
GetModelColumnPos(
sal::static_int_cast< sal_uInt16 >(_nPosition)),
FM_PROP_DESCRIPTION);
-
+
break;
default:
sRetText = DbGridControl::GetAccessibleObjectDescription(_eObjType,_nPosition);
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 5374c9b..226dabf 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -3092,7 +3092,7 @@ void DbFilterField::Update()
Reference< ::com::sun::star::container::XNameAccess > xFieldNames = xSupCol->getColumns();
if (!xFieldNames->hasByName(aName))
return;
-
+
Reference< ::com::sun::star::container::XNameAccess > xTablesNames = xSupTab->getTables();
Reference< ::com::sun::star::beans::XPropertySet > xComposerFieldAsSet(xFieldNames->getByName(aName),UNO_QUERY);
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 9f2dd95..47a8a1f 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -1599,7 +1599,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
Reference< XRowsChangeBroadcaster> xChangeBroad(xSet,UNO_QUERY);
if ( xChangeBroad.is( ) )
xChangeBroad->addRowsChangeListener(m_xRowSetListener);
-
+
// insert the currently known rows
// and one row if we are able to insert rows
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index b6b6673..7651129 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -1216,7 +1216,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl
if (pEntry)
{
if (!IsExpanded(pEntry))
- Expand(pEntry);
+ Expand(pEntry);
Select(pEntry, sal_True);
}
}
@@ -1454,7 +1454,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt )
SetCurEntry(pEntry);
insertFilterItem(m_aControlExchange->getDraggedEntries(),pTargetItems,DND_ACTION_COPY == rEvt.mnAction);
-
+
return sal_True;
}
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 19ec43e..e2363d7 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -1426,7 +1426,7 @@ namespace
::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const
{
::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter;
-
+
if ( !i_rView.IsDesignMode() )
pFilter.reset( new FocusableControlsFilter( i_rView, i_rDevice ) );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index fd93c6b..2e0a5fa 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -2275,7 +2275,7 @@ namespace svxform
continue;
bPaint = true;
-
+
} // while ( aIter.IsMore() )
if ( bPaint )
{
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index a3c1ab0..3381b2c 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -992,7 +992,7 @@ namespace svxform
&& (pEntryData!=pChildData)
)
{
-
+
SQLContext aError;
aError.Message = String(SVX_RES(RID_ERR_CONTEXT_ADDFORM));
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 9cabafd..fc5e4d3 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -193,7 +193,7 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
EnableItem( MN_ADDMENU, pAddMenu->IsItemEnabled( MN_ADD ) || pAddMenu->IsItemEnabled( MN_ADD_LINK ) );
EnableItem( MN_PREVIEW, bValidURL );
-
+
CheckItem( MN_PREVIEW, mbPreview );
if( mpTheme->IsReadOnly() || !mpTheme->GetObjectCount() )
@@ -203,7 +203,7 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
if( mpTheme->IsReadOnly() )
EnableItem( MN_PASTECLIPBOARD, FALSE );
-
+
if( !mpTheme->GetObjectCount() )
EnableItem( MN_COPYCLIPBOARD, FALSE );
}
@@ -268,9 +268,9 @@ void GalleryThemePopup::StateChanged( USHORT nSID, SfxItemState eState, const Sf
{
SfxBoolItem* pBoolItem = PTR_CAST( SfxBoolItem, pItem );
const SgaObjKind eObjKind = mpTheme->GetObjectKind( mnObjectPos );
-
+
DBG_ASSERT( pBoolItem || pBoolItem == 0, "SfxBoolItem erwartet!");
-
+
GetPopupMenu( MN_ADDMENU )->EnableItem( MN_ADD, pBoolItem->GetValue() && ( eObjKind != SGA_OBJ_SOUND ) );
}
}
@@ -322,7 +322,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
Font aInfoFont( maInfoBar.GetControlFont() );
maMiscOptions.AddListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
-
+
maViewBox.InsertItem( TBX_ID_ICON, aDummyImage );
maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK );
maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW );
@@ -354,7 +354,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
GalleryBrowser2::~GalleryBrowser2()
{
maMiscOptions.RemoveListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) );
-
+
delete mpPreview;
delete mpListView;
delete mpIconView;
@@ -372,7 +372,7 @@ void GalleryBrowser2::InitSettings()
aInfoFont.SetWeight( WEIGHT_BOLD );
aInfoFont.SetColor( GALLERY_FG_COLOR );
maInfoBar.SetControlFont( aInfoFont );
-
+
maInfoBar.SetBackground( Wallpaper( GALLERY_DLG_COLOR ) );
maInfoBar.SetControlBackground( GALLERY_DLG_COLOR );
@@ -407,10 +407,10 @@ void GalleryBrowser2::Resize()
const long nInfoBarX = aBoxSize.Width() + ( nOffset * 3 ) + nSepWidth;
const Point aPt( 0, aBoxSize.Height() + 3 );
const Size aSz( aOutSize.Width(), aOutSize.Height() - aPt.Y() );
-
+
maSeparator.SetPosSizePixel( Point( aBoxSize.Width() + nOffset, 0 ), Size( nSepWidth, aBoxSize.Height() ) );
maInfoBar.SetPosSizePixel( Point( nInfoBarX, 0 ), Size( aOutSize.Width() - nInfoBarX, aBoxSize.Height() ) );
-
+
mpIconView->SetPosSizePixel( aPt, aSz );
mpListView->SetPosSizePixel( aPt, aSz );
mpPreview->SetPosSizePixel( aPt, aSz );
@@ -557,7 +557,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
INetURLObject aURL;
const_cast< GalleryTheme* >( mpCurTheme )->GetURL( nItemId - 1, aURL );
-
+
const BOOL bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
BOOL bPreview = bValidURL;
BOOL bAdd = bValidURL;
@@ -594,7 +594,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
nExecuteId = MN_ADD;
}
break;
-
+
case( KEY_DELETE ):
case( KEY_D ):
{
@@ -631,12 +631,12 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName )
delete mpIconView, mpIconView = NULL;
delete mpListView, mpListView = NULL;
delete mpPreview, mpPreview = NULL;
-
+
if( mpCurTheme )
mpGallery->ReleaseTheme( mpCurTheme, *this );
mpCurTheme = mpGallery->AcquireTheme( rThemeName, *this );
-
+
mpIconView = new GalleryIconView( this, mpCurTheme );
mpListView = new GalleryListView( this, mpCurTheme );
mpPreview = new GalleryPreview( this, mpCurTheme );
@@ -718,7 +718,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
if( mpCurTheme )
mpCurTheme->GetGraphic( nPos, aGraphic );
-
+
mpPreview->SetGraphic( aGraphic );
mpPreview->Show();
@@ -883,11 +883,11 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
{
const Size aOutputSizePixel( GetOutputSizePixel() );
ULONG nRet = 0;
-
+
if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
{
nRet = ( ( GALLERYBROWSERMODE_ICON == meLastMode ) ? mpIconView->GetSelectItemId() : ( mpListView->FirstSelectedRow() + 1 ) );
-
+
if( pSelPos )
rSelPos = GetPointerPosPixel();
else
@@ -922,7 +922,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
rSelPos.X() = Max( Min( rSelPos.X(), aOutputSizePixel.Width() - 1L ), 0L );
rSelPos.Y() = Max( Min( rSelPos.Y(), aOutputSizePixel.Height() - 1L ), 0L );
-
+
if( nRet && ( !mpCurTheme || ( nRet > mpCurTheme->GetObjectCount() ) ) )
{
nRet = 0;
@@ -962,7 +962,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
sal_uInt32 nFormat = 0;
mbCurActionIsLinkage = ( MN_ADD_LINK == nId );
-
+
switch( mpCurTheme->GetObjectKind( mnCurActionPos ) )
{
case( SGA_OBJ_BMP ):
@@ -1123,7 +1123,7 @@ String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject
if( aPath.Len() && ( nItemTextFlags & GALLERY_ITEM_TITLE ) )
aRet += ')';
}
-
+
return aRet;
}
@@ -1154,7 +1154,7 @@ String GalleryBrowser2::GetFilterName() const
GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();
INetURLObject aURL; mpCurTheme->GetURL( mnCurActionPos, aURL );
sal_uInt16 nFilter = pFilter->GetImportFormatNumberForShortName( aURL.GetExtension() );
-
+
if( GRFILTER_FORMAT_DONTKNOW != nFilter )
aFilterName = pFilter->GetImportFormatName( nFilter );
}
@@ -1220,7 +1220,7 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox )
SetMode( GALLERYBROWSERMODE_ICON );
else if( pBox->GetCurItemId() == TBX_ID_LIST )
SetMode( GALLERYBROWSERMODE_LIST );
-
+
return 0L;
}
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index daa5f24..3f25dcd 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -402,15 +402,15 @@ void GalleryTheme::ImplBroadcast( ULONG nUpdatePos )
BOOL GalleryTheme::UnlockTheme()
{
DBG_ASSERT( mnThemeLockCount, "Theme is not locked" );
-
+
BOOL bRet = FALSE;
-
+
if( mnThemeLockCount )
{
--mnThemeLockCount;
bRet = TRUE;
}
-
+
return bRet;
}
@@ -1023,7 +1023,7 @@ BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos )
FmFormModel* pFormModel = (FmFormModel*) &rModel;
pFormModel->BurnInStyleSheetAttributes();
-
+
{
uno::Reference< io::XOutputStream > xDocOut( new utl::OOutputStreamWrapper( aMemStm ) );
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 2c3b3fd..9b9d190 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -84,7 +84,7 @@ namespace svx
virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException);
-
+
// call the fireEvent method from the table when it exists.
void SAL_CALL fireEvent(
const sal_Int16 _nEventId,
@@ -238,7 +238,7 @@ namespace svx
DECLARE_XTYPEPROVIDER( )
SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent );
-
+
void ParentDestroyed();
// XAccessibleComponent
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index cc8a5f3..67dfae5 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -456,7 +456,7 @@ namespace svxform
sal_uInt16 m_nFormsSelected;
sal_uInt16 m_nControlsSelected;
sal_uInt16 m_nHiddenControls; // (die Zahl geht in m_nControlsSelected mit ein)
-
+
unsigned short m_aTimerCounter;
sal_Bool m_bDragDataDirty : 1; // dito
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index d7f519f..213d128 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -198,7 +198,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
++nConvertedCount;
}
}
-
+
if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS )
{
SetValue( (UINT16)nCurrentZoom );
diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
index 1e754d5..c9971f7 100644
--- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx
@@ -313,7 +313,7 @@ namespace sdr
drawinglayer::primitive2d::Primitive2DSequence xRetval;
const SdrPage& rPage = getPage();
const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt());
-
+
// We have only the page information, not the view information. Use the
// svtools::FONTCOLOR color for initialisation
const svtools::ColorConfig aColorConfig;
@@ -328,10 +328,10 @@ namespace sdr
aLeft.append(basegfx::B2DPoint(aPageBorderRange.getMinX(), aPageBorderRange.getMinY()));
aLeft.append(basegfx::B2DPoint(aPageBorderRange.getMinX(), aPageBorderRange.getMaxY()));
-
+
aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMinY()));
aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMaxY()));
-
+
xRetval.realloc(2);
xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aLeft, aRGBBorderColor));
xRetval[1] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aRight, aRGBBorderColor));
@@ -436,7 +436,7 @@ namespace sdr
{
const ViewContact& rCandidate(GetViewContact(a));
const drawinglayer::primitive2d::Primitive2DSequence aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence());
-
+
drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, aCandSeq);
}
@@ -621,7 +621,7 @@ namespace sdr
maViewContactOfPageBackground.ActionChanged();
maViewContactOfPageShadow.ActionChanged();
maViewContactOfPageFill.ActionChanged();
-
+
const SdrPage& rPage = GetSdrPage();
if(rPage.TRG_HasMasterPage())
@@ -632,7 +632,7 @@ namespace sdr
{
maViewContactOfMasterPage.ActionChanged();
}
-
+
maViewContactOfOuterPageBorder.ActionChanged();
maViewContactOfInnerPageBorder.ActionChanged();
maViewContactOfGridBack.ActionChanged();
diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
index 7a5da52..ac297d8 100644
--- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx
@@ -77,7 +77,7 @@ namespace sdr
const bool bIsInplaceActive((nState == embed::EmbedStates::INPLACE_ACTIVE) || (nState == embed::EmbedStates::UI_ACTIVE));
const bool bIsChart(rSdrOle2.IsChart());
bool bDone(false);
-
+
if(!bDone && bIsInplaceActive)
{
if( !GetObjectContact().isOutputToPrinter() && !GetObjectContact().isOutputToRecordingMetaFile() )
@@ -119,7 +119,7 @@ namespace sdr
// determine if embedding and PrettyPrinting shall be done at all
uno::Reference< frame::XModel > xChartModel;
bool bDoChartPrettyPrinting(true);
-
+
// the original ChartPrettyPainter does not do it for Window
if(bDoChartPrettyPrinting && GetObjectContact().isOutputToWindow())
{
@@ -225,7 +225,7 @@ namespace sdr
}
}
-
+
return xRetval;
}
diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
index f71148c..a82fbc3 100644
--- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx
@@ -75,7 +75,7 @@ namespace drawinglayer
const GraphicObject aGraphicObject(aGraphic);
const GraphicAttr aGraphicAttr;
drawinglayer::primitive2d::Primitive2DSequence xOLEContent;
-
+
if(bScaleContent)
{
// get transformation atoms
@@ -184,7 +184,7 @@ namespace drawinglayer
{
basegfx::B2DRange aRange(0.0, 0.0, 1.0, 1.0);
aRange.transform(getObjectTransform());
-
+
return aRange;
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list