[Libreoffice-commits] .: 2 commits - filter/inc filter/source solenv/gbuild svtools/inc svtools/source svx/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Oct 6 12:36:31 PDT 2012
filter/inc/filter/msfilter/msdffimp.hxx | 3 ---
filter/inc/filter/msfilter/svdfppt.hxx | 10 ----------
filter/source/msfilter/svdfppt.cxx | 10 +++++++---
solenv/gbuild/UnoApiTarget.mk | 4 ++--
svtools/inc/svtools/filter.hxx | 11 -----------
svtools/inc/svtools/grfmgr.hxx | 3 ---
svtools/inc/svtools/transfer.hxx | 17 -----------------
svtools/source/inc/sgvmain.hxx | 2 --
svx/inc/svx/galbrws.hxx | 3 ---
sw/source/core/inc/tabfrm.hxx | 1 -
10 files changed, 9 insertions(+), 55 deletions(-)
New commits:
commit 442b7f6b747855b0899662166927aba82032afde
Author: Tor Lillqvist <tml at iki.fi>
Date: Sat Oct 6 21:44:32 2012 +0300
For some reason I need mkdirs here, dunno why others don't?
Change-Id: I1e4e701ba4883862ddf79ef45d4f7521346a067d
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index a5d69fe..35c91cf 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -341,10 +341,10 @@ $(call gb_UnoApiHeadersTarget_get_bootstrap_dir,$(1),/%.hpp) :
touch $$@
$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hdl) :
- touch $$@
+ mkdir -p `dirname $$@` && touch $$@
$(call gb_UnoApiHeadersTarget_get_comprehensive_dir,$(1),/%.hpp) :
- touch $$@
+ mkdir -p `dirname $$@` && touch $$@
endef
commit f26d188ffa00ee6184490fc5c179da16e17301bb
Author: Tor Lillqvist <tml at iki.fi>
Date: Fri Oct 5 18:23:16 2012 +0300
Bin unused leftover "dummy" fields
Change-Id: If16fcbb58234a9f1b7e07718f77909273f1fbbd4
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index f69f076..e9e1b14 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -600,9 +600,6 @@ protected :
virtual sal_Bool ShapeHasText(sal_uLong nShapeId, sal_uLong nFilePos) const;
public:
- void* pSvxMSDffDummy1;
- void* pSvxMSDffDummy2;
- void* pSvxMSDffDummy3;
std::map<sal_uInt32,rtl::OString> aEscherBlipCache;
DffRecordManager maShapeRecords;
diff --git a/filter/inc/filter/msfilter/svdfppt.hxx b/filter/inc/filter/msfilter/svdfppt.hxx
index 8250c72..79272f5 100644
--- a/filter/inc/filter/msfilter/svdfppt.hxx
+++ b/filter/inc/filter/msfilter/svdfppt.hxx
@@ -328,7 +328,6 @@ struct PptSlidePersistEntry
SdrObject* pBObj;
sal_Bool bBObjIsTemporary;
- void* pDummy2;
PptPageKind ePageKind; //
sal_Bool bNotesMaster : 1; // for NotesMaster
@@ -379,11 +378,8 @@ struct PPTOleEntry
struct PptExOleObjAtom
{
sal_uInt32 nAspect;
- sal_uInt32 nDummy1;
sal_uInt32 nId;
- sal_uInt32 nDummy2;
sal_uInt32 nPersistPtr;
- sal_uInt32 nDummy4;
public:
@@ -429,11 +425,6 @@ public:
PowerPointImportParam& rImportParam;
- void* pSdrEscherDummy1;
- void* pSdrEscherDummy2;
- void* pSdrEscherDummy3;
- void* pSdrEscherDummy4;
-
SdrEscherImport( PowerPointImportParam&, const String& rBaseURL );
virtual ~SdrEscherImport();
virtual bool GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) const;
@@ -858,7 +849,6 @@ struct PPTStyleSheet : public PPTNumberFormatCreator
PPTCharSheet* mpCharSheet[ PPT_STYLESHEETENTRYS ];
PPTParaSheet* mpParaSheet[ PPT_STYLESHEETENTRYS ];
SvxNumBulletItem* mpNumBulletItem[ PPT_STYLESHEETENTRYS ];
- void* mpDummy;
PPTStyleSheet(
const DffRecordHeader& rSlideHd,
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 677a2ae..9e0fbc0 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -221,12 +221,16 @@ SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom )
SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom )
{
+ sal_uInt32 nDummy1;
+ sal_uInt32 nDummy2;
+ sal_uInt32 nDummy4;
+
rIn >> rAtom.nAspect
- >> rAtom.nDummy1
+ >> nDummy1
>> rAtom.nId
- >> rAtom.nDummy2
+ >> nDummy2
>> rAtom.nPersistPtr
- >> rAtom.nDummy4;
+ >> nDummy4;
return rIn;
}
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index 526ef93..95aee1c 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -243,10 +243,6 @@ struct FilterErrorEx
{
sal_uLong nFilterError;
sal_uLong nStreamError;
- long nDummy1;
- long nDummy2;
- long nDummy3;
- long nDummy4;
FilterErrorEx() : nFilterError( 0UL ), nStreamError( 0UL ) {}
};
@@ -274,14 +270,7 @@ protected:
FilterErrorEx* pErrorEx;
sal_Bool bAbort;
sal_Bool bUseConfig;
- sal_Bool bDummy1;
- sal_Bool bDummy2;
- sal_Bool bDummy3;
- sal_Bool bDummy4;
long nExpGraphHint;
- long nDummy2;
- void* pDummy1;
- void* pDummy2;
public:
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 8d2d050..c0e632e 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -208,8 +208,6 @@ private:
Timer* mpSwapOutTimer;
GrfSimpleCacheObj* mpSimpleCache;
sal_uLong mnAnimationLoopCount;
- void* mpDummy1;
- void* mpDummy2;
sal_Bool mbAutoSwapped : 1;
sal_Bool mbTransparent : 1;
sal_Bool mbAnimated : 1;
@@ -217,7 +215,6 @@ private:
sal_Bool mbIsInSwapIn : 1;
sal_Bool mbIsInSwapOut : 1;
sal_Bool mbAlpha : 1;
- sal_Bool mbDummyFlag8 : 1;
sal_Bool mbIsRenderGraphic : 1;
sal_Bool mbHasRenderGraphic : 1;
diff --git a/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index 68eb00c..9c8f983 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.hxx
@@ -90,9 +90,6 @@ struct TransferableObjectDescriptor
String maTypeName;
String maDisplayName;
sal_Bool mbCanLink;
- void* mpDummy1;
- void* mpDummy2;
- sal_Bool mbDummy1;
SVT_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, TransferableObjectDescriptor& rObjDesc );
SVT_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
@@ -109,9 +106,6 @@ struct AcceptDropEvent
const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent maDragEvent;
sal_Bool mbLeaving;
sal_Bool mbDefault;
- sal_Bool mbDummy1;
- sal_Bool mbDummy2;
- sal_Bool mbDummy3;
AcceptDropEvent() :
mnAction( DND_ACTION_NONE ),
@@ -139,9 +133,6 @@ struct ExecuteDropEvent
Point maPosPixel;
const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent maDropEvent;
sal_Bool mbDefault;
- sal_Bool mbDummy1;
- sal_Bool mbDummy2;
- sal_Bool mbDummy3;
ExecuteDropEvent() :
mnAction( DND_ACTION_NONE ),
@@ -193,7 +184,6 @@ private:
private:
- DataFlavorExList maDummy;
::com::sun::star::uno::Any maAny;
::rtl::OUString maLastFormat;
mutable ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard;
@@ -314,7 +304,6 @@ private:
DataFlavorExVector* mpFormats;
TransferableObjectDescriptor* mpObjDesc;
TransferableDataHelper_Impl* mpImpl;
- void* mpDummy4;
protected:
void InitFormats();
@@ -439,8 +428,6 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer > mxDragGestureRecognizer;
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener > mxDragGestureListener;
- void* mpDummy1;
- void* mpDummy2;
// not available
DragSourceHelper();
@@ -494,13 +481,9 @@ private:
private:
- DataFlavorExList maDummy;
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > mxDropTarget;
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener;
DataFlavorExVector* mpFormats;
- void* mpDummy1;
- void* mpDummy2;
- void* mpDummy3;
// not available
DropTargetHelper();
diff --git a/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx
index 9d023d5..fe08e2d 100644
--- a/svtools/source/inc/sgvmain.hxx
+++ b/svtools/source/inc/sgvmain.hxx
@@ -99,8 +99,6 @@ struct ObjAreaType {
sal_uInt8 FFarbe; // [Index]
sal_uInt8 FBFarbe; // [Index]
sal_uInt8 FIntens; // [%]
- sal_uInt8 FDummy1; //
- sal_Int16 FDummy2; //
sal_uInt16 FMuster; // [Index] inkl. Invers, Transparenz
};
diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index f93451e..9c92f89 100644
--- a/svx/inc/svx/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
@@ -83,9 +83,6 @@ private:
GalleryBrowser1* mpBrowser1;
GalleryBrowser2* mpBrowser2;
Gallery* mpGallery;
- long mnDummy1;
- long mnDummy2;
- long mnDummy3;
void InitSettings();
diff --git a/sw/source/core/inc/tabfrm.hxx b/sw/source/core/inc/tabfrm.hxx
index b06a8be..1806680 100644
--- a/sw/source/core/inc/tabfrm.hxx
+++ b/sw/source/core/inc/tabfrm.hxx
@@ -93,7 +93,6 @@ class SwTabFrm: public SwLayoutFrm, public SwFlowFrm
// #i26945#
sal_Bool bObjsDoesFit :1; // For splitting table rows algorithm, this boolean
// indicates, if the floating screen objects fits
- sal_Bool bDummy4 :1;
//Split() spaltet den Frm an der angegebenen Stelle, es wird ein
//Follow erzeugt und aufgebaut und direkt hinter this gepastet.
More information about the Libreoffice-commits
mailing list