[Libreoffice-commits] .: 6 commits - connectivity/prj desktop/scripts i18npool/Module_i18npool.mk lotuswordpro/source officecfg/registry postprocess/packcomponents postprocess/packregistry postprocess/rebase scp2/source sfx2/inc sfx2/source svtools/source tools/inc tools/source unusedcode.easy wizards/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Aug 18 01:17:33 PDT 2011
connectivity/prj/build.lst | 3
desktop/scripts/soffice.sh | 5
i18npool/Module_i18npool.mk | 2
lotuswordpro/source/filter/bencont.cxx | 69 ---------
lotuswordpro/source/filter/bento.hxx | 6
lotuswordpro/source/filter/lwpgrfobj.cxx | 34 ----
lotuswordpro/source/filter/lwpgrfobj.hxx | 2
lotuswordpro/source/filter/lwplayout.cxx | 36 ----
lotuswordpro/source/filter/lwplayout.hxx | 5
lotuswordpro/source/filter/lwpnumberingoverride.cxx | 51 -------
lotuswordpro/source/filter/lwpnumberingoverride.hxx | 2
lotuswordpro/source/filter/lwpobj.cxx | 6
officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 11 -
postprocess/packcomponents/makefile.mk | 5
postprocess/packregistry/makefile.mk | 4
postprocess/rebase/coffbase.txt | 1
scp2/source/ooo/module_hidden_ooo.scp | 2
sfx2/inc/orgmgr.hxx | 1
sfx2/inc/sfx2/objsh.hxx | 2
sfx2/inc/sfx2/sfxstatuslistener.hxx | 2
sfx2/inc/sorgitm.hxx | 1
sfx2/source/control/sfxstatuslistener.cxx | 43 -----
sfx2/source/control/sorgitm.cxx | 11 -
sfx2/source/doc/objmisc.cxx | 35 ----
sfx2/source/inc/virtmenu.hxx | 5
sfx2/source/menu/virtmenu.cxx | 80 -----------
sfx2/source/view/orgmgr.cxx | 7
svtools/source/filter/sgvtext.cxx | 43 +++--
svtools/source/inc/sgvmain.hxx | 2
tools/inc/tools/config.hxx | 2
tools/source/generic/config.cxx | 45 +++---
unusedcode.easy | 23 ---
wizards/source/euro/Init.xba | 26 ++-
wizards/source/euro/euro.src | 7
34 files changed, 75 insertions(+), 504 deletions(-)
New commits:
commit da019635438cc145de28aaa0864c324bb2219c2b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 18 09:15:26 2011 +0100
ByteString->rtl::OString
diff --git a/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index fdb0052..5c73940 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.hxx
@@ -73,7 +73,7 @@ public:
ByteString ReadKey( const ByteString& rKey ) const;
UniString ReadKey( const ByteString& rKey, rtl_TextEncoding eEncoding ) const;
ByteString ReadKey( const ByteString& rKey, const ByteString& rDefault ) const;
- void WriteKey( const ByteString& rKey, const ByteString& rValue );
+ void WriteKey(const rtl::OString& rKey, const rtl::OString& rValue);
void DeleteKey( const ByteString& rKey );
ByteString GetKeyName( sal_uInt16 nKey ) const;
ByteString ReadKey( sal_uInt16 nKey ) const;
diff --git a/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index 1cf7094..201578d 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.cxx
@@ -56,8 +56,8 @@
struct ImplKeyData
{
ImplKeyData* mpNext;
- ByteString maKey;
- ByteString maValue;
+ rtl::OString maKey;
+ rtl::OString maValue;
sal_Bool mbIsComment;
};
@@ -493,11 +493,11 @@ static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, sal_uIntPtr&
pKey = pGroup->mpFirstKey;
while ( pKey )
{
- nValueLen = pKey->maValue.Len();
+ nValueLen = pKey->maValue.getLength();
if ( pKey->mbIsComment )
nBufLen += nValueLen + nLineEndLen;
else
- nBufLen += pKey->maKey.Len() + nValueLen + nLineEndLen + 1;
+ nBufLen += pKey->maKey.getLength() + nValueLen + nLineEndLen + 1;
pKey = pKey->mpNext;
}
@@ -552,12 +552,12 @@ static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, sal_uIntPtr&
pKey = pGroup->mpFirstKey;
while ( pKey )
{
- nValueLen = pKey->maValue.Len();
+ nValueLen = pKey->maValue.getLength();
if ( pKey->mbIsComment )
{
if ( nValueLen )
{
- memcpy( pBuf, pKey->maValue.GetBuffer(), nValueLen );
+ memcpy( pBuf, pKey->maValue.getStr(), nValueLen );
pBuf += nValueLen;
}
*pBuf = aLineEndBuf[0]; pBuf++;
@@ -568,11 +568,11 @@ static sal_uInt8* ImplGetConfigBuffer( const ImplConfigData* pData, sal_uIntPtr&
}
else
{
- nKeyLen = pKey->maKey.Len();
- memcpy( pBuf, pKey->maKey.GetBuffer(), nKeyLen );
+ nKeyLen = pKey->maKey.getLength();
+ memcpy( pBuf, pKey->maKey.getStr(), nKeyLen );
pBuf += nKeyLen;
*pBuf = '='; pBuf++;
- memcpy( pBuf, pKey->maValue.GetBuffer(), nValueLen );
+ memcpy( pBuf, pKey->maValue.getStr(), nValueLen );
pBuf += nValueLen;
*pBuf = aLineEndBuf[0]; pBuf++;
if ( nLineEndLen == 2 )
@@ -998,7 +998,7 @@ ByteString Config::ReadKey( const ByteString& rKey, const ByteString& rDefault )
ImplKeyData* pKey = pGroup->mpFirstKey;
while ( pKey )
{
- if ( !pKey->mbIsComment && pKey->maKey.EqualsIgnoreCaseAscii( rKey ) )
+ if ( !pKey->mbIsComment && pKey->maKey.equalsIgnoreAsciiCase(rKey) )
return pKey->maValue;
pKey = pKey->mpNext;
@@ -1010,19 +1010,18 @@ ByteString Config::ReadKey( const ByteString& rKey, const ByteString& rDefault )
// -----------------------------------------------------------------------
-void Config::WriteKey( const ByteString& rKey, const ByteString& rStr )
+void Config::WriteKey(const rtl::OString& rKey, const rtl::OString& rStr)
{
#ifdef DBG_UTIL
- ByteString aTraceStr( "Config::WriteKey( " );
- aTraceStr += rKey;
- aTraceStr += ", ";
- aTraceStr += rStr;
- aTraceStr += " ) to ";
- aTraceStr += GetGroup();
- aTraceStr += " in ";
- aTraceStr += ByteString( maFileName, RTL_TEXTENCODING_UTF8 );
- OSL_TRACE( "%s", aTraceStr.GetBuffer() );
- DBG_ASSERTWARNING( rStr != ReadKey( rKey ), "Config::WriteKey() with the same Value" );
+ rtl::OStringBuffer aTraceStr(RTL_CONSTASCII_STRINGPARAM("Config::WriteKey( "));
+ aTraceStr.append(rKey);
+ aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(", "));
+ aTraceStr.append(rStr);
+ aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" ) to "));
+ aTraceStr.append(GetGroup());
+ aTraceStr.append(RTL_CONSTASCII_STRINGPARAM(" in "));
+ aTraceStr.append(rtl::OUStringToOString(maFileName, RTL_TEXTENCODING_UTF8));
+ OSL_TRACE("%s", aTraceStr.getStr());
#endif
// Config-Daten evt. updaten
@@ -1040,7 +1039,7 @@ void Config::WriteKey( const ByteString& rKey, const ByteString& rStr )
ImplKeyData* pKey = pGroup->mpFirstKey;
while ( pKey )
{
- if ( !pKey->mbIsComment && pKey->maKey.EqualsIgnoreCaseAscii( rKey ) )
+ if ( !pKey->mbIsComment && pKey->maKey.equalsIgnoreAsciiCase(rKey) )
break;
pPrevKey = pKey;
@@ -1096,7 +1095,7 @@ void Config::DeleteKey( const ByteString& rKey )
ImplKeyData* pKey = pGroup->mpFirstKey;
while ( pKey )
{
- if ( !pKey->mbIsComment && pKey->maKey.EqualsIgnoreCaseAscii( rKey ) )
+ if ( !pKey->mbIsComment && pKey->maKey.equalsIgnoreAsciiCase(rKey) )
break;
pPrevKey = pKey;
commit 139029d6f64bf1eb38ab7851b0379b19f802fe75
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 18 00:57:50 2011 +0100
ByteString->rtl::OString
diff --git a/svtools/source/filter/sgvtext.cxx b/svtools/source/filter/sgvtext.cxx
index 20879f0..3dbc61a 100644
--- a/svtools/source/filter/sgvtext.cxx
+++ b/svtools/source/filter/sgvtext.cxx
@@ -1161,10 +1161,10 @@ SgfFontOne::SgfFontOne()
SVWidth=40;
}
-void SgfFontOne::ReadOne( ByteString& ID, ByteString& Dsc )
+void SgfFontOne::ReadOne( const rtl::OString& rID, ByteString& Dsc )
{
sal_uInt16 i,j,n;
- ByteString s;
+ rtl::OString s;
if ( Dsc.Len() < 4 || ( Dsc.GetChar( 0 ) != '(' ) )
return;
@@ -1185,30 +1185,31 @@ void SgfFontOne::ReadOne( ByteString& ID, ByteString& Dsc )
SVFName=String(Dsc,i+1,j); // SV-Fontname rausholen
Dsc.Erase(i,j);
- IFID = (sal_uInt32)ID.ToInt32();
+ IFID = (sal_uInt32)rID.toInt32();
n=Dsc.GetTokenCount(' ');
for (i=0;i<n;i++)
{
s = Dsc.GetToken( i,' ' );
- if ( s.Len() )
+ if (!s.isEmpty())
{
- s.ToUpperAscii();
- if ( s.CompareTo( "BOLD", 4 ) == COMPARE_EQUAL ) Bold=sal_True;
- else if ( s.CompareTo( "ITAL", 4 ) == COMPARE_EQUAL ) Ital=sal_True;
- else if ( s.CompareTo( "SERF", 4 ) == COMPARE_EQUAL ) Serf=sal_True;
- else if ( s.CompareTo( "SANS", 4 ) == COMPARE_EQUAL ) Sans=sal_True;
- else if ( s.CompareTo( "FIXD", 4 ) == COMPARE_EQUAL ) Fixd=sal_True;
- else if ( s.CompareTo( "ROMAN", 5 ) == COMPARE_EQUAL ) SVFamil=FAMILY_ROMAN;
- else if ( s.CompareTo( "SWISS", 5 ) == COMPARE_EQUAL ) SVFamil=FAMILY_SWISS;
- else if ( s.CompareTo( "MODERN", 6 ) == COMPARE_EQUAL ) SVFamil=FAMILY_MODERN;
- else if ( s.CompareTo( "SCRIPT", 6 ) == COMPARE_EQUAL ) SVFamil=FAMILY_SCRIPT;
- else if ( s.CompareTo( "DECORA", 6 ) == COMPARE_EQUAL ) SVFamil=FAMILY_DECORATIVE;
- else if ( s.CompareTo( "ANSI", 4 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_MS_1252;
- else if ( s.CompareTo( "IBMPC", 5 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_IBM_850;
- else if ( s.CompareTo( "MAC", 3 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
- else if ( s.CompareTo( "SYMBOL", 6 ) == COMPARE_EQUAL ) SVChSet=RTL_TEXTENCODING_SYMBOL;
- else if ( s.CompareTo( "SYSTEM", 6 ) == COMPARE_EQUAL ) SVChSet = gsl_getSystemTextEncoding();
- else if ( comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.ToInt32());
+ s = s.toAsciiUpperCase();
+ using comphelper::string::matchL;
+ if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("BOLD"))) Bold=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ITAL"))) Ital=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SERF"))) Serf=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SANS"))) Sans=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("FIXD"))) Fixd=sal_True;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ROMAN"))) SVFamil=FAMILY_ROMAN;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SWISS"))) SVFamil=FAMILY_SWISS;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MODERN"))) SVFamil=FAMILY_MODERN;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SCRIPT"))) SVFamil=FAMILY_SCRIPT;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("DECORA"))) SVFamil=FAMILY_DECORATIVE;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("ANSI"))) SVChSet=RTL_TEXTENCODING_MS_1252;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("IBMPC"))) SVChSet=RTL_TEXTENCODING_IBM_850;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("MAC"))) SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYMBOL"))) SVChSet=RTL_TEXTENCODING_SYMBOL;
+ else if (matchL(s, RTL_CONSTASCII_USTRINGPARAM("SYSTEM"))) SVChSet = gsl_getSystemTextEncoding();
+ else if (comphelper::string::isAsciiDecimalString(s) ) SVWidth=sal::static_int_cast< sal_uInt16 >(s.toInt32());
}
}
}
diff --git a/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx
index b4c79e7..749cc42 100644
--- a/svtools/source/inc/sgvmain.hxx
+++ b/svtools/source/inc/sgvmain.hxx
@@ -330,7 +330,7 @@ public:
String SVFName; // z.B. "Times New Roman" = 15 Chars
sal_uInt16 SVWidth; // Durchschnittliche Zeichenbreite in %
SgfFontOne();
- void ReadOne( ByteString& ID, ByteString& Dsc);
+ void ReadOne(const rtl::OString& rID, ByteString& Dsc);
};
class SgfFontLst {
commit b48a6f14e5fff7ec8f2a9f9fcf49a035b7287c97
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 18 00:56:28 2011 +0100
callcatcher: unused code
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index 6a68f2c..f19535b 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -113,12 +113,6 @@ LtcBenContainer::Open() // delete two inputs
return BenErr_OK;
}
-void
-LtcBenContainer::Release()
-{
- delete this;
-}
-
BenError
LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
pCBenPropertyName * ppPropertyName)
@@ -148,34 +142,6 @@ LtcBenContainer::RegisterPropertyName(const char * sPropertyName,
}
BenError
-LtcBenContainer::RegisterTypeName(const char * sTypeName,
- pCBenTypeName * ppTypeName)
-{
- pCBenNamedObjectListElmt pPrevNamedObjectListElmt;
- pCBenNamedObject pNamedObject = FindNamedObject(&cNamedObjects, sTypeName,
- &pPrevNamedObjectListElmt);
-
- if (pNamedObject != NULL)
- {
- if (! pNamedObject->IsTypeName())
- return BenErr_NameConflict;
- else *ppTypeName = (pCBenTypeName) pNamedObject;
- }
- else
- {
- pCBenIDListElmt pPrevObject;
- if (FindID(&cObjects, cNextAvailObjectID, &pPrevObject) != NULL)
- return BenErr_DuplicateObjectID;
-
- *ppTypeName = new CBenTypeName(this, cNextAvailObjectID,
- (pCBenObject) pPrevObject, sTypeName, pPrevNamedObjectListElmt);
- ++cNextAvailObjectID;
- }
-
- return BenErr_OK;
-}
-
-BenError
LtcBenContainer::NewObject(pCBenObject * ppBenObject)
{
pCBenIDListElmt pPrev;
@@ -280,17 +246,6 @@ BenError LtcBenContainer::SeekFromEnd(long Offset)
return BenErr_OK;
}
/**
-* Get position in the bento file
-* @date 07/05/2004
-* @param pointer of current position in container file from end
-* @return BenError
-*/
-BenError LtcBenContainer::GetPosition(BenContainerPos * pPosition)
-{
- *pPosition = cpStream->Tell();
- return BenErr_OK;
-}
-/**
* Find the next value stream with property name
* @date 07/05/2004
* @param string of property name
@@ -338,30 +293,6 @@ LtcUtBenValueStream * LtcBenContainer::FindValueStreamWithPropertyName(const cha
return FindNextValueStreamWithPropertyName(sPropertyName, NULL);
}
/**
-* Find the unique value stream with property name and Object ID
-* @date 10/24/2005
-* @param object ID
-* @param string of property name
-* @return the only value stream pointer with the property names
-*/
-LtcUtBenValueStream * LtcBenContainer::FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName)
-{
- CBenPropertyName * pPropertyName;
- RegisterPropertyName(sPropertyName, &pPropertyName); // Get property name object
- if (NULL == pPropertyName)
- return NULL; // Property not exist
- // Get current object
- CBenObject * pObj = NULL;
- pObj = FindObject(ObjectID); // Get object with object ID
- if (NULL == pObj)
- return NULL;
- CBenValue * pValue;
- LtcUtBenValueStream * pValueStream;
- pValue = pObj->UseValue(pPropertyName->GetID());
- pValueStream = new LtcUtBenValueStream(pValue);
- return pValueStream;
-}
-/**
* <description>
* @date 07/05/2004
* @param pointer to length of bento file
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx
index c870f0d..f9715bf 100644
--- a/lotuswordpro/source/filter/bento.hxx
+++ b/lotuswordpro/source/filter/bento.hxx
@@ -261,10 +261,7 @@ class LtcBenContainer
{
public:
BenError Open();
- void Release(); // Deletes container object--last call
BenError Close();
- BenError RegisterTypeName(const char * sTypeName,
- pCBenTypeName * ppTypeName);
BenError RegisterPropertyName(const char * sPropertyName,
pCBenPropertyName * ppPropertyName);
// Pass NULL to begin iteration. Done when returns NULL.
@@ -285,8 +282,6 @@ public: // Internal methods
BenError SeekToPosition(BenContainerPos Pos);
BenError SeekFromEnd(long Offset);
- BenError GetPosition(BenContainerPos * pPosition);
-
BenObjectID GetNextAvailObjectID() { return cNextAvailObjectID; }
void SetNextAvailObjectID(BenObjectID ID) { cNextAvailObjectID = ID; }
pCUtList GetObjects() { return &cObjects; }
@@ -294,7 +289,6 @@ public: // Internal methods
LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream);
LtcUtBenValueStream * FindValueStreamWithPropertyName(const char * sPropertyName);
- LtcUtBenValueStream * FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName);
BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName);
BenError GetSize(sal_uLong * pLength);
diff --git a/lotuswordpro/source/filter/lwpgrfobj.cxx b/lotuswordpro/source/filter/lwpgrfobj.cxx
index 04fba14..6998e69 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.cxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.cxx
@@ -250,40 +250,6 @@ void LwpGraphicObject::XFConvert (XFContentContainer* pCont)
{
XFConvertEquation(pCont);
}
- if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h')
- {
- //LwpSvStream* pDocStream = m_pStrm;
- //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(),
- // GetRectIn100thMM(), GetRectInCM(), pOutputStream);
- //LwpChartStreamTools::ParseChart(pDocStream, GetObjectID(),
- // GetRectIn100thMM(), GetRectInCM(), pCont, m_strStyleName);
- }
-}
-
-/**
-* @short Get the rectangle of a chart in 100thMM
-* @descr
-* @return the rectangle of the chart
-*/
-Rectangle LwpGraphicObject::GetRectIn100thMM()
-{
-#define To100thMM(num) (long)(2540* (double(num)/(72 * 65536L)))
- sal_Int32 nLeft,nTop,nRight,nBottom;
- GetRect(nLeft,nTop,nRight,nBottom);
- return Rectangle( To100thMM(nLeft),To100thMM(nTop),To100thMM(nRight),To100thMM(nBottom) );
-}
-
-/**
-* @short Get the rectangle of a chart in CM
-* @descr
-* @return The rectangle of the chart
-*/
-XFRect LwpGraphicObject::GetRectInCM()
-{
-#define ToCM(num) (2.54*(double(num)/(72 * 65536L)))
- sal_Int32 nLeft,nTop,nRight,nBottom;
- GetRect(nLeft,nTop,nRight,nBottom);
- return XFRect( ToCM(nLeft),ToCM(nTop),ToCM(nRight-nLeft),ToCM(nBottom-nTop) );
}
/**
diff --git a/lotuswordpro/source/filter/lwpgrfobj.hxx b/lotuswordpro/source/filter/lwpgrfobj.hxx
index b5c3ef4..a0dc634 100644
--- a/lotuswordpro/source/filter/lwpgrfobj.hxx
+++ b/lotuswordpro/source/filter/lwpgrfobj.hxx
@@ -105,8 +105,6 @@ private:
ImageProcessingData m_aIPData;
void GetRect(sal_Int32& nLeft, sal_Int32& nTop, sal_Int32& nRight, sal_Int32& nBottom);
- XFRect GetRectInCM();
- Rectangle GetRectIn100thMM();
void XFConvertEquation(XFContentContainer* pCont);
void ParseChart(IXFStream* pOutputStream);
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 2bb90d7..4a4ebe9 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -955,15 +955,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile(void)
return 0;
}
-void LwpMiddleLayout::SetScaleTile(sal_uInt16 nVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- if (nVal)
- GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() | LwpLayoutScale::TILED);
- else
- GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() & ~LwpLayoutScale::TILED);
-}
-
sal_uInt16 LwpMiddleLayout::GetScaleCenter(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
@@ -975,15 +966,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter(void)
return 0;
}
-void LwpMiddleLayout::SetScaleCenter(sal_uInt16 nVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- if (nVal)
- GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() | LwpLayoutScale::CENTERED);
- else
- GetLayoutScale()->SetPlacement(GetLayoutScale()->GetPlacement() & ~LwpLayoutScale::CENTERED);
-}
-
sal_uInt32 LwpMiddleLayout::GetScalePercentage(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
@@ -994,12 +976,6 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage(void)
return 100;
}
-void LwpMiddleLayout::SetScalePercentage(sal_uInt32 nVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- GetLayoutScale()->SetScalePercentage(nVal*10);
-}
-
double LwpMiddleLayout::GetScaleWidth(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
@@ -1010,12 +986,6 @@ double LwpMiddleLayout::GetScaleWidth(void)
return 0;
}
-void LwpMiddleLayout::SetScaleWidth(double fVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- GetLayoutScale()->SetScaleWidth(LwpTools::ConvertToUnits(fVal));
-}
-
double LwpMiddleLayout::GetScaleHeight(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
@@ -1144,12 +1114,6 @@ LwpPoint LwpMiddleLayout::GetOrigin()
return LwpPoint();
}
-void LwpMiddleLayout::SetScaleHeight(double fVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
- GetLayoutScale()->SetScaleHeight(LwpTools::ConvertToUnits(fVal));
-}
-
/**
* @descr: Whether the fill is pattern fill or not
* @return: True if yes, false if not.
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 39f82e9..2ea8195 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -306,15 +306,10 @@ public:
LwpLayoutScale* GetLayoutScale(){return dynamic_cast<LwpLayoutScale*>(m_LayScale.obj());}
sal_uInt16 GetScaleMode(void);
sal_uInt16 GetScaleTile(void);
- void SetScaleTile(sal_uInt16 nVal);
sal_uInt16 GetScaleCenter(void);
- void SetScaleCenter(sal_uInt16 nVal);
sal_uInt32 GetScalePercentage(void);
- void SetScalePercentage(sal_uInt32 nVal);
double GetScaleWidth(void);
- void SetScaleWidth(double fVal);
double GetScaleHeight(void);
- void SetScaleHeight(double fVal);
sal_Bool CanSizeRight(void);
virtual double GetWidth();
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.cxx b/lotuswordpro/source/filter/lwpnumberingoverride.cxx
index 47f3b9a..a87ee78 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.cxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.cxx
@@ -92,57 +92,6 @@ void LwpNumberingOverride::Read(LwpObjectStream *pStrm)
pStrm->SkipExtra();
}
-void LwpNumberingOverride::Override(LwpNumberingOverride* pOther)
-{
- if (m_nApply & NO_LEVEL)
- {
- if (IsLevelOverridden())
- {
- pOther->OverrideLevel(m_nLevel);
- }
- else
- {
- pOther->RevertLevel();
- }
- }
-
- if (m_nApply & NO_POSITION)
- {
- if (IsPositionOverridden())
- {
- pOther->OverridePosition(m_nPosition);
- }
- else
- {
- pOther->RevertPosition();
- }
- }
-
- if (m_nApply & HEADING)
- {
- if (IsHeadingOverridden())
- {
- pOther->OverrideHeading(IsHeading());
- }
- else
- {
- pOther->RevertHeading();
- }
- }
-
- if (m_nApply & SMARTLEVEL)
- {
- if (IsSmartLevelOverridden())
- {
- pOther->OverrideSmartLevel(IsSmartLevel());
- }
- else
- {
- pOther->RevertSmartLevel();
- }
- }
-}
-
void LwpNumberingOverride::OverrideLevel(sal_uInt16 nNewLv)
{
m_nLevel = nNewLv;
diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
index 68749a1..4cb443f 100644
--- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx
+++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx
@@ -81,8 +81,6 @@ public:
public:
virtual void Read(LwpObjectStream *pStrm);
- void Override(LwpNumberingOverride* pOther);
-
inline sal_uInt16 GetLevel() const;
inline sal_uInt16 GetPosition() const;
diff --git a/lotuswordpro/source/filter/lwpobj.cxx b/lotuswordpro/source/filter/lwpobj.cxx
index b434f65..be52cda 100644
--- a/lotuswordpro/source/filter/lwpobj.cxx
+++ b/lotuswordpro/source/filter/lwpobj.cxx
@@ -61,12 +61,6 @@
#include "lwpobj.hxx"
/**
- * @descr private contor to ensure only object constructed from stream
- */
-LwpObject::LwpObject()
- : m_pObjStrm(NULL), m_pFoundry(NULL), m_pStrm(NULL)
-{}
-/**
* @descr construct lwpobject from stream
*/
LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm)
diff --git a/sfx2/inc/orgmgr.hxx b/sfx2/inc/orgmgr.hxx
index da26a55..d2fe396 100644
--- a/sfx2/inc/orgmgr.hxx
+++ b/sfx2/inc/orgmgr.hxx
@@ -46,7 +46,6 @@ public:
~SfxObjectList();
const String& GetBaseName( sal_uInt16 nId ) const;
- const String& GetFileName( sal_uInt16 nId ) const;
};
class IntlWrapper;
diff --git a/sfx2/inc/sfx2/objsh.hxx b/sfx2/inc/sfx2/objsh.hxx
index 31890aa..104a677 100644
--- a/sfx2/inc/sfx2/objsh.hxx
+++ b/sfx2/inc/sfx2/objsh.hxx
@@ -282,7 +282,6 @@ public:
sal_Bool IsInModalMode() const;
sal_Bool IsInPrepareClose() const;
virtual sal_Bool AcceptStateUpdate() const;
- sal_Bool HasModalViews() const;
sal_Bool IsHelpDocument() const;
sal_Bool IsDocShared() const;
@@ -454,7 +453,6 @@ public:
sal_Bool IsLoading() const;
sal_Bool IsLoadingFinished() const;
void SetAutoLoad( const INetURLObject&, sal_uInt32 nTime, sal_Bool bReload = sal_True );
- void LockAutoLoad( sal_Bool bLock );
sal_Bool IsAutoLoadLocked() const;
void NotifyReloadAvailable();
sal_Bool IsSecure();
diff --git a/sfx2/inc/sfx2/sfxstatuslistener.hxx b/sfx2/inc/sfx2/sfxstatuslistener.hxx
index c8b709e..2fa370e 100644
--- a/sfx2/inc/sfx2/sfxstatuslistener.hxx
+++ b/sfx2/inc/sfx2/sfxstatuslistener.hxx
@@ -62,8 +62,6 @@ class SFX2_DLLPUBLIC SfxStatusListener :
// old methods from SfxControllerItem
sal_uInt16 GetId() const { return m_nSlotID; }
- void Bind();
- void Bind( sal_uInt16 nSlotID, const rtl::OUString& rNewCommand );
void UnBind();
void ReBind();
diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx
index aedb2ab..a162bcc 100644
--- a/sfx2/inc/sorgitm.hxx
+++ b/sfx2/inc/sorgitm.hxx
@@ -40,7 +40,6 @@ private:
public:
TYPEINFO();
SfxScriptOrganizerItem();
- SfxScriptOrganizerItem( const String &rLanguage );
SfxScriptOrganizerItem( const SfxScriptOrganizerItem& );
virtual ~SfxScriptOrganizerItem();
diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx
index c40263f..24bfb7d 100644
--- a/sfx2/source/control/sfxstatuslistener.cxx
+++ b/sfx2/source/control/sfxstatuslistener.cxx
@@ -85,49 +85,6 @@ void SfxStatusListener::StateChanged( sal_uInt16, SfxItemState, const SfxPoolIte
// must be implemented by sub class
}
-void SfxStatusListener::Bind()
-{
- if ( !m_xDispatch.is() && m_xDispatchProvider.is() )
- {
- m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
- try
- {
- Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
- m_xDispatch->addStatusListener( aStatusListener, m_aCommand );
- }
- catch( Exception& )
- {
- }
- }
-}
-
-void SfxStatusListener::Bind( sal_uInt16 nSlotId, const rtl::OUString& rNewCommand )
-{
- // first remove old listener, if we have a dispatch object
- Reference< XStatusListener > aStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
- if ( m_xDispatch.is() )
- m_xDispatch->removeStatusListener( aStatusListener, m_aCommand );
- if ( m_xDispatchProvider.is() )
- {
- // Store new command data and query for new dispatch
- m_nSlotID = nSlotId;
- m_aCommand.Complete = rNewCommand;
- Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.URLTransformer"))), UNO_QUERY );
- xTrans->parseStrict( m_aCommand );
-
- m_xDispatch = m_xDispatchProvider->queryDispatch( m_aCommand, rtl::OUString(), 0 );
-
- try
- {
- m_xDispatch->addStatusListener( aStatusListener, m_aCommand );
- }
- catch( Exception& )
- {
- }
- }
-}
-
void SfxStatusListener::UnBind()
{
if ( m_xDispatch.is() )
diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx
index 4bf1465..65301b9 100644
--- a/sfx2/source/control/sorgitm.cxx
+++ b/sfx2/source/control/sorgitm.cxx
@@ -46,17 +46,6 @@ SfxScriptOrganizerItem::SfxScriptOrganizerItem() :
//------------------------------------------------------------------------
-SfxScriptOrganizerItem::SfxScriptOrganizerItem( const String& rLanguage ) :
-
- SfxStringItem( SID_SCRIPTORGANIZER, rLanguage ),
-
- aLanguage( rLanguage )
-
-{
-}
-
-//------------------------------------------------------------------------
-
SfxScriptOrganizerItem::SfxScriptOrganizerItem( const SfxScriptOrganizerItem& rItem ) :
SfxStringItem( rItem ),
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 14d87ac..2f12a8b 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -483,22 +483,6 @@ sal_Bool SfxObjectShell::AcceptStateUpdate() const
//-------------------------------------------------------------------------
-sal_Bool SfxObjectShell::HasModalViews() const
-{
- SfxViewFrame* pFrame = SfxViewFrame::GetFirst( this );
- while( pFrame )
- {
- if ( pFrame->IsInModalMode() )
- return sal_True;
-
- pFrame = SfxViewFrame::GetNext( *pFrame, this );
- }
-
- return sal_False;
-}
-
-//-------------------------------------------------------------------------
-
void SfxObjectShell::SetMacroMode_Impl( sal_Bool bModal )
{
if ( !pImp->bRunningMacro != !bModal )
@@ -1137,25 +1121,6 @@ void SfxObjectShell::PrepareReload( )
{
}
-//-------------------------------------------------------------------------
-
-void SfxObjectShell::LockAutoLoad( sal_Bool bLock )
-
-/* [Description]
-
- Prevents an possible occuring autoload. Takes also FrameSet into account.
- before the autoload.
-*/
-
-{
- if ( bLock )
- ++pImp->nAutoLoadLocks;
- else
- --pImp->nAutoLoadLocks;
-}
-
-//-------------------------------------------------------------------------
-
// Can be moved to frame.cxx, when 358+36x-State have been merged
sal_Bool SfxFrame::IsAutoLoadLocked_Impl() const
diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx
index 3d3270d..3da800c 100644
--- a/sfx2/source/inc/virtmenu.hxx
+++ b/sfx2/source/inc/virtmenu.hxx
@@ -106,9 +106,6 @@ public:
SfxMenuControl& operator[]( sal_uInt16 nPos ) const;
sal_uInt16 GetItemId( sal_uInt16 nPos ) const;
- SfxVirtualMenu* GetPopupMenu( sal_uInt16 nId ) const;
- String GetItemText( sal_uInt16 nId ) const;
-
SfxVirtualMenu* GetParentMenu() const { return pParent; }
void SetParentMenu( SfxVirtualMenu* pNewParent )
@@ -121,8 +118,6 @@ public:
void InitializeHelp();
void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; }
ResMgr* GetResMgr() { return pResMgr; }
- void SetHelpIds( ResMgr* );
- void UpdateImages();
DECL_LINK( Select, Menu * );
};
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index e427b05..723f490 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -609,51 +609,6 @@ IMPL_LINK( SfxVirtualMenu, SettingsChanged, void*, EMPTYARG )
//--------------------------------------------------------------------
-void SfxVirtualMenu::UpdateImages()
-{
- sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus();
-
- if ( bIcons )
- {
- sal_uInt16 nItemCount = pSVMenu->GetItemCount();
- SfxViewFrame * pViewFrame = pBindings->GetDispatcher()->GetFrame();
- Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() );
-
- for ( sal_uInt16 nSVPos=0; nSVPos < nItemCount; ++nSVPos )
- {
- sal_uInt16 nSlotId = pSVMenu->GetItemId( nSVPos );
- if ( pSVMenu->GetItemType( nSVPos ) == MENUITEM_STRINGIMAGE )
- {
- if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
- {
- // Special code for Add-On menu items. They can appear inside the help menu.
- rtl::OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) );
- rtl::OUString aImageId;
-
- ::framework::MenuConfiguration::Attributes* pMenuAttributes =
- (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId );
-
- if ( pMenuAttributes )
- aImageId = pMenuAttributes->aImageId; // Retrieve image id from menu attributes
-
- pSVMenu->SetItemImage( nSlotId, RetrieveAddOnImage( xFrame, aImageId, aCmd, false ));
- }
- else
- {
- rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
- aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
- pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false ));
- }
- }
- }
-
- if ( pImageControl )
- pImageControl->Update();
- }
-}
-
-//--------------------------------------------------------------------
-
void SfxVirtualMenu::UpdateImages( Menu* pMenu )
{
if ( !pMenu )
@@ -1109,34 +1064,6 @@ sal_uInt16 SfxVirtualMenu::GetItemPos( sal_uInt16 nItemId ) const
//--------------------------------------------------------------------
-// returns the popup-menu assigned to the item or 0 if none
-
-SfxVirtualMenu* SfxVirtualMenu::GetPopupMenu( sal_uInt16 nItemId ) const
-{
- DBG_MEMTEST();
- DBG_CHKTHIS(SfxVirtualMenu, 0);
-
- sal_uInt16 nPos = GetItemPos(nItemId);
- if ( nPos != MENU_ITEM_NOTFOUND )
- return (pItems+nPos)->GetPopupMenu();
- return 0;
-}
-//--------------------------------------------------------------------
-
-// returns the text of the item as currently shown in the menu
-
-String SfxVirtualMenu::GetItemText( sal_uInt16 nSlotId ) const
-{
- DBG_MEMTEST();
- DBG_CHKTHIS(SfxVirtualMenu, 0);
-
- sal_uInt16 nPos = GetItemPos(nSlotId);
- if ( nPos != MENU_ITEM_NOTFOUND )
- return (pItems+nPos)->GetTitle();
- return String();
-}
-//--------------------------------------------------------------------
-
// set the checkmark of the specified item
void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck )
@@ -1241,11 +1168,4 @@ void SfxVirtualMenu::InitializeHelp()
bHelpInitialized = sal_True;
}
-typedef sal_uIntPtr (__LOADONCALLAPI *HelpIdFunc) ( const String& );
-
-void SfxVirtualMenu::SetHelpIds( ResMgr *pRes )
-{
- pResMgr = pRes;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/view/orgmgr.cxx b/sfx2/source/view/orgmgr.cxx
index b33684a..c1015d2 100644
--- a/sfx2/source/view/orgmgr.cxx
+++ b/sfx2/source/view/orgmgr.cxx
@@ -214,13 +214,6 @@ const String &SfxObjectList::GetBaseName(sal_uInt16 i) const
//-------------------------------------------------------------------------
-const String& SfxObjectList::GetFileName( sal_uInt16 i ) const
-{
- return (*this)[i]->aFileName;
-}
-
-//-------------------------------------------------------------------------
-
SfxOrganizeMgr::SfxOrganizeMgr( SfxOrganizeListBox_Impl *pLeft,
SfxOrganizeListBox_Impl *pRight,
SfxDocumentTemplates *pTempl) :
diff --git a/unusedcode.easy b/unusedcode.easy
index 125d038..863627d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -364,15 +364,6 @@ LwpDocument::GetMaxNumberOfPages()
LwpDocument::ParseMasterDoc(IXFStream*)
LwpFootnote::FindFootnoteTable()
LwpFribTable::Parse(IXFStream*)
-LwpGraphicObject::GetRectIn100thMM()
-LwpGraphicObject::GetRectInCM()
-LwpMiddleLayout::SetScaleCenter(unsigned short)
-LwpMiddleLayout::SetScaleHeight(double)
-LwpMiddleLayout::SetScalePercentage(unsigned int)
-LwpMiddleLayout::SetScaleTile(unsigned short)
-LwpMiddleLayout::SetScaleWidth(double)
-LwpNumberingOverride::Override(LwpNumberingOverride*)
-LwpObject::LwpObject()
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
@@ -458,10 +449,6 @@ OpenStormBento::CUtList::GetCount()
OpenStormBento::CUtList::GetIndex(OpenStormBento::CUtListElmt*)
OpenStormBento::CUtList::GetIndex(int)
OpenStormBento::CUtList::GetPrevOrNULL(OpenStormBento::CUtListElmt*)
-OpenStormBento::LtcBenContainer::FindObjectValueStreamWithObjectIDAndProperty(unsigned long, char const*)
-OpenStormBento::LtcBenContainer::GetPosition(unsigned long*)
-OpenStormBento::LtcBenContainer::RegisterTypeName(char const*, OpenStormBento::CBenTypeName**)
-OpenStormBento::LtcBenContainer::Release()
Outliner::Draw(OutputDevice*, Rectangle const&, Point const&)
Outliner::EndSpelling()
Outliner::GetAsianCompressionMode() const
@@ -986,13 +973,10 @@ SfxModule::IsActive() const
SfxModule::RegisterChildWindowContext(unsigned short, SfxChildWinContextFactory*)
SfxModuleArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SfxNavigatorWrapper::GetChildWindowId()
-SfxObjectList::GetFileName(unsigned short) const
SfxObjectShell::Count()
SfxObjectShell::CreateAndLoadObject(SfxItemSet const&, SfxFrame*)
SfxObjectShell::DisconnectFromShared()
-SfxObjectShell::HasModalViews() const
SfxObjectShell::IsSecure()
-SfxObjectShell::LockAutoLoad(unsigned char)
SfxObjectShell::SetFlags(unsigned int)
SfxObjectShell::SetTemplate(unsigned char)
SfxObjectVerbsControl::RegisterControl(unsigned short, SfxModule*)
@@ -1027,14 +1011,11 @@ SfxRecordingFloatWrapper_Impl::GetChildWindowId()
SfxRectangleItem::SfxRectangleItem(unsigned short, SvStream&)
SfxRequest::IsRecording() const
SfxRequest::SetTarget(String const&)
-SfxScriptOrganizerItem::SfxScriptOrganizerItem(String const&)
SfxShell::GetBroadcaster()
SfxShell::RemoveItem(unsigned short)
SfxSingleTabDialog::GetInputRanges(SfxItemPool const&)
SfxSizeItem::SfxSizeItem(unsigned short, SvStream&)
SfxSlotPool::NextInterface()
-SfxStatusListener::Bind()
-SfxStatusListener::Bind(unsigned short, rtl::OUString const&)
SfxStringListItem::Sort(unsigned char)
SfxStyleSheet::SfxStyleSheet()
SfxStyleSheetBasePool::GetStreamName()
@@ -1078,10 +1059,6 @@ SfxViewFrame::Hide()
SfxViewShell::PlugInsActive() const
SfxViewShell::SetAdditionalPrintOptions(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
SfxViewShell::SetScrollingMode(SfxScrollingMode)
-SfxVirtualMenu::GetItemText(unsigned short) const
-SfxVirtualMenu::GetPopupMenu(unsigned short) const
-SfxVirtualMenu::SetHelpIds(ResMgr*)
-SfxVirtualMenu::UpdateImages()
SfxWhichIter::LastWhich()
Slider::SetRangeMax(long)
Slider::SetRangeMin(long)
commit f0cb9d723ed4b561ec771abbb9f1888c66ba348e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 23:21:11 2011 +0100
Related: fdo#33160 Add Estonian Kroon to Euro converter
diff --git a/wizards/source/euro/Init.xba b/wizards/source/euro/Init.xba
index 2de1252..9cd6710 100644
--- a/wizards/source/euro/Init.xba
+++ b/wizards/source/euro/Init.xba
@@ -71,6 +71,7 @@ Public sCurrSLOVENIAN as String
Public sCurrCYPRIOT as String
Public sCurrMALTESE as String
Public sCurrSLOVAK as String
+Public sCurrESTONIAN as String
Public sCurrUNKNOWN as String
Public sCurrSYSUNKNOWN as String
@@ -79,7 +80,7 @@ Public sPrgsCONVERTING as String
Public sPrgsUNPROTECT as String
Public sInclusiveSubDir as String
-Public Const SBCOUNTRYCOUNT = 15
+Public Const SBCOUNTRYCOUNT = 17
Public CurMimeType as String
Public CurCellCount as Long
Public oSheets as Object
@@ -115,8 +116,8 @@ Public CurExtension(2) as String
Public Currfactor as Double
Public CurrSymbolList(2) as String
Public CurrLanguage as String
-Public CurrValue(15,5)
-Public LangIDValue(15,2,2) as String
+Public CurrValue(16,5)
+Public LangIDValue(16,2,2) as String
Public PreName as String
Public Separator as String
Public BitmapDir as String
@@ -195,8 +196,9 @@ Dim LocWorkPath as String
sCurrCYPRIOT = GetResText(1513)
sCurrMALTESE = GetResText(1514)
sCurrSLOVAK = GetResText(1515)
- sCurrUNKNOWN = GetResText(1516)
- sCurrSYSUNKNOWN = GetResText(1517)
+ sCurrESTONIAN = GetResText(1516)
+ sCurrUNKNOWN = GetResText(1517)
+ sCurrSYSUNKNOWN = GetResText(1518)
.cmdCancel.Label = sCANCEL
.cmdHelp.Label = sHELP
.cmdBack.Label = GetResText(1002)
@@ -357,6 +359,11 @@ Sub InitializeLanguages()
LangIDValue(15,0,1) = "SK"
LangIDValue(15,0,2) = "-41B"
+' CURRENCIES_ESTONIAN
+ LangIDValue(16,0,0) = "et"
+ LangIDValue(16,0,1) = "ET"
+ LangIDValue(16,0,2) = "-425"
+
End Sub
@@ -509,6 +516,15 @@ Dim i as Integer
CurrValue(15,4) = "Sk"
CurrValue(15,5) = "SKK"
+ CurrValue(16,0) = sCurrESTONIAN
+ ' real conversion rate
+ CurrValue(16,1) = 15.6466
+ ' rounded conversion rate
+ CurrValue(16,2) = 16
+ CurrValue(16,3) = "kr"
+ CurrValue(16,4) = "kr"
+ CurrValue(16,5) = "EEK"
+
i = -1
CurrSymbolList(0) = ""
CurrSymbolList(1) = ""
diff --git a/wizards/source/euro/euro.src b/wizards/source/euro/euro.src
index 257632f..d984177 100644
--- a/wizards/source/euro/euro.src
+++ b/wizards/source/euro/euro.src
@@ -441,11 +441,16 @@ Text [ en-US ] = "Slovak Koruna";
String CURRENCIES + 16
{
-Text [ en-US ] = "The currency set for the document is not a European currency!";
+Text [ en-US ] = "Estonian Kroon";
};
String CURRENCIES + 17
{
+Text [ en-US ] = "The currency set for the document is not a European currency!";
+};
+
+String CURRENCIES + 18
+{
Text [ en-US ] = "The language set for your operating system is not a language of the European Monetary Union.";
};
commit f7165615197c6352cd8f02b31dc9c94a4f99fc98
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 22:03:05 2011 +0100
Revert "disable i18npool's unit test for now"
This reverts commit 8ae498242b5fb90d4f33b470616b90790ff807e0
because no justification is listed
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
index 8ada1ff..022e85f 100644
--- a/i18npool/Module_i18npool.mk
+++ b/i18npool/Module_i18npool.mk
@@ -57,7 +57,7 @@ $(eval $(call gb_Module_add_targets,i18npool,\
))
endif
-#$(eval $(call gb_Module_add_check_targets,i18npool,\
+$(eval $(call gb_Module_add_check_targets,i18npool,\
CppunitTest_i18npool_test_breakiterator \
))
commit b5736291ed105d5366797201d5f5f92ac2f39d14
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 21:45:24 2011 +0100
registered but uninstalled database drivers break address book wizard
among other things undoubtedly. The idea was IIRC to drop adabas
support, so lets not register the uninstalled components, and
while we're at it not build it either.
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index 0cc4d78..9860897 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -19,7 +19,6 @@ cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase
cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL
cn connectivity\source\drivers\jdbc nmake - all cn_jdbc cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbcbase cn_inc NULL
cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL
cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
@@ -29,4 +28,4 @@ cn connectivity\source\simpledbt nmake - all cn_simpledbt
cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
cn connectivity\qa nmake - all cn_qa cn_inc NULL
-cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab NULL
+cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_flat cn_dbase cn_hsqldb cn_macab NULL
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
index 56ae823..775f974 100755
--- a/desktop/scripts/soffice.sh
+++ b/desktop/scripts/soffice.sh
@@ -45,11 +45,6 @@ export SAL_ENABLE_FILE_LOCKING
# uncomment line below if you encounter problems starting soffice on your system
# SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
-# read database entries for Adabas D
-if [ -f /etc/adabasrc ]; then
- . /etc/adabasrc
-fi
-
# The following is needed on Linux PPC with IBM j2sdk142:
#@# export JITC_PROCESSOR_TYPE=6
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index e0c469b..9be30a2 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -29,17 +29,6 @@
<oor:component-data oor:name="DataAccess" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<node oor:name="ConnectionPool">
<node oor:name="DriverSettings">
- <node oor:name="com.sun.star.comp.sdbcx.adabas.ODriver" oor:op="replace">
- <prop oor:name="DriverName">
- <value>com.sun.star.comp.sdbcx.adabas.ODriver</value>
- </prop>
- <prop oor:name="Enable">
- <value>false</value>
- </prop>
- <prop oor:name="Timeout">
- <value>60</value>
- </prop>
- </node>
<node oor:name="com.sun.star.comp.sdbc.evoab.OEvoabDriver" oor:op="replace">
<prop oor:name="DriverName">
<value>com.sun.star.comp.sdbc.evoab.OEvoabDriver</value>
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 3e65a31..9fbf3d2 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -340,11 +340,6 @@ my_components += \
my_components += component/canvas/source/directx/directx5canvas
.END
-.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
- ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "WNT"
-my_components += adabas
-.END
-
.IF "$(OS)" != "MACOSX" && "$(SYSTEM_MOZILLA)" != "YES" && \
"$(WITH_MOZILLA)" != "NO"
my_components += mozab
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 50a5097..a2941b6 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -320,10 +320,6 @@ MY_FILES_main += \
.ELSE
ERROR : unknown-GUIBASE
.END
-.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || \
- ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "NETBSD"
-MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu
-.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
MY_FILES_main += $(MY_MOD)/org/openoffice/Office/DataAccess-evoab2.xcu
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index 69665f0..2e841e8 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -1,7 +1,6 @@
abpmi.dll 0x0000000067fd0000 0x00020000
acceptor.uno.dll 0x0000000067fb0000 0x00010000
accmi.dll 0x0000000067f00000 0x000a0000
-adabasmi.dll 0x0000000067e90000 0x00060000
adabasuimi.dll 0x0000000067e60000 0x00020000
ado2.dll 0x0000000067dd0000 0x00080000
affine_uno_uno.dll 0x0000000067db0000 0x00010000
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index f9f29be..62d49ad 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -110,7 +110,6 @@ Module gid_Module_Root_Files_2
gid_File_Shellnew_Odp_Soffice,
gid_File_Shellnew_Odt_Soffice,
gid_File_Exe_Java,
- gid_File_Exe_Adabas,
gid_File_Exe_Userinst,
gid_File_Exe_Userdeinst,
gid_File_Regcleanold,
@@ -340,7 +339,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Stringresource,
gid_File_Lib_Ldapbe2,
gid_File_Lib_Comphelper2,
- gid_File_Lib_Adabas,
gid_File_Lib_Cached1,
gid_File_Lib_Curl,
gid_Unixlink_File_Lib_Curl,
More information about the Libreoffice-commits
mailing list