Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2789
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/2789/1
Comment cleanup and several indentation fixes
Change-Id: Ib3e51969b2d2624e69a2270c5446b7ac1095a2b5
---
M svx/inc/svx/unoshape.hxx
M sw/source/ui/app/appenv.cxx
M sw/source/ui/app/apphdl.cxx
M sw/source/ui/app/applab.cxx
M sw/source/ui/app/appopt.cxx
M sw/source/ui/app/docsh.cxx
M sw/source/ui/app/docsh2.cxx
M sw/source/ui/app/docshdrw.cxx
M sw/source/ui/app/docshini.cxx
M sw/source/ui/app/docst.cxx
M sw/source/ui/app/docstyle.cxx
M sw/source/ui/app/error.src
M sw/source/ui/app/mainwn.cxx
M sw/source/ui/app/swmodul1.cxx
M sw/source/ui/app/swmodule.cxx
M sw/source/ui/app/swwait.cxx
M sw/source/ui/dochdl/gloshdl.cxx
M sw/source/ui/dochdl/selglos.cxx
M sw/source/ui/dochdl/swdtflvr.cxx
M sw/source/ui/docvw/AnchorOverlayObject.cxx
M sw/source/ui/docvw/ShadowOverlayObject.cxx
M sw/source/ui/docvw/SidebarTxtControlAcc.cxx
M sw/source/ui/docvw/SidebarWin.cxx
M sw/source/ui/docvw/SidebarWinAcc.cxx
M sw/source/ui/docvw/edtdd.cxx
M sw/source/ui/docvw/edtwin.cxx
M sw/source/ui/docvw/edtwin2.cxx
M sw/source/ui/docvw/edtwin3.cxx
M sw/source/ui/docvw/romenu.cxx
M sw/source/ui/docvw/srcedtw.cxx
30 files changed, 186 insertions(+), 540 deletions(-)
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 36bf13f..6c2a505 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -321,9 +321,6 @@
virtual void unlock();
protected:
- using SvxUnoTextRangeBase::setPropertyValue;
- using SvxUnoTextRangeBase::getPropertyValue;
-
// overide these for special property handling in subcasses. Return true if property is handled
virtual bool setPropertyValueImpl( const ::rtl::OUString& rName, const
SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual bool getPropertyValueImpl( const ::rtl::OUString& rName, const
SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue )
throw(::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index 3b47034..d0f64ab 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -505,5 +505,4 @@
delete pDlg;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 0bbbd36..d9b62fc 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -101,14 +101,11 @@
using namespace ::com::sun::star;
-/*--------------------------------------------------------------------
- Description: Slotmaps for the application's methods
- --------------------------------------------------------------------*/
+// Slotmaps for the application's methods
// here are the SlotID's being included
// see Idl-file
-//
#define SwModule
#define ViewSettings
#define PrintSettings
@@ -126,12 +123,7 @@
SW_RES(RID_MODULE_TOOLBOX) );
}
-
-/*--------------------------------------------------------------------
- Description: other states
- --------------------------------------------------------------------*/
-
-
+// other states
void SwModule::StateOther(SfxItemSet &rSet)
{
SfxWhichIter aIter(rSet);
@@ -235,10 +227,8 @@
return pNewView;
}
-/*--------------------------------------------------------------------
- Description: start field dialog
- --------------------------------------------------------------------*/
+// start field dialog
void NewXForms( SfxRequest& rReq ); // implementation: below
namespace
@@ -651,10 +641,7 @@
}
}
-/*--------------------------------------------------------------------
- Description: Catch notifications
- --------------------------------------------------------------------*/
-
+// Catch notifications
// Catch hint for DocInfo
void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index 7b75148..d840bf8 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -401,5 +401,4 @@
delete pNewDBMgr;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx
index eb41720..d16452f 100644
--- a/sw/source/ui/app/appopt.cxx
+++ b/sw/source/ui/app/appopt.cxx
@@ -95,9 +95,7 @@
pAppView = 0; // with View, there's nothing to win here
}
- /********************************************************************/
- /* Options/Edit */
- /********************************************************************/
+ // Options/Edit
SfxItemSet* pRet = new SfxItemSet (GetPool(), FN_PARAM_DOCDISP, FN_PARAM_ELEM,
SID_PRINTPREVIEW, SID_PRINTPREVIEW,
SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS,
@@ -260,9 +258,8 @@
SfxBindings *pBindings = pAppView ? &pAppView->GetViewFrame()->GetBindings()
: NULL;
- /*---------------------------------------------------------------------
- Interpret the page Documentview
- -----------------------------------------------------------------------*/
+
+ // Interpret the page Documentview
if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_DOCDISP, sal_False, &pItem ))
{
const SwDocDisplayItem* pDocDispItem = (const SwDocDisplayItem*)pItem;
@@ -288,10 +285,7 @@
}
}
- /*---------------------------------------------------------------------
- Elements - interpret Item
- -----------------------------------------------------------------------*/
-
+ // Elements - interpret Item
if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ELEM, sal_False, &pItem ) )
{
const SwElemItem* pElemItem = (const SwElemItem*)pItem;
@@ -343,10 +337,7 @@
}
}
-
- /*------------------------------------------------
- Background only in WebDialog
- --------------------------------------------------*/
+ // Background only in WebDialog
if(SFX_ITEM_SET == rSet.GetItemState(RES_BACKGROUND))
{
const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rSet.Get(
@@ -354,10 +345,7 @@
aViewOpt.SetRetoucheColor( rBrushItem.GetColor() );
}
- /*--------------------------------------------------------------------
- Interpret page Grid Settings
- ----------------------------------------------------------------------*/
-
+ // Interpret page Grid Settings
if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS, sal_False, &pItem ))
{
const SvxGridItem* pGridItem = (const SvxGridItem*)pItem;
@@ -384,10 +372,7 @@
}
}
- /*--------------------------------------------------------------------
- Interpret Writer Printer Options
- ----------------------------------------------------------------------*/
-
+ // Interpret Writer Printer Options
if( SFX_ITEM_SET == rSet.GetItemState( FN_PARAM_ADDPRINTER, sal_False, &pItem ))
{
SwPrintOptions* pOpt = GetPrtOptions(!bTextDialog);
@@ -575,6 +560,5 @@
SAL_WARN( "sw", "SwModule::CreateTabPage(): Unknown tabpage id " << nId );
return pRet;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 0849251..92f1000 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -123,14 +123,9 @@
TYPEINIT2(SwDocShell, SfxObjectShell, SfxListener);
-//-------------------------------------------------------------------------
SFX_IMPL_OBJECTFACTORY(SwDocShell, SvGlobalName(SO3_SW_CLASSID),
SFXOBJECTSHELL_STD_NORMAL|SFXOBJECTSHELL_HASMENU, "swriter" )
-/*--------------------------------------------------------------------
- Description: Prepare loading
- --------------------------------------------------------------------*/
-
-
+// Prepare loading
Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
SwCrsrShell *pCrsrShell,
SwPaM* pPaM )
@@ -219,10 +214,7 @@
return pRead;
}
-/*--------------------------------------------------------------------
- Description: Loading
- --------------------------------------------------------------------*/
-
+// Loading
sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::ConvertFrom" );
@@ -279,11 +271,7 @@
return bOk;
}
-/*--------------------------------------------------------------------
- Description: Saving the Default-Format, Stg present
- --------------------------------------------------------------------*/
-
-
+// Saving the Default-Format, Stg present
sal_Bool SwDocShell::Save()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::Save" );
@@ -372,11 +360,7 @@
return !IsError( nErr );
}
-/*--------------------------------------------------------------------
- Description: Save using the Defaultformat
- --------------------------------------------------------------------*/
-
-
+// Save using the Defaultformat
sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SaveAs" );
@@ -504,9 +488,7 @@
return !IsError( nErr );
}
-/*--------------------------------------------------------------------
- Description: Save all Formats
- --------------------------------------------------------------------*/
+// Save all Formats
static SwSrcView* lcl_GetSourceView( SwDocShell* pSh )
{
// are we in SourceView?
@@ -748,16 +730,9 @@
return !IsError( nErrno );
}
-/*--------------------------------------------------------------------
- Description: Hands off
- --------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------
- Description: ??? do not yet activate, must deliver TRUE
- --------------------------------------------------------------------*/
-
-
+// Hands off
+// do not yet activate, must deliver TRUE
sal_Bool SwDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::SaveCompleted" );
@@ -793,10 +768,7 @@
return bRet;
}
-/*--------------------------------------------------------------------
- Description: Draw()-Overload for OLE2 (Sfx)
- --------------------------------------------------------------------*/
-
+// Draw()-Overload for OLE2 (Sfx)
void SwDocShell::Draw( OutputDevice* pDev, const JobSetup& rSetup,
sal_uInt16 nAspect )
{
@@ -1067,11 +1039,7 @@
}
}
-/*--------------------------------------------------------------------
- Description: OLE-Hdls
- --------------------------------------------------------------------*/
-
-
+// OLE-Hdls
IMPL_LINK( SwDocShell, Ole2ModifiedHdl, void *, p )
{
// the Status is handed over from Doc (see doc.cxx)
@@ -1083,11 +1051,7 @@
return 0;
}
-/*--------------------------------------------------------------------
- Description: return Pool here, because virtual
- --------------------------------------------------------------------*/
-
-
+// return Pool here, because virtual
SfxStyleSheetBasePool* SwDocShell::GetStyleSheetPool()
{
return mxBasePool.get();
@@ -1332,7 +1296,5 @@
return bRes;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index b10260b..b454fb3 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -123,10 +123,7 @@
using namespace ::sfx2;
extern bool FindPhyStyle( SwDoc& , const String& , SfxStyleFamily );
-/*--------------------------------------------------------------------
- Description: create DocInfo (virtual)
- --------------------------------------------------------------------*/
-
+// create DocInfo (virtual)
SfxDocumentInfoDialog* SwDocShell::CreateDocumentInfoDialog(
Window *pParent, const SfxItemSet &rSet)
{
@@ -229,10 +226,7 @@
}
}
-/*--------------------------------------------------------------------
- Description: Notification on DocInfo changes
- --------------------------------------------------------------------*/
-
+// Notification on DocInfo changes
void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
if( !pDoc )
@@ -310,10 +304,7 @@
}
}
-/*--------------------------------------------------------------------
- Description: Notification Close Doc
- --------------------------------------------------------------------*/
-
+// Notification Close Doc
sal_uInt16 SwDocShell::PrepareClose( sal_Bool bUI, sal_Bool bForBrowsing )
{
sal_uInt16 nRet = SfxObjectShell::PrepareClose( bUI, bForBrowsing );
@@ -334,10 +325,7 @@
return nRet;
}
-/*--------------------------------------------------------------------
- Description: Organizer
- --------------------------------------------------------------------*/
-
+// Organizer
sal_Bool SwDocShell::Insert( SfxObjectShell &rSource,
sal_uInt16 nSourceIdx1, // SourcePool: uppermost content level (templates/macros)
sal_uInt16 nSourceIdx2, // Index in the content
@@ -548,10 +536,7 @@
return bRet;
}
-/*--------------------------------------------------------------------
- Description: template Remove
- --------------------------------------------------------------------*/
-
+// template Remove
sal_Bool SwDocShell::Remove(sal_uInt16 nIdx1, // see Insert
sal_uInt16 nIdx2,
sal_uInt16 nIdx3)
@@ -799,7 +784,6 @@
while( pFlt )
{
// --> OD #i117339#
-// if( pFlt && pFlt->IsAllowedAsTemplate() )
if( pFlt && pFlt->IsAllowedAsTemplate() &&
( pFlt->GetUserData() == "CXML" ||
pFlt->GetUserData() == "CXMLV" ) )
@@ -1772,9 +1756,7 @@
return nErr;
}
-/*--------------------------------------------------------------------
- Get a client for an embedded object if possible.
- --------------------------------------------------------------------*/
+// Get a client for an embedded object if possible.
SfxInPlaceClient* SwDocShell::GetIPClient( const ::svt::EmbeddedObjectRef& xObjRef )
{
SfxInPlaceClient* pResult = NULL;
diff --git a/sw/source/ui/app/docshdrw.cxx b/sw/source/ui/app/docshdrw.cxx
index 5979c0f..c9319cb 100644
--- a/sw/source/ui/app/docshdrw.cxx
+++ b/sw/source/ui/app/docshdrw.cxx
@@ -31,11 +31,7 @@
using namespace ::com::sun::star;
-/*--------------------------------------------------------------------
- Description: Load Document
- --------------------------------------------------------------------*/
-
-
+// Load Document
void SwDocShell::InitDraw()
{
SdrModel *pDrDoc = pDoc->GetDrawModel();
@@ -55,7 +51,5 @@
else
PutItem( SvxColorListItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ));
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index 55ece73..108a4b9 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -94,13 +94,7 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-
-
-/*--------------------------------------------------------------------
- Description: Load Document
- --------------------------------------------------------------------*/
-
-
+// Load Document
sal_Bool SwDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::InitNew" );
@@ -335,11 +329,7 @@
return bRet;
}
-/*--------------------------------------------------------------------
- Description: Ctor with SfxCreateMode ?????
- --------------------------------------------------------------------*/
-
-
+// Ctor with SfxCreateMode ?????
SwDocShell::SwDocShell( SfxObjectCreateMode eMode ) :
SfxObjectShell ( eMode ),
pDoc(0),
@@ -354,11 +344,7 @@
Init_Impl();
}
-/*--------------------------------------------------------------------
- Description: Ctor / Dtor
- --------------------------------------------------------------------*/
-
-
+// Ctor / Dtor
SwDocShell::SwDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
SfxObjectShell ( i_nSfxCreationFlags ),
pDoc(0),
@@ -373,11 +359,7 @@
Init_Impl();
}
-/*--------------------------------------------------------------------
- Description: Ctor / Dtor
- --------------------------------------------------------------------*/
-
-
+// Ctor / Dtor
SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ):
SfxObjectShell ( eMode ),
pDoc(pD),
@@ -392,12 +374,8 @@
Init_Impl();
}
-/*--------------------------------------------------------------------
- Description: Dtor
- --------------------------------------------------------------------*/
-
-
- SwDocShell::~SwDocShell()
+// Dtor
+SwDocShell::~SwDocShell()
{
// disable chart related objects now because in ~SwDoc it may be to late for this
if( pDoc )
@@ -431,11 +409,8 @@
// set map unit to twip
SetMapUnit( MAP_TWIP );
}
-/*--------------------------------------------------------------------
- Description: AddLink
- --------------------------------------------------------------------*/
-
+// AddLink
void SwDocShell::AddLink()
{
if( !pDoc )
@@ -457,11 +432,7 @@
pDoc->SetOle2Link(LINK(this, SwDocShell, Ole2ModifiedHdl));
}
-/*--------------------------------------------------------------------
- Description: create new FontList Change Printer
- --------------------------------------------------------------------*/
-
-
+// create new FontList Change Printer
void SwDocShell::UpdateFontList()
{
if(!bInUpdateFontList)
@@ -478,11 +449,7 @@
}
}
-/*--------------------------------------------------------------------
- Description: RemoveLink
- --------------------------------------------------------------------*/
-
-
+// RemoveLink
void SwDocShell::RemoveLink()
{
// disconnect Uno-Object
@@ -517,11 +484,7 @@
((SwXTextDocument*)xDoc.get())->Reactivate(this);
}
-/*--------------------------------------------------------------------
- Description: Load, Default-Format
- --------------------------------------------------------------------*/
-
-
+// Load, Default-Format
sal_Bool SwDocShell::Load( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDocShell::Load" );
@@ -536,74 +499,72 @@
// Loading
// for MD
- OSL_ENSURE( !mxBasePool.is(), "who hasn't destroyed their Pool?" );
- mxBasePool = new SwDocStyleSheetPool( *pDoc, SFX_CREATE_MODE_ORGANIZER ==
GetCreateMode() );
- if(GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
- {
- SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item,
SID_UPDATEDOCMODE, sal_False);
- nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() :
document::UpdateDocMode::NO_UPDATE;
- }
+ OSL_ENSURE( !mxBasePool.is(), "who hasn't destroyed their Pool?" );
+ mxBasePool = new SwDocStyleSheetPool( *pDoc, SFX_CREATE_MODE_ORGANIZER == GetCreateMode()
);
+ if(GetCreateMode() != SFX_CREATE_MODE_ORGANIZER)
+ {
+ SFX_ITEMSET_ARG( rMedium.GetItemSet(), pUpdateDocItem, SfxUInt16Item,
SID_UPDATEDOCMODE, sal_False);
+ nUpdateDocMode = pUpdateDocItem ? pUpdateDocItem->GetValue() :
document::UpdateDocMode::NO_UPDATE;
+ }
SwWait aWait( *this, sal_True );
sal_uInt32 nErr = ERR_SWG_READ_ERROR;
switch( GetCreateMode() )
{
-
- case SFX_CREATE_MODE_ORGANIZER:
- {
- if( ReadXML )
+ case SFX_CREATE_MODE_ORGANIZER:
{
- ReadXML->SetOrganizerMode( sal_True );
- SwReader aRdr( rMedium, aEmptyStr, pDoc );
- nErr = aRdr.Read( *ReadXML );
- ReadXML->SetOrganizerMode( sal_False );
- }
- }
- break;
-
- case SFX_CREATE_MODE_INTERNAL:
- case SFX_CREATE_MODE_EMBEDDED:
- {
- // for MWERKS (Mac-Compiler): can't cast autonomously
- SwTransferable::InitOle( this, *pDoc );
- }
- // suppress SfxProgress, when we are Embedded
- SW_MOD()->SetEmbeddedLoadSave( sal_True );
- // no break;
-
- case SFX_CREATE_MODE_STANDARD:
- case SFX_CREATE_MODE_PREVIEW:
- {
- Reader *pReader = ReadXML;
- if( pReader )
- {
- // set Doc's DocInfo at DocShell-Medium
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "before ReadDocInfo" );
- SwReader aRdr( rMedium, aEmptyStr, pDoc );
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "before Read" );
- nErr = aRdr.Read( *pReader );
- RTL_LOGFILE_CONTEXT_TRACE( aLog, "after Read" );
-
- // If a XML document is loaded, the global doc/web doc
- // flags have to be set, because they aren't loaded
- // by this formats.
- if( ISA( SwWebDocShell ) )
+ if( ReadXML )
{
- if( !pDoc->get(IDocumentSettingAccess::HTML_MODE) )
- pDoc->set(IDocumentSettingAccess::HTML_MODE, true);
- }
- if( ISA( SwGlobalDocShell ) )
- {
- if( !pDoc->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
- pDoc->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
+ ReadXML->SetOrganizerMode( sal_True );
+ SwReader aRdr( rMedium, aEmptyStr, pDoc );
+ nErr = aRdr.Read( *ReadXML );
+ ReadXML->SetOrganizerMode( sal_False );
}
}
- }
- break;
+ break;
- default:
- OSL_ENSURE( !this, "Load: new CreateMode?" );
+ case SFX_CREATE_MODE_INTERNAL:
+ case SFX_CREATE_MODE_EMBEDDED:
+ {
+ // for MWERKS (Mac-Compiler): can't cast autonomously
+ SwTransferable::InitOle( this, *pDoc );
+ }
+ // suppress SfxProgress, when we are Embedded
+ SW_MOD()->SetEmbeddedLoadSave( sal_True );
+ // no break;
+ case SFX_CREATE_MODE_STANDARD:
+ case SFX_CREATE_MODE_PREVIEW:
+ {
+ Reader *pReader = ReadXML;
+ if( pReader )
+ {
+ // set Doc's DocInfo at DocShell-Medium
+ RTL_LOGFILE_CONTEXT_TRACE( aLog, "before ReadDocInfo" );
+ SwReader aRdr( rMedium, aEmptyStr, pDoc );
+ RTL_LOGFILE_CONTEXT_TRACE( aLog, "before Read" );
+ nErr = aRdr.Read( *pReader );
+ RTL_LOGFILE_CONTEXT_TRACE( aLog, "after Read" );
+
+ // If a XML document is loaded, the global doc/web doc
+ // flags have to be set, because they aren't loaded
+ // by this formats.
+ if( ISA( SwWebDocShell ) )
+ {
+ if( !pDoc->get(IDocumentSettingAccess::HTML_MODE) )
+ pDoc->set(IDocumentSettingAccess::HTML_MODE, true);
+ }
+ if( ISA( SwGlobalDocShell ) )
+ {
+ if( !pDoc->get(IDocumentSettingAccess::GLOBAL_DOCUMENT) )
+ pDoc->set(IDocumentSettingAccess::GLOBAL_DOCUMENT, true);
+ }
+ }
+ }
+ break;
+
+ default:
+ OSL_ENSURE( !this, "Load: new CreateMode?" );
}
UpdateFontList();
diff --git a/sw/source/ui/app/docst.cxx b/sw/source/ui/app/docst.cxx
index d158bb9..a769e3a 100644
--- a/sw/source/ui/app/docst.cxx
+++ b/sw/source/ui/app/docst.cxx
@@ -253,12 +253,7 @@
}
}
-
-/*--------------------------------------------------------------------
- Description: evaluate StyleSheet-Requests
- --------------------------------------------------------------------*/
-
-
+// evaluate StyleSheet-Requests
void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
{
sal_uInt16 nSlot = rReq.GetSlot();
@@ -599,7 +594,7 @@
m_xBasePool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *m_xTmp.get() ) );
pDoc->SetModified();
- if( !m_bModified ) // Bug 57028
+ if( !m_bModified )
{
pDoc->GetIDocumentUndoRedo().SetUndoNoResetModified();
}
@@ -609,11 +604,7 @@
return m_nRet;
}
-/*--------------------------------------------------------------------
- Description: Edit
- --------------------------------------------------------------------*/
-
-
+// Edit
sal_uInt16 SwDocShell::Edit( const String &rName, const String &rParent, sal_uInt16 nFamily,
sal_uInt16 nMask,
sal_Bool bNew, sal_uInt16 nPageId, SwWrtShell* pActShell,
sal_Bool bBasic )
@@ -846,11 +837,7 @@
return nRet;
}
-/*--------------------------------------------------------------------
- Description: Delete
- --------------------------------------------------------------------*/
-
-
+// Delete
sal_uInt16 SwDocShell::Delete(const String &rName, sal_uInt16 nFamily)
{
SfxStyleSheetBase *pStyle = mxBasePool->Find(rName, (SfxStyleFamily)nFamily);
@@ -886,11 +873,7 @@
return sal_False;
}
-/*--------------------------------------------------------------------
- Description: apply template
- --------------------------------------------------------------------*/
-
-
+// apply template
sal_uInt16 SwDocShell::ApplyStyles(const String &rName, sal_uInt16 nFamily,
SwWrtShell* pShell, sal_uInt16 nMode )
{
@@ -953,12 +936,7 @@
return nFamily;
}
-/*--------------------------------------------------------------------
- Description: start watering-can
- --------------------------------------------------------------------*/
-
-
-
+// start watering-can
sal_uInt16 SwDocShell::DoWaterCan(const String &rName, sal_uInt16 nFamily)
{
OSL_ENSURE(GetWrtShell(), "No Shell, no Styles");
@@ -1012,11 +990,7 @@
return nFamily;
}
-/*--------------------------------------------------------------------
- Description: update template
- --------------------------------------------------------------------*/
-
-
+// update template
sal_uInt16 SwDocShell::UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell)
{
SwWrtShell* pCurrWrtShell = pShell ? pShell : GetWrtShell();
@@ -1077,7 +1051,7 @@
{
pCurrWrtShell->StartAllAction();
pCurrWrtShell->FillByEx(pChar);
- // also apply template to remove hard set attributes
+ // also apply template to remove hard set attributes
pCurrWrtShell->EndAllAction();
}
@@ -1101,11 +1075,7 @@
return nFamily;
}
-/*--------------------------------------------------------------------
- Description: NewByExample
- --------------------------------------------------------------------*/
-
-
+// NewByExample
sal_uInt16 SwDocShell::MakeByExample( const String &rName, sal_uInt16 nFamily,
sal_uInt16 nMask, SwWrtShell* pShell )
{
@@ -1141,24 +1111,24 @@
sal_uInt16 nId = pColl->GetPoolFmtId() & 0x87ff;
switch( nMask & 0x0fff )
{
- case SWSTYLEBIT_TEXT:
- nId |= COLL_TEXT_BITS;
- break;
- case SWSTYLEBIT_CHAPTER:
- nId |= COLL_DOC_BITS;
- break;
- case SWSTYLEBIT_LIST:
- nId |= COLL_LISTS_BITS;
- break;
- case SWSTYLEBIT_IDX:
- nId |= COLL_REGISTER_BITS;
- break;
- case SWSTYLEBIT_EXTRA:
- nId |= COLL_EXTRA_BITS;
- break;
- case SWSTYLEBIT_HTML:
- nId |= COLL_HTML_BITS;
- break;
+ case SWSTYLEBIT_TEXT:
+ nId |= COLL_TEXT_BITS;
+ break;
+ case SWSTYLEBIT_CHAPTER:
+ nId |= COLL_DOC_BITS;
+ break;
+ case SWSTYLEBIT_LIST:
+ nId |= COLL_LISTS_BITS;
+ break;
+ case SWSTYLEBIT_IDX:
+ nId |= COLL_REGISTER_BITS;
+ break;
+ case SWSTYLEBIT_EXTRA:
+ nId |= COLL_EXTRA_BITS;
+ break;
+ case SWSTYLEBIT_HTML:
+ nId |= COLL_HTML_BITS;
+ break;
}
pColl->SetPoolFmtId(nId);
@@ -1317,7 +1287,5 @@
return Bitmap( SW_RES( BMP_STYLES_FAMILY_NUM ));
return SfxObjectShell::GetStyleFamilyBitmap( eFamily );
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index a2c124e..dc36e11 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -104,11 +104,8 @@
}
}
-/*--------------------------------------------------------------------
- Description: find/create SwCharFormate
- possibly fill Style
- --------------------------------------------------------------------*/
-
+// find/create SwCharFormate
+// possibly fill Style
static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
const String& rName,
SwDocStyleSheet* pStyle = 0,
@@ -149,12 +146,8 @@
return pFmt;
}
-
-/*--------------------------------------------------------------------
- Description: find/create ParaFormats
- fill Style
- --------------------------------------------------------------------*/
-
+// find/create ParaFormats
+// fill Style
static SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc,
const String& rName,
SwDocStyleSheet* pStyle = 0,
@@ -192,12 +185,7 @@
return pColl;
}
-
-/*--------------------------------------------------------------------
- Description: Border formats
- --------------------------------------------------------------------*/
-
-
+// Border formats
static SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc,
const String& rName,
SwDocStyleSheet* pStyle = 0,
@@ -231,11 +219,7 @@
return pFmt;
}
-/*--------------------------------------------------------------------
- Description: Page descriptors
- --------------------------------------------------------------------*/
-
-
+// Page descriptors
static const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc,
const String& rName,
SwDocStyleSheet* pStyle = 0,
@@ -344,12 +328,7 @@
return false;
}
-
-/*--------------------------------------------------------------------
- Description: Add Strings to the list of templates
- --------------------------------------------------------------------*/
-
-
+// Add Strings to the list of templates
void SwPoolFmtList::Append( char cChar, const String& rStr )
{
String aStr = rtl::OUString(cChar);
@@ -360,21 +339,14 @@
push_back(aStr);
}
-/*--------------------------------------------------------------------
- Description: Erase the list completely
- --------------------------------------------------------------------*/
-
-
+// Erase the list completely
void SwPoolFmtList::Erase()
{
clear();
}
-/*--------------------------------------------------------------------
- Description: UI-sided implementation of StyleSheets
- uses the Core-Engine
- --------------------------------------------------------------------*/
-
+// UI-sided implementation of StyleSheets
+// uses the Core-Engine
SwDocStyleSheet::SwDocStyleSheet( SwDoc& rDocument,
const String& rName,
SwDocStyleSheetPool* _rPool,
@@ -433,11 +405,7 @@
{
}
-/*--------------------------------------------------------------------
- Description: Reset
- --------------------------------------------------------------------*/
-
-
+// Reset
void SwDocStyleSheet::Reset()
{
aName.Erase();
@@ -446,10 +414,7 @@
SetPhysical(sal_False);
}
-/*--------------------------------------------------------------------
- Description: virtual methods
- --------------------------------------------------------------------*/
-
+// virtual methods
void SwDocStyleSheet::SetHidden( sal_Bool bValue )
{
bool bChg = false;
@@ -608,11 +573,7 @@
return aParent;
}
-/*--------------------------------------------------------------------
- Description: Follower
- --------------------------------------------------------------------*/
-
-
+// Follower
const String& SwDocStyleSheet::GetFollow() const
{
if( !bPhysical )
@@ -623,11 +584,7 @@
return aFollow;
}
-/*--------------------------------------------------------------------
- Description: What Linkage is possible
- --------------------------------------------------------------------*/
-
-
+// What Linkage is possible
bool SwDocStyleSheet::HasFollowSupport() const
{
switch(nFamily)
@@ -643,11 +600,7 @@
return false;
}
-/*--------------------------------------------------------------------
- Description: Parent ?
- --------------------------------------------------------------------*/
-
-
+// Parent ?
bool SwDocStyleSheet::HasParentSupport() const
{
bool bRet = false;
@@ -675,9 +628,7 @@
return bRet;
}
-/*--------------------------------------------------------------------
- Description: determine textual description
- --------------------------------------------------------------------*/
+// determine textual description
String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
{
IntlWrapper aIntlWrapper( SvtSysLocale().GetLanguageTag() );
@@ -849,11 +800,7 @@
return GetDescription(SFX_MAPUNIT_CM);
}
-/*--------------------------------------------------------------------
- Description: Set names
- --------------------------------------------------------------------*/
-
-
+// Set names
bool SwDocStyleSheet::SetName( const String& rStr)
{
if( !rStr.Len() )
@@ -974,11 +921,7 @@
return true;
}
-/*--------------------------------------------------------------------
- Description: hierarchy of deduction
- --------------------------------------------------------------------*/
-
-
+// hierarchy of deduction
bool SwDocStyleSheet::SetParent( const String& rStr)
{
SwFmt* pFmt = 0, *pParent = 0;
@@ -1029,11 +972,7 @@
return bRet;
}
-/*--------------------------------------------------------------------
- Description: Set Follower
- --------------------------------------------------------------------*/
-
-
+// Set Follower
bool SwDocStyleSheet::SetFollow( const String& rStr)
{
if( rStr.Len() && !SfxStyleSheetBase::SetFollow( rStr ))
@@ -1086,10 +1025,7 @@
return true;
}
-/*--------------------------------------------------------------------
- Description: extract ItemSet to Name and Family, Mask
- --------------------------------------------------------------------*/
-
+// extract ItemSet to Name and Family, Mask
SfxItemSet& SwDocStyleSheet::GetItemSet()
{
if(!bPhysical)
@@ -1602,10 +1538,7 @@
}
}
-/*--------------------------------------------------------------------
- Description: determine the format
- --------------------------------------------------------------------*/
-
+// determine the format
sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
{
sal_Bool bRet = sal_False;
@@ -1791,11 +1724,7 @@
return bRet;
}
-/*--------------------------------------------------------------------
- Description: Create new format in Core
- --------------------------------------------------------------------*/
-
-
+// Create new format in Core
void SwDocStyleSheet::Create()
{
switch(nFamily)
@@ -1914,11 +1843,7 @@
aName.Erase( 0, 1 );
}
-/*--------------------------------------------------------------------
- Description: Is the format physically present yet
- --------------------------------------------------------------------*/
-
-
+// Is the format physically present yet
void SwDocStyleSheet::SetPhysical(sal_Bool bPhys)
{
bPhysical = bPhys;
@@ -2101,10 +2026,7 @@
}
}
-/*--------------------------------------------------------------------
- Description: methods for DocStyleSheetPool
- --------------------------------------------------------------------*/
-
+// methods for DocStyleSheetPool
SwDocStyleSheetPool::SwDocStyleSheetPool( SwDoc& rDocument, sal_Bool bOrg )
: SfxStyleSheetBasePool( rDocument.GetAttrPool() )
, mxStyleSheet( new SwDocStyleSheet( rDocument, aEmptyStr, this, SFX_STYLE_FAMILY_CHAR, 0 ) )
@@ -2323,7 +2245,6 @@
if( bBroadcast )
Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *pStyle ) );
}
-
bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
@@ -2563,7 +2484,6 @@
}
// PoolFormate
- //
if( bAll )
{
if( !rDoc.get(IDocumentSettingAccess::HTML_MODE) )
@@ -2778,7 +2698,6 @@
}
// PoolFormate
- //
if ( bAll )
AppendStyleList(SwStyleNameMapper::GetFrmFmtUINameArray(),
bIsSearchUsed, bSearchHidden, bOnlyHidden,
nsSwGetPoolIdFromName::GET_POOLID_FRMFMT, cFRAME);
@@ -2965,6 +2884,5 @@
}
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index cb22c81..b2a2433 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -24,10 +24,6 @@
#include "swerror.h"
#include "comcore.hrc" // MS: Why are there resources at the Core-Side now
-/*--------------------------------------------------------------------
- Description: Strings
- --------------------------------------------------------------------*/
-
String STR_COMCORE_READERROR
{
Text [ en-US ] = "Read-Error" ;
@@ -36,9 +32,8 @@
{
Text [ en-US ] = "Graphic cannot be displayed." ;
};
-/*--------------------------------------------------------------------
- Description: Boxes
- --------------------------------------------------------------------*/
+
+
InfoBox ERR_CLPBRD_WRITE
{
Message [ en-US ] = "Error while copying to the clipboard." ;
@@ -145,7 +140,8 @@
{
Text [ en-US ] = "The structure of a linked table cannot be modified." ;
};
- // -------------------- Warnings -----------------------------------
+
+
String WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_NO_DRAWINGS )
{
Text [ en-US ] = "No drawings could be read." ;
diff --git a/sw/source/ui/app/mainwn.cxx b/sw/source/ui/app/mainwn.cxx
index 2a5385b..304862f 100644
--- a/sw/source/ui/app/mainwn.cxx
+++ b/sw/source/ui/app/mainwn.cxx
@@ -143,5 +143,4 @@
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index fba5f71..024aafd 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -139,11 +139,7 @@
return pNView;
}
-/*------------------------------------------------------------------------
- Description: New Master for the settings is set; this affects the
- current view and all following.
-------------------------------------------------------------------------*/
-
+// New Master for the settings is set; this affects the current view and all following.
void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
sal_uInt16 nDest )
{
@@ -283,10 +279,7 @@
}
}
-/*-------------------------------------------------
-set the usrpref 's char unit attribute and set ruler
-'s unit as char if the "apply char unit" is checked
---------------------------------------------------*/
+//set the usrpref 's char unit attribute and set rulers unit as char if the "apply char unit" is
checked
void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb)
{
SwMasterUsrPref* pPref;
@@ -521,10 +514,7 @@
lcl_FillAuthorAttr(nAuthor, rSet, pModuleConfig->GetDeletedAuthorAttr());
}
-/*--------------------------------------------------------------------
- Description: For future extension:
- --------------------------------------------------------------------*/
-
+// For future extension:
void SwModule::GetFormatAuthorAttr( sal_uInt16 nAuthor, SfxItemSet &rSet )
{
lcl_FillAuthorAttr( nAuthor, rSet, pModuleConfig->GetFormatAuthorAttr() );
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 8d2c626..074d23c 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -431,5 +431,4 @@
SfxItemPool::Free(pAttrPool);
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/app/swwait.cxx b/sw/source/ui/app/swwait.cxx
index f938ae8..377353c 100644
--- a/sw/source/ui/app/swwait.cxx
+++ b/sw/source/ui/app/swwait.cxx
@@ -60,5 +60,4 @@
rDoc.LeaveWait( bLock );
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index dac5f79..39d3ad2 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -73,9 +73,8 @@
typedef boost::ptr_vector<TextBlockInfo_Impl> TextBlockInfoArr;
SV_IMPL_REF( SwDocShell )
-/*------------------------------------------------------------------------
- Description: Dialog for edit templates
-------------------------------------------------------------------------*/
+
+// Dialog for edit templates
void SwGlossaryHdl::GlossaryDlg()
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -102,10 +101,8 @@
rStatGlossaries.EditGroupDoc( sName, sShortName );
}
-/*------------------------------------------------------------------------
- Description: set the default group; if called from the dialog
- the group is created temporarily for faster access
-------------------------------------------------------------------------*/
+// set the default group; if called from the dialog
+// the group is created temporarily for faster access
void SwGlossaryHdl::SetCurGroup(const String &rGrp, sal_Bool bApi, sal_Bool bAlwaysCreateNew )
{
String sGroup(rGrp);
@@ -244,9 +241,7 @@
return !nRet;
}
-/*------------------------------------------------------------------------
- Description: delete a autotext-file-group
-------------------------------------------------------------------------*/
+// delete a autotext-file-group
sal_Bool SwGlossaryHdl::DelGroup(const String &rGrpName)
{
String sGroup(rGrpName);
@@ -265,9 +260,8 @@
return sal_False;
}
-/*------------------------------------------------------------------------
- Description: ask for number of autotexts
-------------------------------------------------------------------------*/
+
+// ask for number of autotexts
sal_uInt16 SwGlossaryHdl::GetGlossaryCnt()
{
return pCurGrp ? pCurGrp->GetCount() : 0;
@@ -285,9 +279,7 @@
return pCurGrp->GetShortName( nId );
}
-/*------------------------------------------------------------------------
- Description: ask for short name
-------------------------------------------------------------------------*/
+// ask for short name
String SwGlossaryHdl::GetGlossaryShortName(const String &rName)
{
String sReturn;
@@ -304,9 +296,7 @@
return sReturn;
}
-/*------------------------------------------------------------------------
- Description: short name for autotext already used?
-------------------------------------------------------------------------*/
+// short name for autotext already used?
sal_Bool SwGlossaryHdl::HasShortName(const String& rShortName) const
{
SwTextBlocks *pBlock = pCurGrp ? pCurGrp
@@ -322,9 +312,7 @@
return sal_True;
}
-/*------------------------------------------------------------------------
- Desription: Create autotext
-------------------------------------------------------------------------*/
+// Create autotext
sal_Bool SwGlossaryHdl::NewGlossary(const String& rName, const String& rShortName,
sal_Bool bCreateGroup, sal_Bool bNoAttr)
{
@@ -357,9 +345,8 @@
rStatGlossaries.PutGroupDoc( pTmp );
return sal_Bool( nSuccess != (sal_uInt16) -1 );
}
-/*------------------------------------------------------------------------
- Description: Delete a autotext
-------------------------------------------------------------------------*/
+
+// Delete a autotext
sal_Bool SwGlossaryHdl::DelGlossary(const String &rShortName)
{
SwTextBlocks *pGlossary = pCurGrp ? pCurGrp
@@ -376,9 +363,7 @@
return sal_True;
}
-/*------------------------------------------------------------------------
- Description: expand short name
-------------------------------------------------------------------------*/
+// expand short name
sal_Bool SwGlossaryHdl::ExpandGlossary()
{
OSL_ENSURE(pWrtShell->CanInsert(), "illegal");
@@ -525,10 +510,10 @@
SvxMacro aEndMacro(aEmptyStr, aEmptyStr, STARBASIC);
GetMacros( aShortName, aStartMacro, aEndMacro, pGlossary );
- // StartAction must not be before HasSelection and DelRight,
- // otherwise the possible Shell change gets delayed and
- // API-programs would hang.
- // Moreover the event macro must also not be called in an action
+ // StartAction must not be before HasSelection and DelRight,
+ // otherwise the possible Shell change gets delayed and
+ // API-programs would hang.
+ // Moreover the event macro must also not be called in an action
pWrtShell->StartUndo(UNDO_INSGLOSSARY);
if( aStartMacro.HasMacro() )
pWrtShell->ExecMacro( aStartMacro );
@@ -555,9 +540,7 @@
return sal_True;
}
-/*------------------------------------------------------------------------
- Description: add autotext
-------------------------------------------------------------------------*/
+// add autotext
bool SwGlossaryHdl::InsertGlossary(const String &rName)
{
OSL_ENSURE(pWrtShell->CanInsert(), "illegal");
@@ -601,9 +584,7 @@
return true;
}
-/*------------------------------------------------------------------------
- Description: set / ask for macro
-------------------------------------------------------------------------*/
+// set / ask for macro
void SwGlossaryHdl::SetMacros(const String& rShortName,
const SvxMacro* pStart,
const SvxMacro* pEnd,
@@ -653,10 +634,7 @@
rStatGlossaries.PutGroupDoc( pGlos );
}
-
-/*------------------------------------------------------------------------
- Description: ctor, dtor
-------------------------------------------------------------------------*/
+// ctor, dtor
SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrm, SwWrtShell *pSh)
: rStatGlossaries( *::GetGlossaries() ),
aCurGrp( rStatGlossaries.GetDefName() ),
@@ -672,9 +650,7 @@
rStatGlossaries.PutGroupDoc( pCurGrp );
}
-/*------------------------------------------------------------------------
- Description: rename an autotext
-------------------------------------------------------------------------*/
+// rename an autotext
sal_Bool SwGlossaryHdl::Rename(const String& rOldShort, const String& rNewShortName,
const String& rNewName )
{
@@ -734,9 +710,7 @@
return bRet;
}
-/*--------------------------------------------------
- find group without path index
---------------------------------------------------*/
+// find group without path index
sal_Bool SwGlossaryHdl::FindGroupName(String & rGroup)
{
return rStatGlossaries.FindGroupName(rGroup);
diff --git a/sw/source/ui/dochdl/selglos.cxx b/sw/source/ui/dochdl/selglos.cxx
index 80099f1..b87ce8d 100644
--- a/sw/source/ui/dochdl/selglos.cxx
+++ b/sw/source/ui/dochdl/selglos.cxx
@@ -46,9 +46,7 @@
aGlosBox.SetDoubleClickHdl(LINK(this, SwSelGlossaryDlg, DoubleClickHdl));
}
-/*--------------------------------------------------
- overload dtor
---------------------------------------------------*/
+// overload dtor
SwSelGlossaryDlg::~SwSelGlossaryDlg() {}
IMPL_LINK(SwSelGlossaryDlg, DoubleClickHdl, ListBox*, /*pBox*/)
diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx
index 2c0b4d4..58698e8 100644
--- a/sw/source/ui/dochdl/swdtflvr.cxx
+++ b/sw/source/ui/dochdl/swdtflvr.cxx
@@ -1530,7 +1530,7 @@
case OBJCNT_URLBUTTON: nRet = EXCHG_DEST_DOC_URLBUTTON; break;
case OBJCNT_GROUPOBJ: nRet = EXCHG_DEST_DOC_GROUPOBJ; break;
-// what do we do at multiple selections???
+ // what do we do at multiple selections???
default:
{
if( rSh.GetView().GetDocShell()->ISA(SwWebDocShell) )
@@ -1708,7 +1708,7 @@
}
else
{
- // temporary storage until the object is inserted
+ // temporary storage until the object is inserted
uno::Reference< embed::XStorage > xTmpStor;
uno::Reference < embed::XEmbeddedObject > xObj;
::rtl::OUString aName;
@@ -3089,9 +3089,9 @@
bSmart = 0 != (TRNSFR_DOCUMENT_WORD & eBufferType);
if( bSmart )
{
-// Why not for other Scripts? If TRNSFR_DOCUMENT_WORD is set, we have a word
-// in the buffer, word in this context means 'something with spaces at beginning
-// and end'. In this case we definitely want these spaces to be inserted here.
+ // Why not for other Scripts? If TRNSFR_DOCUMENT_WORD is set, we have a word
+ // in the buffer, word in this context means 'something with spaces at beginning
+ // and end'. In this case we definitely want these spaces to be inserted here.
bInWrd = rShell.IsInWrd();
bEndWrd = rShell.IsEndWrd();
bSmart = bInWrd || bEndWrd;
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.cxx b/sw/source/ui/docvw/AnchorOverlayObject.cxx
index ab47abb..b3ee64a 100644
--- a/sw/source/ui/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/ui/docvw/AnchorOverlayObject.cxx
@@ -34,9 +34,7 @@
namespace sw { namespace sidebarwindows {
-//////////////////////////////////////////////////////////////////////////////
// helper class: Primitive for discrete visualisation
-
class AnchorPrimitive : public drawinglayer::primitive2d::DiscreteMetricDependentPrimitive2D
{
private:
@@ -232,7 +230,6 @@
ImplPrimitrive2DIDBlock(AnchorPrimitive, PRIMITIVE2D_ID_SWSIDEBARANCHORPRIMITIVE)
-/****** AnchorOverlayObject ***********************************************************/
/*static*/ AnchorOverlayObject* AnchorOverlayObject::CreateAnchorOverlayObject(
SwView& rDocView,
const SwRect& aAnchorRect,
diff --git a/sw/source/ui/docvw/ShadowOverlayObject.cxx b/sw/source/ui/docvw/ShadowOverlayObject.cxx
index e39622b..437507d 100644
--- a/sw/source/ui/docvw/ShadowOverlayObject.cxx
+++ b/sw/source/ui/docvw/ShadowOverlayObject.cxx
@@ -30,14 +30,12 @@
namespace sw { namespace sidebarwindows {
-//////////////////////////////////////////////////////////////////////////////
// helper SwPostItShadowPrimitive
//
// Used to allow view-dependent primitive definition. For that purpose, the
// initially created primitive (this one) always has to be view-independent,
// but the decomposition is made view-dependent. Very simple primitive which
// just remembers the discrete data and applies it at decomposition time.
-
class ShadowPrimitive : public drawinglayer::primitive2d::DiscreteMetricDependentPrimitive2D
{
private:
@@ -167,7 +165,6 @@
ImplPrimitrive2DIDBlock(ShadowPrimitive, PRIMITIVE2D_ID_SWSIDEBARSHADOWPRIMITIVE)
-/****** ShadowOverlayObject **************************************************/
/* static */ ShadowOverlayObject* ShadowOverlayObject::CreateShadowOverlayObject( SwView& rDocView
)
{
ShadowOverlayObject* pShadowOverlayObject( 0 );
diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
index 52d3047..7fc6e3b 100644
--- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
+++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx
@@ -33,10 +33,9 @@
namespace sw { namespace sidebarwindows {
-// =============================================================================
+
// declaration and implementation of <SvxEditSource>
// for <::accessibiliy::AccessibleTextHelper> instance
-// =============================================================================
class SidebarTextEditSource : public SvxEditSource,
public SfxBroadcaster
{
@@ -126,10 +125,7 @@
return 0;
}
-
-// =============================================================================
// declaration and implementation of accessible context for <SidebarTxtControl> instance
-// =============================================================================
class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent
{
public:
@@ -272,9 +268,7 @@
VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent );
}
-// =============================================================================
// implementaion of accessible for <SidebarTxtControl> instance
-// =============================================================================
SidebarTxtControlAccessible::SidebarTxtControlAccessible( SidebarTxtControl& rSidebarTxtControl )
: VCLXWindow()
, mrSidebarTxtControl( rSidebarTxtControl )
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index 67fb1f6..9518008 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -80,7 +80,6 @@
#define EMPTYSTRING rtl::OUString()
-/************** SwSidebarWin************************************/
SwSidebarWin::SwSidebarWin( SwEditWin& rEditWin,
WinBits nBits,
SwPostItMgr& aMgr,
diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/ui/docvw/SidebarWinAcc.cxx
index a542864..283de1c 100644
--- a/sw/source/ui/docvw/SidebarWinAcc.cxx
+++ b/sw/source/ui/docvw/SidebarWinAcc.cxx
@@ -28,9 +28,7 @@
namespace sw { namespace sidebarwindows {
-// =============================================================================
// declaration and implementation of accessible context for <SidebarWinAccessible> instance
-// =============================================================================
class SidebarWinAccessibleContext : public VCLXAccessibleComponent
{
public:
@@ -94,9 +92,7 @@
::osl::Mutex maMutex;
};
-// =============================================================================
// implementaion of accessible for <SwSidebarWin> instance
-// =============================================================================
SidebarWinAccessible::SidebarWinAccessible( SwSidebarWin& rSidebarWin,
ViewShell& rViewShell,
const SwSidebarItem& rSidebarItem )
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index e0fda04..fbe9ff0 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -217,7 +217,6 @@
}
}
-
// There's a special treatment for file lists with a single
// element, that depends on the actual content of the
// Transferable to be accessible. Since the transferable
@@ -497,7 +496,5 @@
}
return 0;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index eff3217..63e46bc 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -148,7 +148,6 @@
/**
* Globals
*/
-
static bool bInputLanguageSwitched = false;
extern bool bNoInterrupt; // in mainwn.cxx
@@ -285,7 +284,6 @@
/**
* Avoid minimal movement shiver
*/
-
#define HIT_PIX 2 /* hit tolerance in pixel */
#define MIN_MOVE 4
@@ -659,7 +657,6 @@
/**
* Insert mode for frames
*/
-
void SwEditWin::InsFrm(sal_uInt16 nCols)
{
StdDrawMode( OBJ_NONE, sal_False );
@@ -5606,8 +5603,6 @@
return xAcc;
}
-
-//-------------------------------------------------------------
void QuickHelpData::Move( QuickHelpData& rCpy )
{
diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx
index bc329b3..555d810 100644
--- a/sw/source/ui/docvw/edtwin2.cxx
+++ b/sw/source/ui/docvw/edtwin2.cxx
@@ -69,9 +69,6 @@
#include <IDocumentMarkAccess.hxx>
#include <ndtxt.hxx>
-/*--------------------------------------------------------------------
- Description: KeyEvents
- --------------------------------------------------------------------*/
static void lcl_GetRedlineHelp( const SwRedline& rRedl, String& rTxt, sal_Bool bBalloon )
{
sal_uInt16 nResId = 0;
@@ -528,6 +525,5 @@
if( bPaintShadowCrsr )
m_pShadCrsr->Paint();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/docvw/edtwin3.cxx b/sw/source/ui/docvw/edtwin3.cxx
index b7412a2..ca77b50 100644
--- a/sw/source/ui/docvw/edtwin3.cxx
+++ b/sw/source/ui/docvw/edtwin3.cxx
@@ -36,12 +36,8 @@
#include <editeng/frmdiritem.hxx>
-/*--------------------------------------------------------------------
- Description: Core-Notify
- --------------------------------------------------------------------*/
-
-
+// Core-Notify
void ScrollMDI( ViewShell* pVwSh, const SwRect &rRect,
sal_uInt16 nRangeX, sal_uInt16 nRangeY)
{
@@ -50,12 +46,7 @@
((SwView *)pSfxVwSh)->Scroll( rRect.SVRect(), nRangeX, nRangeY );
}
-/*--------------------------------------------------------------------
- Description: Docmdi - movable
- --------------------------------------------------------------------*/
-
-
-
+// Docmdi - movable
sal_Bool IsScrollMDI( ViewShell* pVwSh, const SwRect &rRect )
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
@@ -64,12 +55,7 @@
return sal_False;
}
-/*--------------------------------------------------------------------
- Description: Notify for size change
- --------------------------------------------------------------------*/
-
-
-
+// Notify for size change
void SizeNotify(ViewShell* pVwSh, const Size &rSize)
{
SfxViewShell *pSfxVwSh = pVwSh->GetSfxViewShell();
@@ -82,10 +68,7 @@
}
}
-/*--------------------------------------------------------------------
- Description: Notify for page number update
- --------------------------------------------------------------------*/
-
+// Notify for page number update
void PageNumNotify( ViewShell* pVwSh, sal_uInt16 nPhyNum, sal_uInt16 nVirtNum,
const rtl::OUString& rPgStr)
{
@@ -95,22 +78,13 @@
((SwView *)pSfxVwSh)->UpdatePageNums(nPhyNum, nVirtNum, rPgStr);
}
-/******************************************************************************
- * Method : void FrameNotify( DocMDIBase *pWin, FlyMode eMode )
- * Description:
- ******************************************************************************/
-
-
-
void FrameNotify( ViewShell* pVwSh, FlyMode eMode )
{
if ( pVwSh->ISA(SwCrsrShell) )
SwBaseShell::SetFrmMode( eMode, (SwWrtShell*)pVwSh );
}
-/*--------------------------------------------------------------------
- Description: Notify for page number update
- --------------------------------------------------------------------*/
+// Notify for page number update
sal_Bool SwEditWin::RulerColumnDrag( const MouseEvent& rMEvt, sal_Bool bVerticalMode)
{
SvxRuler& rRuler = bVerticalMode ? m_rView.GetVLineal() : m_rView.GetHLineal();
diff --git a/sw/source/ui/docvw/romenu.cxx b/sw/source/ui/docvw/romenu.cxx
index 7b89ff5..4adf975 100644
--- a/sw/source/ui/docvw/romenu.cxx
+++ b/sw/source/ui/docvw/romenu.cxx
@@ -233,9 +233,7 @@
Execute(pWin, nId);
}
-/*-------------------------------------------------------------------------
- execute the resulting ID only - necessary to support XContextMenuInterception
- -----------------------------------------------------------------------*/
+// execute the resulting ID only - necessary to support XContextMenuInterception
void SwReadOnlyPopup::Execute( Window* pWin, sal_uInt16 nId )
{
SwWrtShell &rSh = rView.GetWrtShell();
@@ -364,7 +362,5 @@
}
return GraphicHelper::ExportGraphic( aGraphic, sGrfName );
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx
index 9bf24bb..2ed024d 100644
--- a/sw/source/ui/docvw/srcedtw.cxx
+++ b/sw/source/ui/docvw/srcedtw.cxx
@@ -796,7 +796,6 @@
// don#t fill - all LANGUAGE_SYSTEM means unicode font has to be used
break;
-
case RTL_TEXTENCODING_ISO_8859_3:
case RTL_TEXTENCODING_ISO_8859_1 :
case RTL_TEXTENCODING_MS_1252 :
--
To view, visit https://gerrit.libreoffice.org/2789
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib3e51969b2d2624e69a2270c5446b7ac1095a2b5
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Joren De Cuyper <joren.libreoffice@telenet.be>
Context
- [PATCH] Comment cleanup and several indentation fixes · Joren De Cuyper (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.