[Libreoffice-commits] .: 2 commits - android/experimental sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Wed Nov 28 01:05:49 PST 2012
android/experimental/LibreOffice4Android/native-code.cxx | 4
sw/source/filter/ww8/ww8par.hxx | 6 -
sw/source/filter/ww8/ww8par5.cxx | 72 +++++++--------
sw/source/ui/vba/vbafield.cxx | 28 ++---
4 files changed, 57 insertions(+), 53 deletions(-)
New commits:
commit b4dd218f9eca2c4edf887761241843e70c6b5e8f
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Nov 28 10:50:24 2012 +0200
Add vbaswobj and writerfilter components
Change-Id: I63c88bcb41a48142f8b3c20ff4d66ae28811411b
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx b/android/experimental/LibreOffice4Android/native-code.cxx
index 616bb86..ba14852 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -36,8 +36,10 @@ extern "C"
extern void * ucppkg1_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * unoxml_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * unordf_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * vbaswobj_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * wpftdraw_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * wpftwriter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
+ extern void * writerfilter_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * xmlfd_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * xmlsecurity_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
extern void * xo_component_getFactory( const char * pImplName, void * pServiceManager, void * pRegistryKey );
@@ -74,8 +76,10 @@ lo_get_libmap(void)
{ "libucppkg1.a", ucppkg1_component_getFactory },
{ "libunordflo.a", unordf_component_getFactory },
{ "libunoxmllo.a", unoxml_component_getFactory },
+ { "libvbaswobj.uno.a", vbaswobj_component_getFactory },
{ "libwpftdrawlo.a", wpftdraw_component_getFactory },
{ "libwpftwriterlo.a", wpftwriter_component_getFactory },
+ { "libwriterfilterlo.a", writerfilter_component_getFactory },
{ "libxmlfdlo.a", xmlfd_component_getFactory },
{ "libxmlsecurity.a", xmlsecurity_component_getFactory },
{ "libxoflo.a", xof_component_getFactory },
commit 759aed9b78b77b40ab244e1c3e3f156f2b32369d
Author: Tor Lillqvist <tml at iki.fi>
Date: Wed Nov 28 10:33:45 2012 +0200
De-duplicate _ReadFieldParams
Change-Id: Ib08f5ab8e6155f1b9be100377657678b8c480060
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 44f6511..92357ac 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -108,7 +108,7 @@ class SwAttrSet;
class GDIMetaFile;
struct ESelection;
class SfxItemSet;
-class _ReadFieldParams;
+class WW8ReadFieldParams;
class wwZOrderer;
class OutlinerParaObject;
@@ -1691,8 +1691,8 @@ public: // eigentlich private, geht aber leider nur public
eF_ResT Read_F_DBNext( WW8FieldDesc*, String& );
eF_ResT Read_F_DBNum( WW8FieldDesc*, String& );
eF_ResT Read_F_Equation( WW8FieldDesc*, String& );
- void Read_SubF_Ruby( _ReadFieldParams& rReadParam);
- void Read_SubF_Combined( _ReadFieldParams& rReadParam);
+ void Read_SubF_Ruby( WW8ReadFieldParams& rReadParam);
+ void Read_SubF_Combined( WW8ReadFieldParams& rReadParam);
eF_ResT Read_F_IncludePicture( WW8FieldDesc*, String& rStr );
eF_ResT Read_F_IncludeText( WW8FieldDesc*, String& rStr );
eF_ResT Read_F_Seq( WW8FieldDesc*, String& rStr );
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 1075590..4ddccfc 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -104,14 +104,14 @@ using namespace std; // #i24377#
using namespace nsSwDocInfoSubType;
-class _ReadFieldParams
+class WW8ReadFieldParams
{
private:
String aData;
xub_StrLen nLen, nFnd, nNext, nSavPtr;
public:
- _ReadFieldParams( const String& rData );
- ~_ReadFieldParams();
+ WW8ReadFieldParams( const String& rData );
+ ~WW8ReadFieldParams();
xub_StrLen GoToTokenParam();
long SkipToNextToken();
@@ -125,7 +125,7 @@ public:
};
-_ReadFieldParams::_ReadFieldParams( const String& _rData )
+WW8ReadFieldParams::WW8ReadFieldParams( const String& _rData )
: aData( _rData ), nLen( _rData.Len() ), nNext( 0 )
{
/*
@@ -150,13 +150,13 @@ _ReadFieldParams::_ReadFieldParams( const String& _rData )
}
-_ReadFieldParams::~_ReadFieldParams()
+WW8ReadFieldParams::~WW8ReadFieldParams()
{
}
-String _ReadFieldParams::GetResult() const
+String WW8ReadFieldParams::GetResult() const
{
return (STRING_NOTFOUND == nFnd)
? aEmptyStr
@@ -164,7 +164,7 @@ String _ReadFieldParams::GetResult() const
}
-xub_StrLen _ReadFieldParams::GoToTokenParam()
+xub_StrLen WW8ReadFieldParams::GoToTokenParam()
{
xub_StrLen nOld = nNext;
if( -2 == SkipToNextToken() )
@@ -174,7 +174,7 @@ xub_StrLen _ReadFieldParams::GoToTokenParam()
}
// ret: -2: NOT a '\' parameter but normal Text
-long _ReadFieldParams::SkipToNextToken()
+long WW8ReadFieldParams::SkipToNextToken()
{
long nRet = -1; // Ende
if (
@@ -216,7 +216,7 @@ long _ReadFieldParams::SkipToNextToken()
// Returnwert: 0 falls String-Ende erreicht,
// ansonsten Anfang des Paramters bzw. der Zeichenkette
//
-xub_StrLen _ReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
+xub_StrLen WW8ReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
{
xub_StrLen n = ( STRING_NOTFOUND == nStart ) ? nFnd : nStart; // Anfang
xub_StrLen n2; // Ende
@@ -281,7 +281,7 @@ xub_StrLen _ReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
// read parameters "1-3" or 1-3 with both values between 1 and nMax
-bool _ReadFieldParams::GetTokenSttFromTo(sal_uInt16* pFrom, sal_uInt16* pTo, sal_uInt16 nMax)
+bool WW8ReadFieldParams::GetTokenSttFromTo(sal_uInt16* pFrom, sal_uInt16* pTo, sal_uInt16 nMax)
{
sal_uInt16 nStart = 0;
sal_uInt16 nEnd = 0;
@@ -1276,7 +1276,7 @@ eF_ResT SwWW8ImplReader::Read_F_Input( WW8FieldDesc* pF, String& rStr )
String aDef;
String aQ;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -1463,7 +1463,7 @@ eF_ResT SwWW8ImplReader::Read_F_InputVar( WW8FieldDesc* pF, String& rStr )
String aQ;
String aDef;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -1534,7 +1534,7 @@ eF_ResT SwWW8ImplReader::Read_F_Seq( WW8FieldDesc*, String& rStr )
String sStart;
SvxExtNumType eNumFormat = SVX_NUM_ARABIC;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -1601,7 +1601,7 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, String& rStr )
if( 85 == pF->nId )
{
String aDocProperty;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
long nRet;
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
@@ -1789,7 +1789,7 @@ eF_ResT SwWW8ImplReader::Read_F_DocInfo( WW8FieldDesc* pF, String& rStr )
// Extract DOCVARIABLE varname
if ( 64 == pF->nId )
{
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
long nRet;
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
@@ -1842,7 +1842,7 @@ eF_ResT SwWW8ImplReader::Read_F_TemplName( WW8FieldDesc*, String& )
eF_ResT SwWW8ImplReader::Read_F_DateTime( WW8FieldDesc*pF, String& rStr )
{
bool bHijri = false;
- _ReadFieldParams aReadParam(rStr);
+ WW8ReadFieldParams aReadParam(rStr);
long nTok;
while (-1 != (nTok = aReadParam.SkipToNextToken()))
{
@@ -1904,7 +1904,7 @@ eF_ResT SwWW8ImplReader::Read_F_FileName(WW8FieldDesc*, String &rStr)
{
SwFileNameFormat eType = FF_NAME;
long nRet;
- _ReadFieldParams aReadParam(rStr);
+ WW8ReadFieldParams aReadParam(rStr);
while (-1 != (nRet = aReadParam.SkipToNextToken()))
{
switch (nRet)
@@ -1960,7 +1960,7 @@ eF_ResT SwWW8ImplReader::Read_F_Symbol( WW8FieldDesc*, String& rStr )
String aName;
sal_Int32 nSize = 0;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2029,7 +2029,7 @@ eF_ResT SwWW8ImplReader::Read_F_Embedd( WW8FieldDesc*, String& rStr )
String sHost;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2057,7 +2057,7 @@ eF_ResT SwWW8ImplReader::Read_F_Set( WW8FieldDesc* pF, String& rStr )
String sOrigName;
String sVal;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2092,7 +2092,7 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*, String& rStr )
REFERENCEMARK eFormat = REF_CONTENT;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2164,7 +2164,7 @@ eF_ResT SwWW8ImplReader::Read_F_NoteReference( WW8FieldDesc*, String& rStr )
bool bAboveBelow = false;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2210,7 +2210,7 @@ eF_ResT SwWW8ImplReader::Read_F_PgRef( WW8FieldDesc*, String& rStr )
{
String sOrigName;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2251,7 +2251,7 @@ eF_ResT SwWW8ImplReader::Read_F_Macro( WW8FieldDesc*, String& rStr)
long nRet;
bool bNewVText = true;
bool bBracket = false;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
xub_StrLen nOffset = 0;
@@ -2342,7 +2342,7 @@ eF_ResT SwWW8ImplReader::Read_F_IncludePicture( WW8FieldDesc*, String& rStr )
bool bEmbedded = true;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2408,7 +2408,7 @@ eF_ResT SwWW8ImplReader::Read_F_IncludeText( WW8FieldDesc* /*pF*/, String& rStr
String aPara;
String aBook;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2474,7 +2474,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBField( WW8FieldDesc* pF, String& rStr )
{
String aName;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -2535,7 +2535,7 @@ eF_ResT SwWW8ImplReader::Read_F_DBNum( WW8FieldDesc*, String& )
*/
eF_ResT SwWW8ImplReader::Read_F_Equation( WW8FieldDesc*, String& rStr )
{
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
long cChar = aReadParam.SkipToNextToken();
if ('o' == cChar)
Read_SubF_Combined(aReadParam);
@@ -2544,7 +2544,7 @@ eF_ResT SwWW8ImplReader::Read_F_Equation( WW8FieldDesc*, String& rStr )
return FLD_OK;
}
-void SwWW8ImplReader::Read_SubF_Combined( _ReadFieldParams& rReadParam)
+void SwWW8ImplReader::Read_SubF_Combined( WW8ReadFieldParams& rReadParam)
{
String sCombinedCharacters;
if ((-2 == rReadParam.SkipToNextToken()) &&
@@ -2589,7 +2589,7 @@ void SwWW8ImplReader::Read_SubF_Combined( _ReadFieldParams& rReadParam)
}
}
-void SwWW8ImplReader::Read_SubF_Ruby( _ReadFieldParams& rReadParam)
+void SwWW8ImplReader::Read_SubF_Ruby( WW8ReadFieldParams& rReadParam)
{
sal_uInt16 nJustificationCode=0;
String sFontName;
@@ -2755,7 +2755,7 @@ void SwWW8ImplReader::Read_SubF_Ruby( _ReadFieldParams& rReadParam)
static void lcl_toxMatchACSwitch( SwWW8ImplReader& /*rReader*/,
SwDoc& rDoc,
SwTOXBase& rBase,
- _ReadFieldParams& rParam,
+ WW8ReadFieldParams& rParam,
SwCaptionDisplay eCaptionType)
{
xub_StrLen n = rParam.GoToTokenParam();
@@ -2825,7 +2825,7 @@ static void EnsureMaxLevelForTemplates(SwTOXBase& rBase)
}
static void lcl_toxMatchTSwitch(SwWW8ImplReader& rReader, SwTOXBase& rBase,
- _ReadFieldParams& rParam)
+ WW8ReadFieldParams& rParam)
{
xub_StrLen n = rParam.GoToTokenParam();
if( STRING_NOTFOUND != n )
@@ -2975,7 +2975,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
// oder der Parameter \f existiert
// oder GARKEINE Switches Parameter angegeben sind.
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -3076,7 +3076,7 @@ eF_ResT SwWW8ImplReader::Read_F_Tox( WW8FieldDesc* pF, String& rStr )
sal_uInt16 eCreateFrom = 0;
sal_uInt16 nMaxLevel = 0;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -3473,7 +3473,7 @@ eF_ResT SwWW8ImplReader::Read_F_Hyperlink( WW8FieldDesc* /*pF*/, String& rStr )
{
bool bOptions = false;
long nRet;
- _ReadFieldParams aReadParam( rStr );
+ WW8ReadFieldParams aReadParam( rStr );
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
switch( nRet )
@@ -3540,7 +3540,7 @@ static void lcl_ImportTox(SwDoc &rDoc, SwPaM &rPaM, const String &rStr, bool bId
xub_StrLen n;
String sFldTxt;
long nRet;
- _ReadFieldParams aReadParam(rStr);
+ WW8ReadFieldParams aReadParam(rStr);
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
switch( nRet )
{
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 794a77b..ebc77c6 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -78,17 +78,17 @@ SwVbaField::getServiceNames()
return aServiceNames;
}
-// *** _ReadFieldParams ***********************************************
+// *** SwVbaReadFieldParams ***********************************************
// the codes are copied from ww8par5.cxx
-class _ReadFieldParams
+class SwVbaReadFieldParams
{
private:
String aData;
xub_StrLen nLen, nFnd, nNext, nSavPtr;
String aFieldName;
public:
- _ReadFieldParams( const String& rData );
- ~_ReadFieldParams();
+ SwVbaReadFieldParams( const String& rData );
+ ~SwVbaReadFieldParams();
xub_StrLen GoToTokenParam();
long SkipToNextToken();
@@ -103,7 +103,7 @@ public:
};
-_ReadFieldParams::_ReadFieldParams( const String& _rData )
+SwVbaReadFieldParams::SwVbaReadFieldParams( const String& _rData )
: aData( _rData ), nLen( _rData.Len() ), nNext( 0 )
{
/*
@@ -129,12 +129,12 @@ _ReadFieldParams::_ReadFieldParams( const String& _rData )
}
-_ReadFieldParams::~_ReadFieldParams()
+SwVbaReadFieldParams::~SwVbaReadFieldParams()
{
}
-String _ReadFieldParams::GetResult() const
+String SwVbaReadFieldParams::GetResult() const
{
return (STRING_NOTFOUND == nFnd)
? aEmptyStr
@@ -142,7 +142,7 @@ String _ReadFieldParams::GetResult() const
}
-xub_StrLen _ReadFieldParams::GoToTokenParam()
+xub_StrLen SwVbaReadFieldParams::GoToTokenParam()
{
xub_StrLen nOld = nNext;
if( -2 == SkipToNextToken() )
@@ -152,7 +152,7 @@ xub_StrLen _ReadFieldParams::GoToTokenParam()
}
// ret: -2: NOT a '\' parameter but normal Text
-long _ReadFieldParams::SkipToNextToken()
+long SwVbaReadFieldParams::SkipToNextToken()
{
long nRet = -1; // Ende
if (
@@ -194,7 +194,7 @@ long _ReadFieldParams::SkipToNextToken()
// Returnwert: 0 falls String-Ende erreicht,
// ansonsten Anfang des Paramters bzw. der Zeichenkette
//
-xub_StrLen _ReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
+xub_StrLen SwVbaReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
{
xub_StrLen n = ( STRING_NOTFOUND == nStart ) ? nFnd : nStart; // Anfang
xub_StrLen n2; // Ende
@@ -250,7 +250,7 @@ xub_StrLen _ReadFieldParams::FindNextStringPiece(const xub_StrLen nStart)
// read parameters "1-3" or 1-3 with both values between 1 and nMax
-bool _ReadFieldParams::GetTokenSttFromTo(sal_uInt16* pFrom, sal_uInt16* pTo, sal_uInt16 nMax)
+bool SwVbaReadFieldParams::GetTokenSttFromTo(sal_uInt16* pFrom, sal_uInt16* pTo, sal_uInt16 nMax)
{
sal_uInt16 nStart = 0;
sal_uInt16 nEnd = 0;
@@ -377,7 +377,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
String sFieldName;
if( ( nType == word::WdFieldType::wdFieldEmpty ) && !sText.isEmpty() )
{
- _ReadFieldParams aReadParam(sText);
+ SwVbaReadFieldParams aReadParam(sText);
sFieldName = aReadParam.GetFieldName();
OSL_TRACE("SwVbaFields::Add, the field name is %s ",rtl::OUStringToOString( sFieldName, RTL_TEXTENCODING_UTF8 ).getStr() );
}
@@ -410,7 +410,7 @@ uno::Reference< text::XTextField > SwVbaFields::Create_Field_FileName( const rtl
if( !_text.isEmpty() )
{
long nRet;
- _ReadFieldParams aReadParam( _text );
+ SwVbaReadFieldParams aReadParam( _text );
while (-1 != (nRet = aReadParam.SkipToNextToken()))
{
switch (nRet)
@@ -475,7 +475,7 @@ static const DocPropertyTable aDocPropertyTables[] =
uno::Reference< text::XTextField > SwVbaFields::Create_Field_DocProperty( const rtl::OUString _text ) throw (uno::RuntimeException)
{
String aDocProperty;
- _ReadFieldParams aReadParam( _text );
+ SwVbaReadFieldParams aReadParam( _text );
long nRet;
while( -1 != ( nRet = aReadParam.SkipToNextToken() ))
{
More information about the Libreoffice-commits
mailing list