[Libreoffice-commits] .: filter/inc hwpfilter/source lotuswordpro/source
Gert Faller
gfaller at kemper.freedesktop.org
Sat Nov 27 01:40:10 PST 2010
filter/inc/filter/msfilter/msocximex.hxx | 280 +++++++++++++++---------------
hwpfilter/source/hwpreader.hxx | 6
lotuswordpro/source/filter/lwpdrawobj.hxx | 4
3 files changed, 145 insertions(+), 145 deletions(-)
New commits:
commit dda378a9eaa4f39ecb2fe831c4ff33429aa1a624
Author: Gert Faller <gertfaller at aliceadsl.fr>
Date: Sat Nov 27 10:39:04 2010 +0100
RTL_CONSTASCII_USTRINGPARAM in filters 7
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index fce3551..345e29a 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -34,7 +34,7 @@
//!! no such defines in global namespaces - it will break other existing code that uses the same define!!
//#ifndef C2U
-//#define C2U(cChar) rtl::OUString::createFromAscii(cChar)
+//#define C2U(cChar) rtl::OUString::createFromAscii(cChar)
//#endif
#include "filter/msfilter/msfilterdllapi.h"
#include <vector>
@@ -151,7 +151,7 @@ protected:
GetShapes();
const com::sun::star::uno::Reference<
- com::sun::star::container::XIndexContainer > & GetFormComps();
+ com::sun::star::container::XIndexContainer > & GetFormComps();
SfxObjectShell *pDocSh;
SwPaM *pPaM;
@@ -161,7 +161,7 @@ protected:
xDrawPage;
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes >
xShapes;
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceFactory;
+ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceFactory;
// das einzige Formular
com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer >
@@ -289,7 +289,7 @@ public:
bool mbVisible;
UniString sName;
UniString msToolTip;
- UniString msParentName;
+ UniString msParentName;
OCX_FontData aFontData;
rtl::OUString msCtrlSource;
rtl::OUString msRowSource;
@@ -344,57 +344,57 @@ public:
/*sal_uInt8 for sal_uInt8 Word Struct*/
sal_uInt16 nIdentifier;
- sal_uInt16 nFixedAreaLen;
- sal_uInt8 pBlockFlags[8];
-
- sal_uInt8 fUnknown1:1;
- sal_uInt8 fEnabled:1;
- sal_uInt8 fLocked:1;
- sal_uInt8 fBackStyle:1;
- sal_uInt8 fUnknown2:4;
-
- sal_uInt8 fUnknown3:2;
- sal_uInt8 fColumnHeads:1;
- sal_uInt8 fIntegralHeight:1;
- sal_uInt8 fMatchRequired:1;
- sal_uInt8 fAlignment:1;
- sal_uInt8 fUnknown4:2;
-
- sal_uInt8 fUnknown5:3;
- sal_uInt8 fDragBehaviour:1;
- sal_uInt8 fEnterKeyBehaviour:1;
- sal_uInt8 fEnterFieldBehaviour:1;
- sal_uInt8 fTabKeyBehaviour:1;
- sal_uInt8 fWordWrap:1;
-
- sal_uInt8 fUnknown6:2;
- sal_uInt8 fSelectionMargin:1;
- sal_uInt8 fAutoWordSelect:1;
- sal_uInt8 fAutoSize:1;
- sal_uInt8 fHideSelection:1;
- sal_uInt8 fAutoTab:1;
- sal_uInt8 fMultiLine:1;
-
- sal_uInt32 nMaxLength;
- sal_uInt8 nBorderStyle;
- sal_uInt8 nScrollBars;
- sal_uInt8 nStyle;
- sal_uInt8 nMousePointer;
- sal_uInt8 nUnknown7;
- sal_uInt8 nPasswordChar;
- sal_uInt32 nListWidth;
- sal_uInt16 nBoundColumn;
- sal_Int16 nTextColumn;
- sal_uInt16 nColumnCount;
- sal_uInt16 nListRows;
- sal_uInt16 nUnknown8;
- sal_uInt8 nMatchEntry;
- sal_uInt8 nListStyle;
- sal_uInt8 nShowDropButtonWhen;
- sal_uInt8 nDropButtonStyle;
- sal_uInt8 nMultiState;
- sal_uInt32 nValueLen;
- sal_uInt32 nCaptionLen;
+ sal_uInt16 nFixedAreaLen;
+ sal_uInt8 pBlockFlags[8];
+
+ sal_uInt8 fUnknown1:1;
+ sal_uInt8 fEnabled:1;
+ sal_uInt8 fLocked:1;
+ sal_uInt8 fBackStyle:1;
+ sal_uInt8 fUnknown2:4;
+
+ sal_uInt8 fUnknown3:2;
+ sal_uInt8 fColumnHeads:1;
+ sal_uInt8 fIntegralHeight:1;
+ sal_uInt8 fMatchRequired:1;
+ sal_uInt8 fAlignment:1;
+ sal_uInt8 fUnknown4:2;
+
+ sal_uInt8 fUnknown5:3;
+ sal_uInt8 fDragBehaviour:1;
+ sal_uInt8 fEnterKeyBehaviour:1;
+ sal_uInt8 fEnterFieldBehaviour:1;
+ sal_uInt8 fTabKeyBehaviour:1;
+ sal_uInt8 fWordWrap:1;
+
+ sal_uInt8 fUnknown6:2;
+ sal_uInt8 fSelectionMargin:1;
+ sal_uInt8 fAutoWordSelect:1;
+ sal_uInt8 fAutoSize:1;
+ sal_uInt8 fHideSelection:1;
+ sal_uInt8 fAutoTab:1;
+ sal_uInt8 fMultiLine:1;
+
+ sal_uInt32 nMaxLength;
+ sal_uInt8 nBorderStyle;
+ sal_uInt8 nScrollBars;
+ sal_uInt8 nStyle;
+ sal_uInt8 nMousePointer;
+ sal_uInt8 nUnknown7;
+ sal_uInt8 nPasswordChar;
+ sal_uInt32 nListWidth;
+ sal_uInt16 nBoundColumn;
+ sal_Int16 nTextColumn;
+ sal_uInt16 nColumnCount;
+ sal_uInt16 nListRows;
+ sal_uInt16 nUnknown8;
+ sal_uInt8 nMatchEntry;
+ sal_uInt8 nListStyle;
+ sal_uInt8 nShowDropButtonWhen;
+ sal_uInt8 nDropButtonStyle;
+ sal_uInt8 nMultiState;
+ sal_uInt32 nValueLen;
+ sal_uInt32 nCaptionLen;
sal_uInt16 nVertPos;
sal_uInt16 nHorzPos;
@@ -430,10 +430,10 @@ public:
virtual sal_Bool Read(SotStorageStream *pS);
std::vector< rtl::OUString > msItems;
- sal_uInt16 nIdentifier;
- sal_uInt16 nFixedAreaLen;
- sal_uInt8 pBlockFlags[4];
- sal_Int32 nNumTabs;
+ sal_uInt16 nIdentifier;
+ sal_uInt16 nFixedAreaLen;
+ sal_uInt8 pBlockFlags[4];
+ sal_Int32 nNumTabs;
bool bHasTabs;
};
@@ -447,25 +447,25 @@ public:
~OCX_Image() { }
/*sal_uInt8 for sal_uInt8 Word Struct*/
- sal_uInt16 nIdentifier;
- sal_uInt16 nFixedAreaLen;
- sal_uInt8 pBlockFlags[4];
+ sal_uInt16 nIdentifier;
+ sal_uInt16 nFixedAreaLen;
+ sal_uInt8 pBlockFlags[4];
- sal_uInt32 nBorderColor;
- sal_uInt8 nBorderStyle;
- sal_uInt8 nMousePointer;
+ sal_uInt32 nBorderColor;
+ sal_uInt8 nBorderStyle;
+ sal_uInt8 nMousePointer;
sal_uInt8 nPictureSizeMode;
- sal_uInt8 fUnknown1:1;
- sal_uInt8 fEnabled:1;
- sal_uInt8 fUnknown2:2;
- sal_uInt8 fBackStyle:1;
- sal_uInt8 fUnknown3:3;
+ sal_uInt8 fUnknown1:1;
+ sal_uInt8 fEnabled:1;
+ sal_uInt8 fUnknown2:2;
+ sal_uInt8 fBackStyle:1;
+ sal_uInt8 fUnknown3:3;
sal_uInt8 nPictureAlignment;
bool bPictureTiling;
- sal_uInt8 nSpecialEffect;
+ sal_uInt8 nSpecialEffect;
bool bAutoSize;
sal_Bool Read(SotStorageStream *pS);
@@ -546,7 +546,7 @@ protected:
SotStorageStreamRef mContainedControlsStream;
sal_uInt16 nIdentifier;
sal_uInt16 nFixedAreaLen;
- sal_uInt8 pBlockFlags[4];
+ sal_uInt8 pBlockFlags[4];
sal_uInt32 nChildrenA;
sal_uInt32 nNextAvailableID;
@@ -554,46 +554,46 @@ protected:
sal_uInt32 nGroupCnt;
sal_uInt32 nZoom;
- sal_uInt8 fUnknown1:1;
- sal_uInt8 fEnabled:1;
- sal_uInt8 fLocked:1;
- sal_uInt8 fBackStyle:1;
- sal_uInt8 fUnknown2:4;
+ sal_uInt8 fUnknown1:1;
+ sal_uInt8 fEnabled:1;
+ sal_uInt8 fLocked:1;
+ sal_uInt8 fBackStyle:1;
+ sal_uInt8 fUnknown2:4;
- sal_uInt8 fUnknown3:8;
+ sal_uInt8 fUnknown3:8;
- sal_uInt8 fUnknown4:7;
- sal_uInt8 fWordWrap:1;
+ sal_uInt8 fUnknown4:7;
+ sal_uInt8 fWordWrap:1;
- sal_uInt8 fUnknown5:4;
- sal_uInt8 fAutoSize:1;
- sal_uInt8 fUnknown6:3;
+ sal_uInt8 fUnknown5:4;
+ sal_uInt8 fAutoSize:1;
+ sal_uInt8 fUnknown6:3;
- sal_uInt32 nCaptionLen;
+ sal_uInt32 nCaptionLen;
sal_uInt16 nVertPos;
sal_uInt16 nHorzPos;
- sal_uInt32 nBorderColor;
+ sal_uInt32 nBorderColor;
sal_uInt32 nDrawBuffer;
sal_uInt32 nShapeCookie;
sal_uInt8 nKeepScrollBarsVisible;
sal_uInt8 nCycle;
- sal_uInt8 nBorderStyle;
- sal_uInt8 nMousePointer;
- sal_uInt8 nSpecialEffect;
- sal_uInt16 nPicture;
+ sal_uInt8 nBorderStyle;
+ sal_uInt8 nMousePointer;
+ sal_uInt8 nSpecialEffect;
+ sal_uInt16 nPicture;
sal_uInt8 nPictureAlignment;
sal_uInt8 nPictureSizeMode;
bool bPictureTiling;
- sal_uInt16 nAccelerator;
- sal_uInt16 nIcon;
- sal_uInt16 fUnknown7;
+ sal_uInt16 nAccelerator;
+ sal_uInt16 nIcon;
+ sal_uInt16 fUnknown7;
char *pCaption;
- sal_uInt32 nScrollWidth;
- sal_uInt32 nScrollHeight;
- sal_uInt32 nScrollLeft;
- sal_uInt32 nScrollTop;
+ sal_uInt32 nScrollWidth;
+ sal_uInt32 nScrollHeight;
+ sal_uInt32 nScrollLeft;
+ sal_uInt32 nScrollTop;
sal_uInt8 pIconHeader[20];
sal_uInt32 nIconLen;
@@ -721,8 +721,8 @@ public:
OCX_OptionButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionButton" )))
{
msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
- //msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
- msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
+ //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlRadioButtonModel"));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
mnBackColor = 0x80000005L;
mnForeColor = 0x80000008L;
aFontData.SetHasAlign(TRUE);
@@ -823,7 +823,7 @@ class OCX_ComboBox : public OCX_ModernControl
public:
OCX_ComboBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ))){
msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
- msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
mnBackColor = 0x80000005;
mnForeColor = 0x80000008;
nBorderColor = 0x80000006;
@@ -848,8 +848,8 @@ class OCX_ListBox : public OCX_ModernControl
public:
OCX_ListBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))){
msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
- //msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
- msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
+ //msDialogType = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.awt.UnoControlListBoxModel"));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
mnBackColor = 0x80000005;
mnForeColor = 0x80000008;
nBorderColor = 0x80000006;
@@ -892,35 +892,35 @@ public:
sal_Bool Read(SotStorageStream *pS);
/*sal_uInt8 for sal_uInt8 Word Struct*/
- sal_uInt16 nIdentifier;
- sal_uInt16 nFixedAreaLen;
- sal_uInt8 pBlockFlags[4];
+ sal_uInt16 nIdentifier;
+ sal_uInt16 nFixedAreaLen;
+ sal_uInt8 pBlockFlags[4];
- sal_uInt8 fUnknown1:1;
- sal_uInt8 fEnabled:1;
- sal_uInt8 fLocked:1;
- sal_uInt8 fBackStyle:1;
- sal_uInt8 fUnknown2:4;
+ sal_uInt8 fUnknown1:1;
+ sal_uInt8 fEnabled:1;
+ sal_uInt8 fLocked:1;
+ sal_uInt8 fBackStyle:1;
+ sal_uInt8 fUnknown2:4;
- sal_uInt8 fUnknown3:8;
+ sal_uInt8 fUnknown3:8;
- sal_uInt8 fUnknown4:7;
- sal_uInt8 fWordWrap:1;
+ sal_uInt8 fUnknown4:7;
+ sal_uInt8 fWordWrap:1;
- sal_uInt8 fUnknown5:4;
- sal_uInt8 fAutoSize:1;
- sal_uInt8 fUnknown6:3;
+ sal_uInt8 fUnknown5:4;
+ sal_uInt8 fAutoSize:1;
+ sal_uInt8 fUnknown6:3;
- sal_uInt32 nCaptionLen;
+ sal_uInt32 nCaptionLen;
sal_uInt16 nVertPos;
sal_uInt16 nHorzPos;
- sal_uInt16 nMousePointer;
- sal_uInt16 nPicture;
- sal_uInt16 nAccelerator;
- sal_uInt16 nIcon;
+ sal_uInt16 nMousePointer;
+ sal_uInt16 nPicture;
+ sal_uInt16 nAccelerator;
+ sal_uInt16 nIcon;
char *pCaption;
@@ -1009,34 +1009,34 @@ public:
/*sal_uInt8 for sal_uInt8 Word Struct*/
sal_uInt16 nIdentifier;
sal_uInt16 nFixedAreaLen;
- sal_uInt8 pBlockFlags[4];
+ sal_uInt8 pBlockFlags[4];
- sal_uInt8 fUnknown1:1;
- sal_uInt8 fEnabled:1;
- sal_uInt8 fLocked:1;
- sal_uInt8 fBackStyle:1;
- sal_uInt8 fUnknown2:4;
+ sal_uInt8 fUnknown1:1;
+ sal_uInt8 fEnabled:1;
+ sal_uInt8 fLocked:1;
+ sal_uInt8 fBackStyle:1;
+ sal_uInt8 fUnknown2:4;
- sal_uInt8 fUnknown3:8;
+ sal_uInt8 fUnknown3:8;
- sal_uInt8 fUnknown4:7;
- sal_uInt8 fWordWrap:1;
+ sal_uInt8 fUnknown4:7;
+ sal_uInt8 fWordWrap:1;
- sal_uInt8 fUnknown5:4;
- sal_uInt8 fAutoSize:1;
- sal_uInt8 fUnknown6:3;
+ sal_uInt8 fUnknown5:4;
+ sal_uInt8 fAutoSize:1;
+ sal_uInt8 fUnknown6:3;
- sal_uInt32 nCaptionLen;
+ sal_uInt32 nCaptionLen;
sal_uInt16 nVertPos;
sal_uInt16 nHorzPos;
- sal_uInt8 nMousePointer;
- sal_uInt32 nBorderColor;
- sal_uInt16 nBorderStyle;
- sal_uInt16 nSpecialEffect;
- sal_uInt16 nPicture;
- sal_uInt16 nAccelerator;
- sal_uInt16 nIcon;
+ sal_uInt8 nMousePointer;
+ sal_uInt32 nBorderColor;
+ sal_uInt16 nBorderStyle;
+ sal_uInt16 nSpecialEffect;
+ sal_uInt16 nPicture;
+ sal_uInt16 nAccelerator;
+ sal_uInt16 nIcon;
char *pCaption;
diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx
index 3300c94..97d8337 100644
--- a/hwpfilter/source/hwpreader.hxx
+++ b/hwpfilter/source/hwpreader.hxx
@@ -259,11 +259,11 @@ HwpImportFilter::HwpImportFilter( const Reference< XMultiServiceFactory > xFact
p->setDocumentHandler( xHandler );
Sequence< Any > aArgs( 2 );
- aArgs[0] <<= OUString::createFromAscii( "Local" );
- aArgs[1] <<= OUString::createFromAscii( "Office" );
+ aArgs[0] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
+ aArgs[1] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
Reference< XInterface > xUCB
( xFact->createInstanceWithArguments
- (OUString::createFromAscii("com.sun.star.ucb.UniversalContentBroker"),
+ (OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.UniversalContentBroker")),
aArgs));
p->setUCB( xUCB );
diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx
index 80c124e..30c3f60 100644
--- a/lotuswordpro/source/filter/lwpdrawobj.hxx
+++ b/lotuswordpro/source/filter/lwpdrawobj.hxx
@@ -156,7 +156,7 @@ public:
protected:
virtual void Read() {}
- virtual rtl::OUString RegisterStyle() { return rtl::OUString::createFromAscii(""); }
+ virtual rtl::OUString RegisterStyle() { return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")); }
virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/) { return NULL; }
};
@@ -350,7 +350,7 @@ public:
protected:
virtual void Read();
- virtual rtl::OUString RegisterStyle() {return rtl::OUString::createFromAscii("");}
+ virtual rtl::OUString RegisterStyle() {return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(""));}
virtual XFFrame* CreateDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
virtual XFFrame* CreateStandardDrawObj(const rtl::OUString& /*rStyleName*/){return NULL;}
};
More information about the Libreoffice-commits
mailing list