Kaydet (Commit) 2ef9df8a authored tarafından Alexander Wilms's avatar Alexander Wilms Kaydeden (comit) Caolán McNamara

Remove visual noise from sd

Change-Id: I0957cabd66ddc4e25c7e6ff54ec2a555eda0792c
Reviewed-on: https://gerrit.libreoffice.org/8306Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 7e92d988
......@@ -39,7 +39,7 @@ class SdrPathObj;
namespace sd {
// --------------------------------------------------------------------
enum EValue { VALUE_FROM, VALUE_TO, VALUE_BY, VALUE_FIRST, VALUE_LAST };
......
......@@ -60,7 +60,6 @@ namespace sd
class Outliner;
}
class Timer;
class SfxObjectShell;
class SdPage;
......@@ -133,11 +132,7 @@ namespace sd
};
}
// ------------------
// - SdDrawDocument -
// ------------------
// SdDrawDocument
class SdDrawDocument : public FmFormModel
{
private:
......
......@@ -90,15 +90,15 @@
#define STR_POOLSHEET_HEADLINE2 RID_GLOB_START+67
#define STR_POOLSHEET_MEASURE RID_GLOB_START+68
#define STR_POOLSHEET_ARROW RID_GLOB_START+69
//
#define STR_POOLSHEET_BANDED_CELL RID_GLOB_START+70
#define STR_POOLSHEET_HEADER RID_GLOB_START+71
#define STR_POOLSHEET_TOTAL RID_GLOB_START+72
#define STR_POOLSHEET_FIRST_COLUMN RID_GLOB_START+73
#define STR_POOLSHEET_LAST_COLUMN RID_GLOB_START+74
//
#define STR_POOLSHEET_OBJNOLINENOFILL RID_GLOB_START+75
//
#define STR_PSEUDOSHEET_TITLE RID_GLOB_START+80
#define STR_PSEUDOSHEET_OUTLINE RID_GLOB_START+81
#define STR_PSEUDOSHEET_BACKGROUNDOBJECTS RID_GLOB_START+82
......
......@@ -167,7 +167,7 @@ public:
virtual void Cancel() = 0;
};
//---------------------------------------------------------
class SdAbstractDialogFactory
{
public:
......
......@@ -31,13 +31,7 @@
#include "fadedef.h"
#include "diadef.h"
//------------------------------------------------------------------
//==================================================================
// layer attributes
//==================================================================
// layer attributes
class SdAttrLayerName : public SfxStringItem
{
public:
......@@ -47,8 +41,6 @@ public:
SfxStringItem( ATTR_LAYER_NAME, aStr ) {}
};
//------------------------------------------------------------------
class SdAttrLayerTitle : public SfxStringItem
{
public:
......@@ -56,8 +48,6 @@ public:
SdAttrLayerTitle( const OUString& aStr ) : SfxStringItem( ATTR_LAYER_TITLE, aStr ) {}
};
//------------------------------------------------------------------
class SdAttrLayerDesc : public SfxStringItem
{
public:
......@@ -65,7 +55,6 @@ public:
SdAttrLayerDesc( const OUString& aStr ) : SfxStringItem( ATTR_LAYER_DESC, aStr ) {}
};
//------------------------------------------------------------------
class SdAttrLayerVisible : public SfxBoolItem
{
......@@ -74,7 +63,6 @@ public:
SfxBoolItem( ATTR_LAYER_VISIBLE, bValue ) {}
};
//------------------------------------------------------------------
class SdAttrLayerPrintable : public SfxBoolItem
{
......@@ -83,7 +71,6 @@ public:
SfxBoolItem( ATTR_LAYER_PRINTABLE, bValue ) {}
};
//------------------------------------------------------------------
class SdAttrLayerLocked : public SfxBoolItem
{
......@@ -92,7 +79,6 @@ public:
SfxBoolItem( ATTR_LAYER_LOCKED, bValue ) {}
};
//------------------------------------------------------------------
class SdAttrLayerThisPage : public SfxBoolItem
{
......@@ -101,7 +87,6 @@ public:
SfxBoolItem( ATTR_LAYER_THISPAGE, bValue ) {}
};
//------------------------------------------------------------------
class DiaEffectItem : public SfxEnumItem
{
......@@ -117,7 +102,6 @@ public:
{ return (::com::sun::star::presentation::FadeEffect) SfxEnumItem::GetValue(); }
};
//------------------------------------------------------------------
class DiaSpeedItem : public SfxEnumItem
{
......@@ -133,7 +117,6 @@ public:
{ return (FadeSpeed) SfxEnumItem::GetValue(); }
};
//------------------------------------------------------------------
class DiaAutoItem : public SfxEnumItem
{
......@@ -148,7 +131,6 @@ public:
PresChange GetValue() const { return (PresChange) SfxEnumItem::GetValue(); }
};
//------------------------------------------------------------------
class DiaTimeItem : public SfxUInt32Item
{
......@@ -162,5 +144,4 @@ public:
#endif // INCLUDED_SD_INC_SDATTR_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -22,10 +22,7 @@
#include "sdfilter.hxx"
// ---------------
// - SdCGMFilter -
// ---------------
// SdCGMFilter
class SdCGMFilter : public SdFilter
{
public:
......
......@@ -26,10 +26,7 @@
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
// ------------
// - SdFilter -
// ------------
// SdFilter
class SfxMedium;
namespace sd {
class DrawDocShell;
......
......@@ -25,10 +25,7 @@
#include <tools/errinf.hxx>
#include "sdfilter.hxx"
// ---------------
// - SdCGMFilter -
// ---------------
// SdCGMFilter
class SdGRFFilter : public SdFilter
{
public:
......
......@@ -22,10 +22,8 @@
#include "sdfilter.hxx"
// ----------------
// - SdHTMLFilter -
// ----------------
// SdHTMLFilter
class SdHTMLFilter
: public SdFilter
{
......
......@@ -22,7 +22,6 @@
#include <tools/stream.hxx>
//////////////////////////////////////////////////////////////////////////////
class SvStream;
class old_SdrDownCompat
......@@ -44,7 +43,7 @@ public:
void OpenSubRecord();
void CloseSubRecord();
};
//////////////////////////////////////////////////////////////////////////////
#include "sddllapi.h"
#define SDIOCOMPAT_VERSIONDONTKNOW (sal_uInt16)0xffff
......@@ -65,5 +64,4 @@ public:
#endif // INCLUDED_SD_INC_SDIOCMPT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -23,9 +23,7 @@
#include <tools/link.hxx>
//-----------------------
// class SdObjectFactory
//-----------------------
class SdrObjFactory;
class SdObjectFactory
......
......@@ -22,10 +22,7 @@
#include "sdfilter.hxx"
// ---------------
// - SdPPTFilter -
// ---------------
// SdPPTFilter
class SdPPTFilter : public SdFilter
{
public:
......
......@@ -22,10 +22,7 @@
#include <tools/errcode.hxx>
#include "sdfilter.hxx"
// ---------------
// - SdXMLFilter -
// ---------------
// SdXMLFilter
enum SdXMLFilterMode
{
SDXMLMODE_Normal, ///< standard load and save of the complete document
......
......@@ -30,7 +30,6 @@ class SdPage;
namespace sd
{
///////////////////////////////////////////////////////////////////////
class UndoRemovePresObjectImpl
{
......@@ -47,8 +46,6 @@ private:
SfxUndoAction* mpUndoPresObj;
};
///////////////////////////////////////////////////////////////////////
class UndoRemoveObject : public SdrUndoRemoveObj, public UndoRemovePresObjectImpl
{
public:
......@@ -61,8 +58,6 @@ private:
SdrObjectWeakRef mxSdrObject;
};
///////////////////////////////////////////////////////////////////////
class UndoDeleteObject : public SdrUndoDelObj, public UndoRemovePresObjectImpl
{
public:
......@@ -75,7 +70,6 @@ private:
SdrObjectWeakRef mxSdrObject;
};
///////////////////////////////////////////////////////////////////////
class UndoReplaceObject : public SdrUndoReplaceObj, public UndoRemovePresObjectImpl
{
......@@ -89,7 +83,6 @@ private:
SdrObjectWeakRef mxSdrObject;
};
///////////////////////////////////////////////////////////////////////
class UndoObjectSetText : public SdrUndoObjSetText
{
......@@ -106,7 +99,7 @@ private:
SdrObjectWeakRef mxSdrObject;
};
//////////////////////////////////////////////////////////////////////////////
// Undo for SdrObject::SetUserCall()
class UndoObjectUserCall : public SdrUndoObj
......@@ -123,7 +116,7 @@ protected:
SdrObjectWeakRef mxSdrObject;
};
//////////////////////////////////////////////////////////////////////////////
// Undo for SdPage::InsertPresObj() and SdPage::RemovePresObj()
class UndoObjectPresentationKind : public SdrUndoObj
......@@ -141,7 +134,7 @@ protected:
SdrObjectWeakRef mxSdrObject;
};
//////////////////////////////////////////////////////////////////////////////
// Restores correct position and size for presentation shapes with user call
// on undo
......@@ -157,7 +150,6 @@ protected:
SdrPageWeakRef mxPage;
};
//////////////////////////////////////////////////////////////////////////////
class UndoGeoObject : public SdrUndoGeoObj
{
......@@ -172,7 +164,6 @@ protected:
SdrObjectWeakRef mxSdrObject;
};
//////////////////////////////////////////////////////////////////////////////
class UndoAttrObject : public SdrUndoAttrObj
{
......
......@@ -1322,7 +1322,7 @@ interface DrawView
StateMethod = GetMenuState ;
Export = FALSE ;
]
//////////////////////////////////////////////////////////////////////
// Begin FormSlots
SID_FM_CREATE_CONTROL
[
......@@ -1339,7 +1339,7 @@ interface DrawView
StateMethod = GetCtrlState ;
]
// End FormSlots
//////////////////////////////////////////////////////////////////////
SID_ATTR_FILL_STYLE // ole : no, status : ?
[
ExecMethod = FuTemporary ;
......@@ -2382,7 +2382,7 @@ interface DrawView
StateMethod = GetMenuState ;
]
SID_FORMATPAINTBRUSH //
SID_FORMATPAINTBRUSH
[
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
......
......@@ -79,7 +79,6 @@ shell GraphicObjectBar
StateMethod = GetFilterState;
]
//------------------------------------------------------------------------------
SID_ATTR_GRAF_MODE
[
......
This diff is collapsed.
......@@ -24,7 +24,7 @@
#include <tools/debug.hxx>
#include <svx/svdmodel.hxx>
//////////////////////////////////////////////////////////////////////////////
void ImpPageListWatcher::ImpRecreateSortedPageListOnDemand()
{
......@@ -186,7 +186,7 @@ sal_uInt32 ImpPageListWatcher::GetVisibleSdPageCount()
return nVisiblePageCount;
}
//////////////////////////////////////////////////////////////////////////////
sal_uInt32 ImpDrawPageListWatcher::ImpGetPageCount() const
{
......@@ -207,7 +207,7 @@ ImpDrawPageListWatcher::~ImpDrawPageListWatcher()
{
}
//////////////////////////////////////////////////////////////////////////////
sal_uInt32 ImpMasterPageListWatcher::ImpGetPageCount() const
{
......
......@@ -64,8 +64,6 @@ public:
sal_uInt32 GetVisibleSdPageCount();
};
//////////////////////////////////////////////////////////////////////////////
class ImpDrawPageListWatcher : public ImpPageListWatcher
{
protected:
......@@ -77,8 +75,6 @@ public:
virtual ~ImpDrawPageListWatcher();
};
//////////////////////////////////////////////////////////////////////////////
class ImpMasterPageListWatcher : public ImpPageListWatcher
{
protected:
......
......@@ -80,7 +80,6 @@ private:
void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc, SdPage* pBMMPage, bool bRenameDuplicates, SdDrawDocument* pBookmarkDoc )
{
// now check for duplicate masterpage and layout names
// ===================================================
OUString aFullNameLayout( pBMMPage->GetLayoutName() );
sal_Int32 nIndex = aFullNameLayout.indexOf( SD_LT_SEPARATOR );
......@@ -129,9 +128,9 @@ static void lcl_IterateBookmarkPages( SdDrawDocument &rDoc, SdDrawDocument* pBoo
const std::vector<OUString> &rBookmarkList, sal_uInt16 nBMSdPageCount,
InsertBookmarkAsPage_FindDuplicateLayouts& rPageIterator, bool bRenameDuplicates = false )
{
//
// Refactored copy'n'pasted layout name collection from InsertBookmarkAsPage
//
int nPos, nEndPos;
if( rBookmarkList.empty() )
......@@ -471,7 +470,6 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
}
}
// Get the necessary presentation stylesheets and transfer them before
// the pages, else, the text objects won't reference their styles anymore.
::svl::IUndoManager* pUndoMgr = NULL;
......@@ -481,14 +479,12 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
pUndoMgr->EnterListAction(SD_RESSTR(STR_UNDO_INSERTPAGES), "");
}
//
// Refactored copy'n'pasted layout name collection into IterateBookmarkPages
//
std::vector<OUString> aLayoutsToTransfer;
InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( aLayoutsToTransfer );
lcl_IterateBookmarkPages( *this, pBookmarkDoc, rBookmarkList, nBMSdPageCount, aSearchFunctor, ( rBookmarkList.empty() && pBookmarkDoc != this ) );
// Copy the style that we actually need.
SdStyleSheetPool* pBookmarkStyleSheetPool = dynamic_cast<SdStyleSheetPool*>(pBookmarkDoc->GetStyleSheetPool());
SdStyleSheetPool* pStyleSheetPool = dynamic_cast<SdStyleSheetPool*>(GetStyleSheetPool());
......@@ -766,7 +762,6 @@ sal_Bool SdDrawDocument::InsertBookmarkAsPage(
}
}
// We might have duplicate master pages now, as the drawing engine does not
// recognize duplicates. Remove these now.
sal_uInt16 nNewMPageCount = GetMasterPageCount();
......@@ -1152,7 +1147,6 @@ bool SdDrawDocument::IsReadOnly() const
return false;
}
// In the subsequent AllocModel() a DocShell (xAllocedDocShRef) is created.
// Any pre-existing DocShell is deleted
void SdDrawDocument::SetAllocDocSh(bool bAlloc)
......@@ -1322,7 +1316,6 @@ void SdDrawDocument::RemoveUnnecessaryMasterPages(SdPage* pMasterPage, sal_Bool
}
}
/** Exchange master page
*
* Either the nSdPageNum gets a new, own master page or the master page is
......@@ -1900,8 +1893,6 @@ void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
mpDocSh->SetWaitCursor( sal_False );
}
void SdDrawDocument::Merge(SdrModel& rSourceModel,
sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
sal_uInt16 nDestPos,
......
......@@ -21,8 +21,6 @@
#include "sdiocmpt.hxx"
//////////////////////////////////////////////////////////////////////////////
old_SdrDownCompat::old_SdrDownCompat(SvStream& rNewStream, sal_uInt16 nNewMode)
: rStream(rNewStream),
nSubRecSiz(0),
......
......@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "undo/undoobjects.hxx"
#include "sdpage.hxx"
#include "CustomAnimationEffect.hxx"
......@@ -26,8 +25,6 @@
using namespace sd;
///////////////////////////////////////////////////////////////////////
UndoRemovePresObjectImpl::UndoRemovePresObjectImpl( SdrObject& rObject )
: mpUndoUsercall(0)
, mpUndoAnimation(0)
......@@ -52,8 +49,6 @@ UndoRemovePresObjectImpl::UndoRemovePresObjectImpl( SdrObject& rObject )
}
}
UndoRemovePresObjectImpl::~UndoRemovePresObjectImpl()
{
delete mpUndoAnimation;
......@@ -61,8 +56,6 @@ UndoRemovePresObjectImpl::~UndoRemovePresObjectImpl()
delete mpUndoUsercall;
}
void UndoRemovePresObjectImpl::Undo()
{
if( mpUndoUsercall )
......@@ -73,8 +66,6 @@ void UndoRemovePresObjectImpl::Undo()
mpUndoAnimation->Undo();
}
void UndoRemovePresObjectImpl::Redo()
{
if( mpUndoAnimation )
......@@ -85,17 +76,12 @@ void UndoRemovePresObjectImpl::Redo()
mpUndoUsercall->Redo();
}
///////////////////////////////////////////////////////////////////////
UndoRemoveObject::UndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect )
: SdrUndoRemoveObj( rObject, bOrdNumDirect ), UndoRemovePresObjectImpl( rObject )
, mxSdrObject(&rObject)
{
}
void UndoRemoveObject::Undo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoRemoveObject::Undo(), object already dead!" );
......@@ -106,8 +92,6 @@ void UndoRemoveObject::Undo()
}
}
void UndoRemoveObject::Redo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoRemoveObject::Redo(), object already dead!" );
......@@ -118,8 +102,6 @@ void UndoRemoveObject::Redo()
}
}
///////////////////////////////////////////////////////////////////////
UndoDeleteObject::UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect )
: SdrUndoDelObj( rObject, bOrdNumDirect )
, UndoRemovePresObjectImpl( rObject )
......@@ -127,8 +109,6 @@ UndoDeleteObject::UndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect )
{
}
void UndoDeleteObject::Undo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoDeleteObject::Undo(), object already dead!" );
......@@ -139,8 +119,6 @@ void UndoDeleteObject::Undo()
}
}
void UndoDeleteObject::Redo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoDeleteObject::Redo(), object already dead!" );
......@@ -151,8 +129,6 @@ void UndoDeleteObject::Redo()
}
}
///////////////////////////////////////////////////////////////////////
UndoReplaceObject::UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect )
: SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect )
, UndoRemovePresObjectImpl( rOldObject )
......@@ -160,8 +136,6 @@ UndoReplaceObject::UndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObje
{
}
void UndoReplaceObject::Undo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoReplaceObject::Undo(), object already dead!" );
......@@ -172,8 +146,6 @@ void UndoReplaceObject::Undo()
}
}
void UndoReplaceObject::Redo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoReplaceObject::Redo(), object already dead!" );
......@@ -184,8 +156,6 @@ void UndoReplaceObject::Redo()
}
}
///////////////////////////////////////////////////////////////////////
UndoObjectSetText::UndoObjectSetText( SdrObject& rObject, sal_Int32 nText )
: SdrUndoObjSetText( rObject, nText )
, mpUndoAnimation(0)
......@@ -203,15 +173,11 @@ UndoObjectSetText::UndoObjectSetText( SdrObject& rObject, sal_Int32 nText )
}
}
UndoObjectSetText::~UndoObjectSetText()
{
delete mpUndoAnimation;
}
void UndoObjectSetText::Undo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoObjectSetText::Undo(), object already dead!" );
......@@ -224,8 +190,6 @@ void UndoObjectSetText::Undo()
}
}
void UndoObjectSetText::Redo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoObjectSetText::Redo(), object already dead!" );
......@@ -238,7 +202,6 @@ void UndoObjectSetText::Redo()
}
}
//////////////////////////////////////////////////////////////////////////////
// Undo for SdrObject::SetUserCall()
UndoObjectUserCall::UndoObjectUserCall(SdrObject& rObject)
......@@ -249,8 +212,6 @@ UndoObjectUserCall::UndoObjectUserCall(SdrObject& rObject)
{
}
void UndoObjectUserCall::Undo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoObjectUserCall::Undo(), object already dead!" );
......@@ -261,8 +222,6 @@ void UndoObjectUserCall::Undo()
}
}
void UndoObjectUserCall::Redo()
{
DBG_ASSERT( mxSdrObject.is(), "sd::UndoObjectUserCall::Redo(), object already dead!" );
......@@ -272,7 +231,6 @@ void UndoObjectUserCall::Redo()
}
}
//////////////////////////////////////////////////////////////////////////////
// Undo for SdPage::InsertPresObj() and SdPage::RemovePresObj()
UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject)
......@@ -288,8 +246,6 @@ UndoObjectPresentationKind::UndoObjectPresentationKind(SdrObject& rObject)
meOldKind = static_cast< SdPage* >( mxPage.get() )->GetPresObjKind( &rObject );
}
void UndoObjectPresentationKind::Undo()
{
if( mxPage.is() && mxSdrObject.is() )
......@@ -303,8 +259,6 @@ void UndoObjectPresentationKind::Undo()
}
}
void UndoObjectPresentationKind::Redo()
{
if( mxPage.is() && mxSdrObject.is() )
......@@ -317,22 +271,16 @@ void UndoObjectPresentationKind::Redo()
}
}
//////////////////////////////////////////////////////////////////////////////
UndoAutoLayoutPosAndSize::UndoAutoLayoutPosAndSize( SdPage& rPage )
: mxPage( &rPage )
{
}