summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-03-09 14:56:21 +0100
committerThorsten Behrens <tbehrens@novell.com>2011-03-09 14:56:21 +0100
commitff62ed4745a9b2367c68ef3eb863d29022f0fa7d (patch)
tree86a24f72042acbf232e5d1805150b590acc532a3 /sfx2
parent14fcbd54c96d9f46365f76f8df6b51d2e8074d74 (diff)
Revert idle whitespace changes
Reverting all hunks that solely change whitespace, prior to performing the m101 merge from OOo.
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/inc/mailmodelapi.hxx2
-rw-r--r--sfx2/inc/sfx2/viewsh.hxx4
-rw-r--r--sfx2/source/appl/appuno.cxx4
-rw-r--r--sfx2/source/appl/helpinterceptor.hxx2
-rw-r--r--sfx2/source/control/bindings.cxx2
-rw-r--r--sfx2/source/dialog/about.cxx6
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx2
-rw-r--r--sfx2/source/dialog/taskpane.cxx4
-rw-r--r--sfx2/source/dialog/templdlg.cxx2
-rw-r--r--sfx2/source/dialog/titledockwin.cxx6
-rw-r--r--sfx2/source/doc/objcont.cxx12
-rw-r--r--sfx2/source/menu/mnumgr.cxx6
-rw-r--r--sfx2/source/menu/virtmenu.cxx4
-rw-r--r--sfx2/source/toolbox/imgmgr.cxx12
-rw-r--r--sfx2/source/view/viewsh.cxx2
15 files changed, 35 insertions, 35 deletions
diff --git a/sfx2/inc/mailmodelapi.hxx b/sfx2/inc/mailmodelapi.hxx
index 9072811c92..927a6ff386 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 441f136190..f30d8aef18 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 8da42b90b1..d418c9331f 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 0e2fa493b7..9131357886 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 7eeb380a8b..e4bb59b867 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 ce44969c5f..c701fdd8e4 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 0af270ccd5..43659982eb 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 d1de5e0aec..fa9126ebf3 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 34e5418aad..50a51cc5b0 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 ed5940cace..fa80e98563 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 d0f44903bb..97484ebdbf 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 9db9f968e0..780aa03801 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 bd417dde19..07937e7855 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 dbb135a2f0..022c62677c 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 6c013077a9..e257f285bc 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();