[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - sc/inc
sc/inc/formularesult.hxx | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
New commits:
commit 6ccf504e590a47bb950aa179590f7e61146c043d
Author: Eike Rathke er...@redhat.com
Date: Tue Jan 31 20:40:47 2012 +0100
clone token in ScFormulaResult copy-ctor instead of referring
Replaces commit e2b11f4fd79dce4116badb0ecf6477546ca5d0d4
Prevent excessive references to single token instance during fill.
Because if not, we may run out of the 16-bit integer space to
store reference count.
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
Signed-off-by: Markus Mohrhard markus.mohrh...@googlemail.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 2aa674c..444552f 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -41,6 +41,20 @@ class ScFormulaResult
static const Multiline MULTILINE_FALSE = 1;
static const Multiline MULTILINE_TRUE= 2;
+// Clone token if the 16-bit only reference counter is nearing it's
+// capacity during fill or copypaste, leaving 4k for temporary passing
+// around. (That should be enough for all times (TM) ;-)
+static const sal_uInt16 MAX_TOKENREF_COUNT = 0xf000;
+static void IncrementTokenRef( const formula::FormulaToken* rp )
+{
+if (rp)
+{
+if (rp-GetRef() = MAX_TOKENREF_COUNT)
+rp = rp-Clone();
+rp-IncRef();
+}
+}
+
union
{
double mfValue;// double result direct for performance
and memory consumption
@@ -94,8 +108,12 @@ public:
const ScMatrixFormulaCellToken*
pMatFormula =
r.GetMatrixFormulaCellToken();
if (pMatFormula)
+{
mpToken = new
ScMatrixFormulaCellToken( *pMatFormula);
-mpToken-IncRef();
+mpToken-IncRef();
+}
+else
+IncrementTokenRef( mpToken);
}
}
else
@@ -308,8 +326,7 @@ inline void ScFormulaResult::Assign( const ScFormulaResult
r )
inline void ScFormulaResult::SetToken( const formula::FormulaToken* p )
{
ResetToDefaults();
-if (p)
-p-IncRef();
+IncrementTokenRef( p);
// Handle a result obtained from the interpreter to be assigned to a matrix
// formula cell's ScMatrixFormulaCellToken.
ScMatrixFormulaCellToken* pMatFormula =
GetMatrixFormulaCellTokenNonConst();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - configure.in dbaccess/source setup_native/source
configure.in
|2 -
dbaccess/source/ui/dlg/dbadminsetup.src
|2 -
setup_native/source/win32/customactions/patch/swappatchfiles.cxx
|3 --
setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
| 15 --
setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
|3 --
5 files changed, 2 insertions(+), 23 deletions(-)
New commits:
commit 7c74443e8522fd0f1db60c2d18f736574e3db5f9
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Thu Nov 17 16:37:33 2011 +0700
cppcheck: unused variables
also remove commented-out codes
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
index 7b7d46c..c0c6fd2 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -184,8 +184,6 @@ static bool SwapFiles( const std::_tstring sFileName1,
const std::_tstring sFi
//Try to move the original file to a temp file
fSuccess = MoveFileExA( sFileName1.c_str(), sTempFileName.c_str(),
MOVEFILE_REPLACE_EXISTING);
-std::_tstring mystr;
-
if ( fSuccess )
{
fSuccess = MoveFileExA( sFileName2.c_str(), sFileName1.c_str(),
MOVEFILE_REPLACE_EXISTING );
@@ -713,7 +711,6 @@ extern C UINT __stdcall SetFeatureState( MSIHANDLE handle
)
extern C UINT __stdcall SetNewFeatureState( MSIHANDLE handle )
{
-std::_tstring mystr;
std::_tstring sValueName;
sValueName = TEXT(gm_o_Onlineupdate);
diff --git
a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
index 7b7453a..4c33821 100644
---
a/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
+++
b/setup_native/source/win32/customactions/shellextensions/completeinstallpath.cxx
@@ -83,8 +83,6 @@ extern C UINT __stdcall CompleteInstallPath( MSIHANDLE
handle )
TCHAR szValue[8192];
DWORD nValueSize = sizeof(szValue);
HKEYhKey;
-std::_tstring sInstDir;
-std::_tstring mystr;
// Reading property OFFICEDIRHOSTNAME_, that contains the part of the path
behind
// the program files folder.
@@ -100,8 +98,6 @@ extern C UINT __stdcall CompleteInstallPath( MSIHANDLE
handle )
if ( _tcsstr( sInstallLocation.c_str(), sOfficeDirHostname.c_str() ) )
{
pathCompletionRequired = false; // nothing to do
-// mystr = Nothing to do, officedir is included into installlocation;
-// MessageBox( NULL, mystr.c_str(), It is part of installlocation,
MB_OK );
}
// If the path INSTALLLOCATION does not end with this string,
INSTALLLOCATION is maybe
@@ -124,12 +120,6 @@ extern C UINT __stdcall CompleteInstallPath( MSIHANDLE
handle )
std::_tstring sProductKey32 = Software\\ + sManufacturer + \\ +
sDefinedName +
\\ + 3.2 + \\ + sUpgradeCode;
-// mystr = ProductKey: + sProductKey;
-// MessageBox( NULL, mystr.c_str(), ProductKey, MB_OK );
-
-// mystr = Checking registry;
-// MessageBox( NULL, mystr.c_str(), registry search, MB_OK );
-
bool oldVersionExists = false;
if ( ERROR_SUCCESS == RegOpenKey( HKEY_CURRENT_USER,
sProductKey30.c_str(), hKey ) )
@@ -169,14 +159,9 @@ extern C UINT __stdcall CompleteInstallPath( MSIHANDLE
handle )
sInstallLocation = sInstallLocation + sOfficeDirHostname;
// Setting the new property value
MsiSetProperty(handle, TEXT(INSTALLLOCATION),
sInstallLocation.c_str());
-// mystr = Setting path to: + sInstallLocation;
-// MessageBox( NULL, mystr.c_str(), sInstallLocation, MB_OK );
}
}
-// mystr = Ending with INSTALLLOCATION: + sInstallLocation;
-// MessageBox( NULL, mystr.c_str(), END, MB_OK );
-
return ERROR_SUCCESS;
}
diff --git
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
index 1e30c46..bd5efb7 100644
---
a/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
+++
b/setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
@@ -170,7 +170,6 @@ static BOOL RemoveCompleteDirectory( std::_tstring sPath )
extern C UINT __stdcall RegisterExtensions(MSIHANDLE handle)
{
-// std::_tstring sInstDir = GetMsiProperty( handle,
TEXT(INSTALLLOCATION) );
std::_tstring sInstDir = GetMsiProperty( handle, TEXT(CustomActionData)
);
std::_tstring sUnoPkgFile = sInstDir + TEXT(program\\unopkg.exe);
std::_tstring mystr;
@@ -211,8 +210,6
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source
dbaccess/source/core/api/KeySet.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit acc36a60de35cdc07e41d1838738b7603e87cf4d
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jan 31 21:32:55 2012 +0100
fdo#45453: use integers rather than booleans
for always-true and always-false tests.
Some databases have poor or no support for booleans.
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index b41e68b..8e42b30 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -228,8 +228,8 @@ namespace
void appendOneKeyColumnClause( const ::rtl::OUString tblName, const
::rtl::OUString colName, ::rtl::OUStringBuffer o_buf )
{
static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(.));
-static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( TRUE
= ? AND ));
-static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR
TRUE = ? AND ));
+static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( 1 = ?
AND ));
+static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR
1 = ? AND ));
static ::rtl::OUString s_sParam2(RTL_CONSTASCII_USTRINGPARAM( IS NULL
) ));
o_buf.append(s_sParam0);
o_buf.append(tblName);
@@ -247,16 +247,16 @@ void OKeySet::setOneKeyColumnParameter( sal_Int32 nPos,
const Reference XParam
{
if ( _rValue.isNull() )
{
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
// We do the full call so that the right sqlType is passed to setNull
setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
}
else
{
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - dbaccess/source
dbaccess/source/core/api/KeySet.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 7f0a631e043c2133af9463f3e22d33b502ef5b92
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jan 31 21:32:55 2012 +0100
fdo#45453: use integers rather than booleans
for always-true and always-false tests.
Some databases have poor or no support for booleans.
Signed-off-by: Jan Holesovsky ke...@suse.cz
Signed-off-by: Noel Power nopo...@suse.com
Signed-off-by: Muthu Subramanian K sumu...@suse.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index b41e68b..8e42b30 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -228,8 +228,8 @@ namespace
void appendOneKeyColumnClause( const ::rtl::OUString tblName, const
::rtl::OUString colName, ::rtl::OUStringBuffer o_buf )
{
static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(.));
-static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( TRUE
= ? AND ));
-static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR
TRUE = ? AND ));
+static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( 1 = ?
AND ));
+static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR
1 = ? AND ));
static ::rtl::OUString s_sParam2(RTL_CONSTASCII_USTRINGPARAM( IS NULL
) ));
o_buf.append(s_sParam0);
o_buf.append(tblName);
@@ -247,16 +247,16 @@ void OKeySet::setOneKeyColumnParameter( sal_Int32 nPos,
const Reference XParam
{
if ( _rValue.isNull() )
{
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
// We do the full call so that the right sqlType is passed to setNull
setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
}
else
{
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source sfx2/source svtools/inc svtools/source svx/source unusedcode.easy xmloff/inc xmloff/source xmlsecurity/source
basic/source/comp/exprtree.cxx | 18 ---
basic/source/inc/expr.hxx |1
sfx2/source/doc/docvor.cxx | 12 --
svtools/inc/svtools/svtdata.hxx|1
svtools/source/misc/svtdata.cxx|3
svx/source/unodraw/unoshap2.cxx|2
unusedcode.easy| 16 ---
xmloff/inc/xmloff/xmluconv.hxx | 19
xmloff/source/core/xmluconv.cxx| 46
--
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.cxx |3
xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx |2
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.cxx |3
xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx |2
13 files changed, 4 insertions(+), 124 deletions(-)
New commits:
commit 5833c182edd9f0fe82a38175601753bd676e5eba
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 1 09:39:56 2012 +
callcatcher: update list
diff --git a/basic/source/comp/exprtree.cxx b/basic/source/comp/exprtree.cxx
index d4d0fa5..6e3ad7f 100644
--- a/basic/source/comp/exprtree.cxx
+++ b/basic/source/comp/exprtree.cxx
@@ -789,24 +789,6 @@ SbiExprNode* SbiExpression::VBA_Eqv()
return pNd;
}
-SbiExprNode* SbiExpression::VBA_Imp()
-{
-SbiExprNode* pNd = VBA_Eqv();
-if( m_eMode != EXPRMODE_EMPTY_PAREN )
-{
-for( ;; )
-{
-SbiToken eTok = pParser-Peek();
-if( eTok != IMP )
-break;
-eTok = pParser-Next();
-pNd = new SbiExprNode( pParser, pNd, eTok, VBA_Eqv() );
-}
-}
-return pNd;
-
-}
-
SbiExprNode* SbiExpression::Like()
{
SbiExprNode* pNd = pParser-IsVBASupportOn() ? VBA_Not() : Comp();
diff --git a/basic/source/inc/expr.hxx b/basic/source/inc/expr.hxx
index c6a656c..edd221e 100644
--- a/basic/source/inc/expr.hxx
+++ b/basic/source/inc/expr.hxx
@@ -193,7 +193,6 @@ protected:
SbiExprNode* VBA_Or();
SbiExprNode* VBA_Xor();
SbiExprNode* VBA_Eqv();
-SbiExprNode* VBA_Imp();
SbiExprNode* Comp();
SbiExprNode* Boolean();
public:
diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx
index ab7a6bd..d137aa4 100644
--- a/sfx2/source/doc/docvor.cxx
+++ b/sfx2/source/doc/docvor.cxx
@@ -177,7 +177,6 @@ friend class SfxOrganizeListBox_Impl;
DECL_LINK( AddFilesHdl, sfx2::FileDialogHelper* );
sal_BoolDontDelete_Impl( SvLBoxEntry* pEntry );
-voidOkHdl( Button* );
public:
SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent,
SfxDocumentTemplates* pTempl );
@@ -1993,17 +1992,6 @@ IMPL_LINK( SfxOrganizeDlg_Impl, AccelSelect_Impl,
Accelerator *, pAccel )
Dispatch_Impl( pAccel-GetCurItemId(), NULL ) : 0;
}
-//-
-
-void SfxOrganizeDlg_Impl::OkHdl(Button *pButton)
-{
-if(pFocusBox pFocusBox-IsEditingActive())
-pFocusBox-EndEditing(sal_False);
-pButton-Click();
-}
-
-
-
IMPL_LINK( SfxOrganizeDlg_Impl, MenuActivate_Impl, Menu *, pMenu )
/* [Description]
diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index f647c6e..8689915 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.hxx
@@ -61,7 +61,6 @@ public:
class SVT_DLLPUBLIC SvtResId: public ResId
{
public:
-SvtResId(sal_uInt16 nId, const ::com::sun::star::lang::Locale aLocale);
SvtResId(sal_uInt16 nId);
// VCL dependant, only available in SVT, not in SVL!
};
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 93a8963..6debd9c 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.cxx
@@ -69,9 +69,6 @@ ImpSvtData ImpSvtData::GetSvtData()
return *static_castImpSvtData *(*pAppData);
}
-SvtResId::SvtResId(sal_uInt16 nId, const ::com::sun::star::lang::Locale
aLocale):
-ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {}
-
SvtResId::SvtResId(sal_uInt16 nId): ResId(nId,
*ImpSvtData::GetSvtData().GetResMgr()) {}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 34fd6c5..befaf47 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1399,7 +1399,7 @@ bool SvxShapePolyPolygonBezier::getPropertyValueImpl(
const ::rtl::OUString rNa
}
case OWN_ATTR_VALUE_POLYGONKIND:
{
-rValue = mePolygonKind;
+rValue = GetPolygonKind();
break;
}
default:
diff --git a/unusedcode.easy b/unusedcode.easy
index 32f3dac..ab56dea 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -122,10 +122,8 @@ SalGraphics::DrawNativeControlText(unsigned int, unsigned
[Libreoffice-commits] .: cppunit/makefile.mk
cppunit/makefile.mk | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) New commits: commit 581b43d46e716eb5dc90046d65043b96e3d4e4dc Author: Stephan Bergmann sberg...@redhat.com Date: Wed Feb 1 12:26:20 2012 +0100 Clarified patch status against new upstream diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index 3167149..0be4d45 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -36,11 +36,25 @@ TARFILE_MD5=bd30e9cf5523cdfc019b94f5e1d7fd19 PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch ios.patch cppunit-1.12.1-unused-parameters.patch # solarisfinite.patch: see https://sourceforge.net/tracker/?func=detail; -# aid=2912590group_id=11795atid=311795 +# aid=2912590group_id=11795atid=311795; upstreamed as +# http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= +# a76125c7dd07f79c82f3fed9be5c0a5627089e00 # warnings.patch: see https://sourceforge.net/tracker/?func=detail; -# aid=2912630group_id=11795atid=311795 +# aid=2912630group_id=11795atid=311795; upstreamed as +# http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= +# 9cfcff6c2195ae25be4022654990c9eea6fbb2f8 +# windows.patch: TOOD +# ldflags.patch: upstreamed as http://cgit.freedesktop.org/libreoffice/ +# cppunit/commit/?id=3acfc24e54a9f6d1b2121dda1942e882549870e4 +# aix.patch: TODO +# avoid-synthetised-destructor.patch: upstreamed as +# http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= +# 05b202fc3edce92d8343cb0964d9d15134cd8f1d +# ios.patch: TODO # cppunit-1.12.1-unused-parameters.patch: help static analysis tools (see -# SAL_UNUSED_PARAMETER in sal/types.h) +# SAL_UNUSED_PARAMETER in sal/types.h); upstreamed as +# http://cgit.freedesktop.org/libreoffice/cppunit/commit/?id= +# 7a09bf3a88e99d85c4dec2ad296309dbec2987c3 .IF $(OS) == ANDROID PATCH_FILES += android.patch ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/inc
sd/inc/cusshow.hxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit ab8f1757cedf0029bf3bec40cfe48069a33151be Author: Ivan Timofeev timofeev@gmail.com Date: Wed Feb 1 15:05:27 2012 +0400 add comments diff --git a/sd/inc/cusshow.hxx b/sd/inc/cusshow.hxx index 74c6cfa..64593fa 100644 --- a/sd/inc/cusshow.hxx +++ b/sd/inc/cusshow.hxx @@ -69,8 +69,14 @@ public: // @@@ copy ctor, but no copy assignment? @@@ SdCustomShow( const SdCustomShow rShow ); +/** Provides a direct access to the collection of the SdPage objects. */ PageVec PagesVector(); +/** + * Replaces all occurences of pOldPage with pNewPage. + * If pNewPage is 0 then removes all occurences of pOldPage. + */ void ReplacePage( const SdPage* pOldPage, const SdPage* pNewPage ); +/** Removes all occurences of pPage. */ void RemovePage( const SdPage* pPage ); void SetName(const String rName); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/android' - vcl/android
vcl/android/androidinst.cxx | 39 +++
1 file changed, 15 insertions(+), 24 deletions(-)
New commits:
commit d663871cc701926a42fd3465e44fd4fc894fc30e
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 1 12:16:30 2012 +
android: queue redraw on keypress (for now), and get the ALooper loop right
diff --git a/vcl/android/androidinst.cxx b/vcl/android/androidinst.cxx
index dfb8855..6d70471 100644
--- a/vcl/android/androidinst.cxx
+++ b/vcl/android/androidinst.cxx
@@ -271,7 +271,9 @@ void
AndroidSalInstance::BlitFrameToWindow(ANativeWindow_Buffer *pOutBuffer,
void AndroidSalInstance::RedrawWindows(ANativeWindow *pWindow)
{
-(void)pWindow;
+if (!pWindow)
+return;
+
ANativeWindow_Buffer aOutBuffer;
memset ((void *)aOutBuffer, 0, sizeof (aOutBuffer));
@@ -439,6 +441,9 @@ int32_t AndroidSalInstance::onInputEvent (struct
android_app* app, AInputEvent*
bHandled = pFocus-CallCallback( nEvent, aEvent );
else
fprintf (stderr, no focused frame to emit event on\n);
+
+// FIXME: queueing full re-draw on key events ...
+mbQueueReDraw = true;
break;
}
case AINPUT_EVENT_TYPE_MOTION:
@@ -529,9 +534,8 @@ void AndroidSalInstance::DoReleaseYield (int nTimeoutMS)
// release yield mutex
sal_uLong nAcquireCount = ReleaseYieldMutex();
-fprintf (stderr, DoReleaseYield #2 %d thread: %d ms\n,
+fprintf (stderr, DoReleaseYield #3 %d thread: %d ms\n,
nTimeoutMS, (int)pthread_self());
-#ifndef PLASMA
struct android_poll_source *pSource = NULL;
int outFd = 0, outEvents = 0;
@@ -540,34 +544,21 @@ void AndroidSalInstance::DoReleaseYield (int nTimeoutMS)
nTimeoutMS = 0;
int nRet;
-while ((nRet = ALooper_pollAll (nTimeoutMS, outFd, outEvents,
(void**)pSource)) = 0)
-{
-fprintf (stderr, ret #5 %d %d %d %p\n, nRet, outFd, outEvents,
pSource);
-// acquire yield mutex again
-AcquireYieldMutex(nAcquireCount);
+nRet = ALooper_pollAll (nTimeoutMS, outFd, outEvents, (void**)pSource);
+fprintf (stderr, ret #6 %d %d %d %p\n, nRet, outFd, outEvents, pSource);
+// acquire yield mutex again
+AcquireYieldMutex(nAcquireCount);
+
+if (nRet = 0)
+{
// Process this event.
if (pSource != NULL)
pSource-process(mpApp, pSource);
-
-nAcquireCount = ReleaseYieldMutex();
}
-// acquire yield mutex again
-AcquireYieldMutex(nAcquireCount);
-
-if (mbQueueReDraw)
+if (mbQueueReDraw mpApp-window)
AndroidSalInstance::getInstance()-RedrawWindows (mpApp-window);
-
-#else
-static int nPlasma = 0;
-char buffer[128];
-sprintf (buffer, yield %d, nPlasma++);
-plasma_now(buffer);
-
-// acquire yield mutex again
-AcquireYieldMutex(nAcquireCount);
-#endif
}
bool AndroidSalInstance::AnyInput( sal_uInt16 nType )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/unoidl/unopage.cxx | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit fd33c0b1cf23020b27db25895eeb380653d734b6
Author: Muthu Subramanian sumu...@suse.com
Date: Wed Feb 1 18:01:17 2012 +0530
n#735533: Donot set duplicate master slide names.
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 4867338..a13a4fa 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -3015,7 +3015,7 @@ void SdMasterPage::getBackground( Any rValue ) throw()
}
// XNamed
-void SAL_CALL SdMasterPage::setName( const OUString aName )
+void SAL_CALL SdMasterPage::setName( const OUString rName )
throw(uno::RuntimeException)
{
::SolarMutexGuard aGuard;
@@ -3024,11 +3024,18 @@ void SAL_CALL SdMasterPage::setName( const OUString
aName )
if(SvxFmDrawPage::mpPage GetPage()-GetPageKind() != PK_NOTES)
{
-String aNewName( aName );
+SdDrawDocument* pDoc = GetModel()-GetDoc();
+sal_Bool bOutDummy;
+String aNewName( rName );
+
+// Slide Name has to be unique
+if( pDoc pDoc-GetPageByName( aNewName, bOutDummy ) !=
SDRPAGE_NOTFOUND )
+return; // throw Exception ?
+
GetPage()-SetName( aNewName );
-if(GetModel()-GetDoc())
-
GetModel()-GetDoc()-RenameLayoutTemplate(GetPage()-GetLayoutName(),
aNewName);
+if( pDoc )
+pDoc-RenameLayoutTemplate( GetPage()-GetLayoutName(), aNewName );
// fake a mode change to repaint the page tab bar
::sd::DrawDocShell* pDocSh = GetModel()-GetDocShell();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/dlg/sdpreslt.cxx | 43 +++---
sd/source/ui/inc/sdpreslt.hxx |5 ++--
2 files changed, 19 insertions(+), 29 deletions(-)
New commits:
commit e8b7f1faaf3b0fd837a236a4a53d0f7392723713
Author: Noel Grandin n...@peralex.com
Date: Wed Feb 1 12:58:45 2012 +
convert SdPresLayoutDlg from tools/list.hxx to boost::ptr_vector
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index 98f2df5..db30dff 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -76,8 +76,6 @@ SdPresLayoutDlg::SdPresLayoutDlg(
{
FreeResource();
-mpLayoutNames = new List;
-
maVS.SetDoubleClickHdl(LINK(this, SdPresLayoutDlg, ClickLayoutHdl));
maBtnLoad.SetClickHdl(LINK(this, SdPresLayoutDlg, ClickLoadHdl));
@@ -92,14 +90,6 @@ SdPresLayoutDlg::SdPresLayoutDlg(
SdPresLayoutDlg::~SdPresLayoutDlg()
{
-String* pName = (String*)mpLayoutNames-First();
-while (pName)
-{
-delete pName;
-pName = (String*)mpLayoutNames-Next();
-}
-
-delete mpLayoutNames;
}
/*
@@ -131,10 +121,10 @@ void SdPresLayoutDlg::Reset()
FillValueSet();
-mnLayoutCount = mpLayoutNames-Count();
+mnLayoutCount = maLayoutNames.size();
for( nName = 0; nName mnLayoutCount; nName++ )
{
-if (*((String*)mpLayoutNames-GetObject(nName)) == maName)
+if (maLayoutNames[nName] == maName)
break;
}
DBG_ASSERT(nName mnLayoutCount, Layout nicht gefunden);
@@ -161,11 +151,11 @@ void SdPresLayoutDlg::GetAttr(SfxItemSet rOutAttrs)
{
aLayoutName = maName;
aLayoutName.Append( DOCUMENT_TOKEN );
-aLayoutName.Append( *(String*)mpLayoutNames-GetObject( nId - 1 ) );
+aLayoutName.Append( maLayoutNames[ nId - 1 ] );
}
else
{
-aLayoutName = *(String*)mpLayoutNames-GetObject( nId - 1 );
+aLayoutName = maLayoutNames[ nId - 1 ];
if( aLayoutName == maStrNone )
aLayoutName.Erase(); // so wird - keine - codiert (s.u.)
}
@@ -202,10 +192,10 @@ void SdPresLayoutDlg::FillValueSet()
{
String aLayoutName(pMaster-GetLayoutName());
aLayoutName.Erase( aLayoutName.SearchAscii( SD_LT_SEPARATOR ) );
-mpLayoutNames-Insert(new String(aLayoutName), LIST_APPEND);
+maLayoutNames.push_back(new String(aLayoutName));
Bitmap aBitmap(mpDocSh-GetPagePreviewBitmap(pMaster, 90));
-maVS.InsertItem((sal_uInt16)mpLayoutNames-Count(), aBitmap,
aLayoutName);
+maVS.InsertItem((sal_uInt16)maLayoutNames.size(), aBitmap,
aLayoutName);
}
}
@@ -274,21 +264,20 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG)
{
// Pruefen, ob Vorlage schon vorhanden
sal_Bool bExists = sal_False;
-String* pName = (String*)mpLayoutNames-First();
String aCompareStr( maName );
if( maName.Len() == 0 )
aCompareStr = maStrNone;
-while( pName !bExists )
+sal_uInt16 aPos = 0;
+for (boost::ptr_vectorString::iterator it = maLayoutNames.begin();
+ it != maLayoutNames.end() !bExists; ++it, ++aPos)
{
-if( aCompareStr == *pName )
+if( aCompareStr == *it )
{
bExists = sal_True;
// Vorlage selektieren
-sal_uInt16 nId = (sal_uInt16) mpLayoutNames-GetCurPos() + 1;
-maVS.SelectItem( nId );
+maVS.SelectItem( aPos + 1 );
}
-pName = (String*)mpLayoutNames-Next();
}
if( !bExists )
@@ -313,10 +302,10 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG)
{
String aLayoutName(pMaster-GetLayoutName());
aLayoutName.Erase( aLayoutName.SearchAscii(
SD_LT_SEPARATOR ) );
-mpLayoutNames-Insert(new String(aLayoutName),
LIST_APPEND);
+maLayoutNames.push_back(new String(aLayoutName));
Bitmap
aBitmap(pTemplDocSh-GetPagePreviewBitmap(pMaster, 90));
-
maVS.InsertItem((sal_uInt16)mpLayoutNames-Count(), aBitmap, aLayoutName);
+maVS.InsertItem((sal_uInt16)maLayoutNames.size(),
aBitmap, aLayoutName);
}
}
}
@@ -330,15 +319,15 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG)
else
{
// leeres Layout
-mpLayoutNames-Insert( new String( maStrNone ), LIST_APPEND );
-maVS.InsertItem( (sal_uInt16) mpLayoutNames-Count(),
+maLayoutNames.push_back( new String( maStrNone ) );
+maVS.InsertItem(
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.3'
Tag 'libreoffice-3.5.0.3' created by Petr Mladek pmla...@suse.cz at 2012-02-01 12:57 +0100 Tag 3.5.0.3 (3.5.0-rc3) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPKTagAAoJEPQ0oe+v7q6jvRIQAJVa7AlS94MRZn+wgQuk8Pi4 iG4E2pf4n2Hw1boq4WIWxY3vkl0AnIwl4ffBav40FTC5UDijxSLcOObejXTCbJKN MkP8utVsgYa3KEOCxwgoBLpIj0YWKYI7+rFY4A4FWjnJCzh5jZOBYt+tbI38IH5r 2DyLt1/vDFcKxcx1MURtT4f5kWikXbqYc8Y2JrU0Oev5DAfFHmQvY5oUdjSMirad yJfFEqKSi8WsRTmFFZ0D9Fn0JyfFk9tArX+KCaQMq6n5i41XGNFU42wJBYTRmImN ZDCBhbC7MeQmxuU2RySCFLB67fAlvPAZuHgPeoW+JsH8Zq85JO8EJnIQV/dsUJcB 86t1TZbEnv3k95WMTXeLqxjl5Mur20gYFIP2SXL8i4DC9RdBZN5Vaz+2kU74mDuw jDBraEyO8D2/yBUaihQDACkuDSQpKwwsoEa0TVjkRWi7JKGtqJMeQyVxAGVe2e5U 3qDXy2xrxuYQl9W/QhVfLdNeR3GsuetBRQ9mRheiGMnvMcfaiYV+60covkEFyuEc msoCfNtRE/5U+Nnt2b1U/wtizoeZrV8X7WDqYvvWNQUQHNycGStF9XeLaMto4nrg 0LjZbhwU+Z0A1MUg5FWTNJA1JgE3uuE+WkwB6j1/a1p9eAVbzYVj/1lKE7dRvm4n FtrGtcm4JztUKjjSRDfq =D7zv -END PGP SIGNATURE- Changes since libreoffice-3.5.0.2-39: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.3'
Tag 'libreoffice-3.5.0.3' created by Petr Mladek pmla...@suse.cz at 2012-02-01 12:57 +0100 Tag 3.5.0.3 (3.5.0-rc3) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPKTahAAoJEPQ0oe+v7q6jdAcP/1MQn48sm02nZelBwimjm+Rf BnWe/n3dZ4rcFWVbh2wia5z9ZMJZeVdEgW/F+2XfnVaCkEB37KHSjqG2Tg83+h8v c45JjE59hHvybnZVbGuKi0GC87BxurSmjxI6rEEel+P0xiyGw2buYFGi2eudDlbp 50R3zXcTsUNpqfAVhSwZktm409R0Q2JlTX8aAXSwIV+KenFwuv2+GIyddwk6cXgH a8Lxo9xcTWuiDqEM6ItT1gYmGXeIwmMUbCPWhmIOyngL336ttf4MpQgGrpv/6x7j iFjLtqJuSxX11UxURMWoNslUhtTUET2FAc6wtGcXFDoOTB1p3i3Jv1Ea/0F6Zq5Y HB5HVFbCEv7yYZthvXO8qF19jysXSLLhp7Favmmt42kc8/f0lUn5ISmpfJqrrUpe CIrcYiMFZB979ZQvG4Uw4Y9A3tVe9b5uJlaNKRe/aRAJH3DHxh57HlxF236qNrqN VMxAoIm9m7VEUEMJNPApV5GQznD1Db9pCmRlZNKHtyk6+tiVAu+pnMwRKnOcjsy2 Bcyx7tSvTwwHvcMnv3UQGVB5SBO0nE6x2X2LbjivkfXEBoULVlRpYHJ7H244nDJS GEpBq5RtdlfXInQytZBLK0xkquQkM5QgJdoNrSeEb9jTrKmBsHjqZhotd2fbilRM VBVXaYMvwmiJ1mLjM53L =DSTw -END PGP SIGNATURE- Changes since libreoffice-3.5.0.2-1: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.0.3'
Tag 'libreoffice-3.5.0.3' created by Petr Mladek pmla...@suse.cz at 2012-02-01 12:57 +0100 Tag 3.5.0.3 (3.5.0-rc3) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPKTahAAoJEPQ0oe+v7q6jZJUP/34Vy6Cbc8kv9c9GoH8fCKEL ORkGu74q5ouEX8AnSge4ny6FztatzLqrbWTnuw5NkajQaBu6ha2EaxGfENl85j4W JQ4JKOinMjLDOtQ5w3k+3DWlra/HgsuvRErdDPWD1TtlrmwT1q/GXdN6sLNbcfK5 U2LFv7JKjN5/YiUfCmXB1jC+wzQ2dxSCW1MOh8Q76JdxtyQKQS9jI2WgwdPPmQ5k mxfpSKdlsneWj1mLHS9rVwQnzSeZFqJaWAyZNiKTa70Aw6JXKqQ7bmz9W0jDkQT8 RQtNtuKLR7HBsUqKIgz+Ctb4Gpwr5CU+xqzBHRSBGbxoyuSGVBDXWKoXXXFbxAP4 +/uGGaeJI3/SqIsxr3Vj8OUdI5ZScQvnIwVx0cZ4xrn6vTIA5OpawgksY72WVVPX IwDjSkL5BGREN5AkzsDKkJOJrfsoq53x0pYpsQoM6CMuwSoqOxP8e2FTn9zax6eP ZG30eoVhSez+arqsQ/YOZV72XQGIVrImb8LJEf2xVyS66TcgGmBckDmYezyq5KM+ KNuPoMH7jDyflhxPiblJ55k+Bw+71gWEY553DLwuf4v7mctUx+N/7YjN+2mJUcgC 4BDuANCwAIEaF9vKcTTMrqEDkOhYHpir0WkWOlUbNz6zpYlSCSoyT69A0MCNSxxN rOQqzYF2jt4CC+6Ow3E/ =CTBK -END PGP SIGNATURE- Changes since libreoffice-3.5.0.2-3: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source cosv/inc desktop/source framework/inc framework/qa framework/source guw/guw.cc l10ntools/source libxml2/libxml2-long-path.patch linguistic/source odk/examples off
basic/source/uno/namecont.cxx|2 -
cosv/inc/cosv/persist.hxx|2 -
desktop/source/deployment/registry/package/dp_package.cxx|2 -
framework/inc/classes/filtercachedata.hxx|6 +--
framework/inc/classes/protocolhandlercache.hxx |2 -
framework/inc/services/pathsettings.hxx |2 -
framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java |2 -
framework/source/accelerators/storageholder.cxx |2 -
framework/source/services/desktop.cxx|2 -
framework/source/services/frame.cxx |4 +-
framework/source/services/pathsettings.cxx | 16
+-
guw/guw.cc |2 -
l10ntools/source/filter/utils/FileHelper.java|4 +-
libxml2/libxml2-long-path.patch |2 -
linguistic/source/misc2.cxx |6 +--
odk/examples/DevelopersGuide/Forms/URLHelper.java|2 -
officecfg/registry/schema/org/openoffice/Office/Paths.xcs|4 +-
qadevOOo/runner/helper/URLHelper.java|4 +-
rsc/inc/rscrsc.hxx |2 -
setup_native/scripts/admin.pl|4 +-
solenv/bin/make_installer.pl |4 +-
solenv/bin/modules/installer/archivefiles.pm |2 -
solenv/bin/modules/installer/control.pm |2 -
solenv/bin/modules/installer/converter.pm|2 -
solenv/bin/modules/installer/downloadsigner.pm | 16
+-
solenv/bin/modules/installer/environment.pm |2 -
solenv/bin/modules/installer/epmfile.pm |2 -
solenv/bin/modules/installer/packagelist.pm |4 +-
solenv/bin/modules/installer/parameter.pm|2 -
solenv/bin/modules/installer/scriptitems.pm |6 +--
solenv/bin/modules/installer/windows/admin.pm|2 -
solenv/bin/modules/installer/windows/directory.pm|2 -
solenv/bin/modules/installer/windows/msp.pm |2 -
solenv/bin/modules/installer/windows/update.pm |2 -
solenv/bin/modules/installer/ziplist.pm |6 +--
solenv/bin/modules/par2script/parameter.pm |4 +-
solenv/bin/modules/par2script/work.pm|6 +--
solenv/bin/modules/pre2par/parameter.pm |2 -
solenv/bin/packimages.pl |2 -
solenv/inc/settings.mk |2 -
stoc/source/security/permissions.cxx |4 +-
svtools/source/control/inettbc.cxx |4 +-
tools/source/fsys/filecopy.cxx |2 -
udkapi/com/sun/star/beans/XHierarchicalPropertySet.idl |2 -
unotools/inc/unotools/configitem.hxx |2 -
unotools/inc/unotools/configpathes.hxx |6 +--
unotools/inc/unotools/pathoptions.hxx|4 +-
unotools/source/config/configitem.cxx|4 +-
unotools/source/config/configpathes.cxx |4 +-
unotools/source/config/defaultoptions.cxx|4 +-
unotools/source/config/moduleoptions.cxx |4 +-
unotools/source/config/pathoptions.cxx |4 +-
wizards/com/sun/star/wizards/web/WWD_Startup.java|2 -
wizards/com/sun/star/wizards/web/WWD_Startup.py |2 -
54 files changed, 96 insertions(+), 96 deletions(-)
New commits:
commit 7be0cc289d9745e0842c4fa6c0a6ac3450f3801b
Author: Jesús Corrius je...@softcatala.org
Date: Wed Feb 1 14:42:58 2012 +0100
A few safe replacements of pathes-paths
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index f65a6eb..db0bf66 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -661,7 +661,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
}
else
{
-// Default pathes
+// Default paths
maLibraryPath = SvtPathOptions().GetBasicPath();
}
diff --git a/cosv/inc/cosv/persist.hxx b/cosv/inc/cosv/persist.hxx
index 9a3905d..dd20c3e 100644
--- a/cosv/inc/cosv/persist.hxx
+++ b/cosv/inc/cosv/persist.hxx
@@ -65,7 +65,7 @@ class Persistent
virtual ~Persistent() {}
const Path MyPath()
[Libreoffice-commits] .: desktop/source
desktop/source/migration/migration.cxx | 62 +
1 file changed, 40 insertions(+), 22 deletions(-)
New commits:
commit 1205e9a816e6c38b8aa7ba6790017e5ed6c06033
Author: Petr Mladek pmla...@suse.cz
Date: Fri Jan 27 18:07:03 2012 +0100
allow to migrate the shared registrymodifications.xcu
LO-3.3 and older wrote configuration into many files under
user/registry/data. LO-3.4 spped up startup by moving these
files into a single /user/registrymodifications.xcu.
officecfg/registry/data/org/openoffice/Setup.xcu defines what registry
nodes are migrated and what are excluded.
Finally, the old migration code detected the name of the .xcu file
by the first entry in IncludedNodes. This fix allows to search
the data in the single registrymodifications.xcu when available.
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index c8d0c93..4df893a 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -772,33 +772,51 @@ void MigrationImpl::copyConfig() {
}
}
}
+
+// check if the shared registrymodifications.xcu file exists
+bool bRegistryModificationsXcuExists = false;
+rtl::OUString regFilePath(m_aInfo.userdata);
+regFilePath +=
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/user/registrymodifications.xcu));
+File regFile(regFilePath);
+::osl::FileBase::RC nError = regFile.open(osl_File_OpenFlag_Read);
+if ( nError == ::osl::FileBase::E_None ) {
+bRegistryModificationsXcuExists = true;
+regFile.close();
+}
+
for (Components::const_iterator i(comps.begin()); i != comps.end(); ++i) {
if (!i-second.includedPaths.empty()) {
-rtl::OUStringBuffer buf(m_aInfo.userdata);
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(/user/registry/data));
-sal_Int32 n = 0;
-do {
-rtl::OUString seg(i-first.getToken(0, '.', n));
-rtl::OUString enc(
-rtl::Uri::encode(
-seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
-RTL_TEXTENCODING_UTF8));
-if (enc.isEmpty() !seg.isEmpty()) {
-OSL_TRACE(
-(configuration migration component %s ignored (cannot
- be encoded as file path)),
-rtl::OUStringToOString(
-i-first, RTL_TEXTENCODING_UTF8).getStr());
-goto next;
-}
-buf.append(sal_Unicode('/'));
-buf.append(enc);
-} while (n = 0);
-buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(.xcu));
+if (!bRegistryModificationsXcuExists) {
+// shared registrymodifications.xcu does not exists
+// the configuration is split in many registry files
+// determine the file names from the first element in included
paths
+rtl::OUStringBuffer buf(m_aInfo.userdata);
+
buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(/user/registry/data));
+sal_Int32 n = 0;
+do {
+rtl::OUString seg(i-first.getToken(0, '.', n));
+rtl::OUString enc(
+rtl::Uri::encode(
+seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict,
+RTL_TEXTENCODING_UTF8));
+if (enc.isEmpty() !seg.isEmpty()) {
+OSL_TRACE(
+(configuration migration component %s ignored
(cannot
+ be encoded as file path)),
+rtl::OUStringToOString(
+i-first, RTL_TEXTENCODING_UTF8).getStr());
+goto next;
+}
+buf.append(sal_Unicode('/'));
+buf.append(enc);
+} while (n = 0);
+buf.appendAscii(RTL_CONSTASCII_STRINGPARAM(.xcu));
+regFilePath = buf.toString();
+}
configuration::Update::get(
comphelper::getProcessComponentContext())-
insertModificationXcuFile(
-buf.makeStringAndClear(),
setToSeq(i-second.includedPaths),
+regFilePath, setToSeq(i-second.includedPaths),
setToSeq(i-second.excludedPaths));
} else {
OSL_TRACE(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) New commits: commit f52a0e6b0af356d10bcf5d1dd79d4737f758e0e6 Author: Petr Mladek pmla...@suse.cz Date: Wed Feb 1 15:39:17 2012 +0100 bump product version to 3.5.0-rc3+, release number to 13 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 10b82d6..6f69eb4 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -53,13 +53,13 @@ LibreOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.0 - ABOUTBOXPRODUCTVERSIONSUFFIX rc2+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc3+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -112,13 +112,13 @@ LibreOffice_wJRE PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.0 - ABOUTBOXPRODUCTVERSIONSUFFIX rc2+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc3+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst @@ -170,14 +170,14 @@ LibreOffice_Dev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.0 - ABOUTBOXPRODUCTVERSIONSUFFIX rc2+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc3+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -240,7 +240,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.5 LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc2 +SHORT_PRODUCTEXTENSION rc3 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -275,7 +275,7 @@ LibreOffice_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc2 +SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 @@ -318,7 +318,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc2 +SHORT_PRODUCTEXTENSION rc3 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -367,7 +367,7 @@ LibreOffice_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc2 +SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 @@ -410,7 +410,7 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc2 +SHORT_PRODUCTEXTENSION rc3 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -458,13 +458,13 @@ OxygenOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc3 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/salinst.cxx |9 -
1 file changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 56549a939cdf3a2510bbdba21b72632a4f238cf5
Author: Andras Timar ati...@suse.com
Date: Wed Feb 1 15:56:34 2012 +0100
ByteString - OUString
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index d0a6bd0..d491404 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -87,16 +87,15 @@ void SalAbort( const rtl::OUString rErrorText, bool )
if ( rErrorText.isEmpty() )
{
-// #112255# make sure crash reporter is triggered
+// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExit( 0, Application Error );
+FatalAppExitW( 0, LApplication Error );
}
else
{
-// #112255# make sure crash reporter is triggered
+// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-ByteString aErrorText( ImplSalGetWinAnsiString( rErrorText ) );
-FatalAppExit( 0, aErrorText.GetBuffer() );
+FatalAppExitW( 0, rErrorText.getStr() );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salframe.cxx |6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
New commits:
commit e1e8bd19a6acf5526f6bb3d9006ecb37ff01c89d
Author: Andras Timar ati...@suse.com
Date: Wed Feb 1 16:00:59 2012 +0100
kill ByteString by dropping support of Win9x
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 6c8dce8..c21f95b 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1107,11 +1107,7 @@ void WinSalFrame::SetTitle( const rtl::OUString rTitle )
{
DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ),
WinSalFrame::SetTitle(): WCHAR != sal_Unicode );
-if ( !SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) ) )
-{
-ByteString aAnsiTitle = ImplSalGetWinAnsiString( rTitle );
-SetWindowTextA( mhWnd, aAnsiTitle.GetBuffer() );
-}
+SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) )
}
// ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/inc vcl/win
vcl/inc/win/saldata.hxx|1 -
vcl/win/source/app/saldata.cxx | 25 -
2 files changed, 26 deletions(-)
New commits:
commit a31acd6b405777aa3ccb7298fabbe8b4aba55a32
Author: Andras Timar ati...@suse.com
Date: Wed Feb 1 16:14:19 2012 +0100
remove unused ImplSalGetWinAnsiString
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index cc3a9e4..a38a6f7 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -244,7 +244,6 @@ bool ImplIsFontAvailable( HDC hDC, const UniString rName );
// \WIN\SOURCE\APP\SALDATA.CXX
rtl_TextEncoding ImplSalGetSystemEncoding();
-rtl::OString ImplSalGetWinAnsiString( const UniString rStr, sal_Bool
bFileName = FALSE );
UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen =
STRING_LEN );
int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 854849f..4445315 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -53,31 +53,6 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
// ---
-rtl::OString ImplSalGetWinAnsiString( const UniString rStr, sal_Bool
bFileName )
-{
-rtl_TextEncoding eEncoding = ImplSalGetSystemEncoding();
-if ( bFileName )
-{
-return rtl::OUStringToOString( rStr, eEncoding,
- RTL_UNICODETOTEXT_FLAGS_UNDEFINED_UNDERLINE |
- RTL_UNICODETOTEXT_FLAGS_INVALID_UNDERLINE |
- RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |
- RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR |
- RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 );
-}
-else
-{
-return rtl::OUStringToOString( rStr, eEncoding,
- RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
- RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |
- RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |
- RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR |
- RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 );
-}
-}
-
-// ---
-
UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen )
{
return UniString( pStr, nLen, ImplSalGetSystemEncoding(),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/inc basegfx/source unusedcode.easy
basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx |3 -
basegfx/inc/basegfx/point/b2ipoint.hxx |5 --
basegfx/inc/basegfx/point/b3ipoint.hxx |5 --
basegfx/inc/basegfx/polygon/b2dpolygon.hxx | 20
basegfx/inc/basegfx/polygon/b3dpolygon.hxx |3 -
basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx |3 -
basegfx/inc/basegfx/range/b1drange.hxx |8 ---
basegfx/inc/basegfx/range/b2drange.hxx |6 --
basegfx/inc/basegfx/range/b3drange.hxx |8 ---
basegfx/inc/basegfx/tools/canvastools.hxx| 10
basegfx/inc/basegfx/tools/unopolypolygon.hxx |3 -
basegfx/inc/basegfx/tuple/b2i64tuple.hxx |2
basegfx/inc/basegfx/tuple/b2ituple.hxx |2
basegfx/inc/basegfx/tuple/b3dtuple.hxx |7 --
basegfx/inc/basegfx/tuple/b3i64tuple.hxx |8 ---
basegfx/inc/basegfx/tuple/b3ituple.hxx |8 ---
basegfx/inc/basegfx/vector/b2dvector.hxx |8 ---
basegfx/inc/basegfx/vector/b2ivector.hxx | 14 -
basegfx/inc/basegfx/vector/b3ivector.hxx |5 --
basegfx/source/matrix/b2dhommatrixtools.cxx | 26 --
basegfx/source/polygon/b2dpolygon.cxx| 24 -
basegfx/source/polygon/b3dpolygon.cxx|5 --
basegfx/source/polygon/b3dpolypolygon.cxx| 24 -
basegfx/source/range/b1drange.cxx| 18 ---
basegfx/source/range/b2drange.cxx|7 --
basegfx/source/range/b3drange.cxx| 29 ---
basegfx/source/tools/canvastools.cxx | 56 ---
basegfx/source/tools/unopolypolygon.cxx |5 --
basegfx/source/tuple/b2i64tuple.cxx |5 --
basegfx/source/tuple/b2ituple.cxx|5 --
basegfx/source/tuple/b3dtuple.cxx|6 --
basegfx/source/tuple/b3i64tuple.cxx |4 -
basegfx/source/tuple/b3ituple.cxx|4 -
basegfx/source/vector/b2dvector.cxx |8 ---
basegfx/source/vector/b2ivector.cxx |6 --
unusedcode.easy | 25 --
36 files changed, 385 deletions(-)
New commits:
commit b3c3e116ff0eb9b550b73d3901395c042e31d192
Author: Alexander Bergmann myadd...@gmx.de
Date: Wed Feb 1 16:34:15 2012 +
unusedcode.easy: Removed unused code
diff --git a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
index 3d0d22d..e53a598 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
@@ -226,9 +226,6 @@ namespace basegfx
};
} // end of namespace tools
-/// Returns a string with svg's matrix(m00,m10,m01,m11,m02,m12)
representation
-::rtl::OUString exportToSvg( const B2DHomMatrix rMatrix );
-
} // end of namespace basegfx
///
diff --git a/basegfx/inc/basegfx/point/b2ipoint.hxx
b/basegfx/inc/basegfx/point/b2ipoint.hxx
index b74b559..c356e1c 100644
--- a/basegfx/inc/basegfx/point/b2ipoint.hxx
+++ b/basegfx/inc/basegfx/point/b2ipoint.hxx
@@ -118,11 +118,6 @@ namespace basegfx
contrast to B2DVector, applied.
*/
B2IPoint operator*=( const ::basegfx::B2DHomMatrix rMat );
-
-static const B2IPoint getEmptyPoint()
-{
-return (const B2IPoint) ::basegfx::B2ITuple::getEmptyTuple();
-}
};
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/point/b3ipoint.hxx
b/basegfx/inc/basegfx/point/b3ipoint.hxx
index 334ff33..f773994 100644
--- a/basegfx/inc/basegfx/point/b3ipoint.hxx
+++ b/basegfx/inc/basegfx/point/b3ipoint.hxx
@@ -130,11 +130,6 @@ namespace basegfx
contrast to B3DVector, applied.
*/
B3IPoint operator*=( const ::basegfx::B3DHomMatrix rMat );
-
-static const B3IPoint getEmptyPoint()
-{
-return (const B3IPoint) ::basegfx::B3ITuple::getEmptyTuple();
-}
};
} // end of namespace basegfx
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index 707590d..3443d72 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -187,26 +187,6 @@ namespace basegfx
*/
B2DRange getB2DRange() const;
-/** insert other 2D polygons
-
-The default (with nIndex2 == 0 nCount == 0) inserts the whole
-rPoly at position nIndex
-
-@param nIndex
-Target index for points to be inserted
-
-@param rPoly
-The source for new points
-
-@param nIndex2
-The index to the first source point into rPoly
-
-@param nCount
-How many points to add from rPoly to this polygon.
[Libreoffice-commits] .: 3 commits - vcl/inc vcl/source vcl/unx
vcl/inc/salgdi.hxx |2 -
vcl/inc/vcl/salnativewidgets.hxx | 18 ++---
vcl/source/gdi/outdevnative.cxx | 54 +++
vcl/source/gdi/salgdilayout.cxx | 35 +++--
vcl/unx/kde4/KDESalGraphics.cxx |1
5 files changed, 86 insertions(+), 24 deletions(-)
New commits:
commit c161e3652853e7478f79df22e83412ada50f3c6a
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Feb 1 17:36:16 2012 +0100
add a check before a cast
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index c552d91..0be12fb 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -369,6 +369,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType
type, ControlPart part,
// paints the whole menu item, so translate position (and it'll be
clipped);
// it is also necessary to fill the background transparently
first, as this
// is painted after menuitem highlight, otherwise there would be a
grey area
+assert( value.getType() == CTRL_MENU_POPUP );
const MenupopupValue* menuVal = static_castconst
MenupopupValue*(value);
QRect menuItemRect( region2QRect( menuVal-maItemRect ));
QRect rect( menuItemRect.topLeft() - widgetRect.topLeft(),
commit 47f16670f05186413d6f5b436d36c0e52059c74a
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Feb 1 16:52:43 2012 +0100
VCL_DLLPUBLIC was missing for some *Value types
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index 6c7cba1..872fa35 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.hxx
@@ -418,7 +418,7 @@ class VCL_DLLPUBLIC SpinbuttonValue : public
ImplControlValue
*
* Value container for toolbars detailing the grip position
*/
-class ToolbarValue : public ImplControlValue
+class VCL_DLLPUBLIC ToolbarValue : public ImplControlValue
{
public:
ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 )
@@ -434,7 +434,7 @@ public:
*
* Value container for menubars specifying height of adjacent docking area
*/
-class MenubarValue : public ImplControlValue
+class VCL_DLLPUBLIC MenubarValue : public ImplControlValue
{
public:
MenubarValue() : ImplControlValue( CTRL_MENUBAR, BUTTONVALUE_DONTKNOW, 0 )
@@ -449,7 +449,7 @@ public:
* Value container for menu items; specifies the rectangle for the whole item
which
* may be useful when drawing parts with a smaller rectangle.
*/
-class MenupopupValue : public ImplControlValue
+class VCL_DLLPUBLIC MenupopupValue : public ImplControlValue
{
public:
MenupopupValue() : ImplControlValue( CTRL_MENU_POPUP,
BUTTONVALUE_DONTKNOW, 0 )
@@ -467,7 +467,7 @@ public:
*
* Value container for pushbuttons specifying additional drawing hints
*/
-class PushButtonValue : public ImplControlValue
+class VCL_DLLPUBLIC PushButtonValue : public ImplControlValue
{
public:
PushButtonValue()
commit 150befe0fe9533f39df55b0d95ad25caaddf1830
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Wed Feb 1 16:46:05 2012 +0100
const is such a useless concept anyway /sarcasm
diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx
index 7736832..d29247b 100644
--- a/vcl/inc/salgdi.hxx
+++ b/vcl/inc/salgdi.hxx
@@ -351,7 +351,7 @@ public:
sal_Boolmirror( sal_uInt32 nPoints, const SalPoint
*pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false )
const;
voidmirror( Rectangle rRect, const OutputDevice*,
bool bBack = false ) const;
voidmirror( Region rRgn, const OutputDevice *pOutDev,
bool bBack = false ) const;
-voidmirror( ControlType,const ImplControlValue,const
OutputDevice*,bool bBack = false) const;
+voidmirror( ImplControlValue, const OutputDevice*,
bool bBack = false ) const;
basegfx::B2DPoint mirror( const basegfx::B2DPoint i_rPoint, const
OutputDevice *pOutDev, bool bBack = false ) const;
basegfx::B2DPolygon mirror( const basegfx::B2DPolygon i_rPoly, const
OutputDevice *pOutDev, bool bBack = false ) const;
basegfx::B2DPolyPolygon mirror( const basegfx::B2DPolyPolygon i_rPoly,
const OutputDevice *pOutDev, bool bBack = false ) const;
diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index af39285..6c7cba1 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.hxx
@@ -297,6 +297,8 @@ class VCL_DLLPUBLIC ImplControlValue
virtual ~ImplControlValue();
+virtual ImplControlValue* clone() const;
+
ControlType getType() const { return mType; }
inline ButtonValue getTristateVal( void ) const { return
mTristate; }
@@ -334,6 +336,7 @@ class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue
mnThumbState = 0; mnPage1State = 0; mnPage2State = 0;
[Libreoffice-commits] .: 3 commits - l10ntools/inc l10ntools/source
l10ntools/inc/gsicheck.hxx|5 -
l10ntools/source/gsicheck.cxx | 178 +-
2 files changed, 9 insertions(+), 174 deletions(-)
New commits:
commit d9adc4342cf275498e7d2e27a674116ceb2ac13f
Author: Andras Timar ati...@suse.com
Date: Wed Feb 1 18:45:27 2012 +0100
tweak help text of gsicheck tool
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 42dc4fc..8d5544f 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -602,10 +602,7 @@ void Help()
/*/
{
fprintf( stdout, \n );
-fprintf( stdout, gsicheck Version 1.9.0 (c)1999 - 2006 by SUN
Microsystems\n );
-fprintf( stdout,
=\n );
-fprintf( stdout, \n );
-fprintf( stdout, gsicheck checks the syntax of tags in GSI-Files and
SDF-Files\n );
+fprintf( stdout, gsicheck checks the syntax of tags in SDF-Files\n );
fprintf( stdout, checks for inconsistencies and malicious UTF8
encoding\n );
fprintf( stdout, checks tags in Online Help\n );
fprintf( stdout, relax GID/LID length to %s\n,
@@ -627,7 +624,7 @@ void Help()
fprintf( stdout, -tCheck only Translation language(s). Should be used
before merging.\n );
fprintf( stdout, -edisable encoding checks. E.g.: double questionmark
\'??\' which may be the\n );
fprintf( stdout, result of false conversions\n );
-fprintf( stdout, -lISO Languagecode or numerical 2 digits Identifier
of the source language.\n );
+fprintf( stdout, -lISO language code of the source language.\n );
fprintf( stdout, Default is en-US. Use \\ (empty string) or
'none'\n );
fprintf( stdout, to disable source language dependent checks\n );
fprintf( stdout, -rReference filename to check that source language
entries\n );
commit 7dfd1c4023db374bec747dff551ba1bcdafc6508
Author: Andras Timar ati...@suse.com
Date: Wed Feb 1 17:46:13 2012 +0100
remove this KeyID check from gsicheck, unused
diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 7764e78..2915c69 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -104,7 +104,6 @@ private:
sal_Bool bCheckSourceLang;
sal_Bool bCheckTranslationLang;
sal_Bool bReference;
-sal_Bool bAllowKeyIDs;
sal_Bool bAllowSuspicious;
sal_Bool bHasBlockError;
@@ -114,7 +113,7 @@ private:
sal_Bool HasSuspiciousChars( GSILine* pTestee, GSILine* pSource );
public:
-GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool bTrans,
sal_Bool bRef, sal_Bool bAllowKID, sal_Bool bAllowSusp );
+GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool bTrans,
sal_Bool bRef, sal_Bool bAllowSusp );
~GSIBlock();
void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix,
ByteString aContext, sal_uLong nLine, ByteString aUniqueId = ByteString() );
void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext,
sal_uLong nLine, ByteString aUniqueId = ByteString() );
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index a49b1d6..42dc4fc 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -226,7 +226,7 @@ void GSILine::ReassembleLine()
// class GSIBlock
//
/*/
-GSIBlock::GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool
bTrans, sal_Bool bRef, sal_Bool bAllowKID, sal_Bool bAllowSusp )
+GSIBlock::GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool
bTrans, sal_Bool bRef, sal_Bool bAllowSusp )
/*/
: pSourceLine( NULL )
, pReferenceLine( NULL )
@@ -234,7 +234,6 @@ GSIBlock::GSIBlock( sal_Bool PbPrintContext, sal_Bool
bSource, sal_Bool bTrans,
, bCheckSourceLang( bSource )
, bCheckTranslationLang( bTrans )
, bReference( bRef )
-, bAllowKeyIDs( bAllowKID )
, bAllowSuspicious( bAllowSusp )
, bHasBlockError( sal_False )
{
@@ -360,93 +359,6 @@ sal_Bool GSIBlock::IsUTF8( const ByteString aTestee,
sal_Bool bFixTags, sal_uIn
aFixed.Erase();
}
-if ( !bAllowKeyIDs )
-{
-sal_Bool bIsKeyID = sal_False;
-sal_Bool bNewId = sal_False;
-ByteString aID( aTestee );
-sal_uInt16 nAfterID = 0;
-
-if ( aTestee.Equals( {, 0, 2 ) )
-{ // check for strings from instset_native like
{Tahoma8}335795.Installation Wiza ...
-sal_uInt16 nTagEnd = aTestee.Search( '}' );
-if ( nTagEnd != STRING_NOTFOUND )
-{
-if ( bFixTags )
-aFixed = aTestee.Copy( 0, nTagEnd+1 );
-
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 23
+++---
1 file changed, 9 insertions(+), 14 deletions(-)
New commits:
commit 7bd9ce1fae67539f9717c9ead628bd72dffafc37
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Wed Feb 1 18:53:41 2012 +0100
pgsql: simpler / safer check for system column
diff --git a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
index 7765086..ebe5af8 100644
--- a/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_databasemetadata.cxx
@@ -1389,16 +1389,11 @@ sal_Int32 typeNameToDataType( const OUString typeName,
const OUString typtype
return ret;
}
-static bool isSystemColumn( const OUString columnName )
+namespace {
+inline bool isSystemColumn( sal_Int16 attnum )
{
-return
-columnName.compareToAscii( oid ) == 0 ||
-columnName.compareToAscii( tableoid ) == 0 ||
-columnName.compareToAscii( xmin ) == 0 ||
-columnName.compareToAscii( cmin ) == 0 ||
-columnName.compareToAscii( xmax ) == 0 ||
-columnName.compareToAscii( cmax ) == 0 ||
-columnName.compareToAscii( ctid ) == 0;
+return attnum = 0;
+}
}
// is not exported by the postgres header
@@ -1593,7 +1588,8 @@ static void columnMetaData2DatabaseTypeDescription(
pg_type.typtype, // 8
pg_attrdef.adsrc, // 9
pg_description.description,// 10
-pg_type.typbasetype// 11
+pg_type.typbasetype, // 11
+pg_attribute.attnum// 12
FROM pg_class,
pg_attribute LEFT JOIN pg_attrdef ON pg_attribute.attrelid =
pg_attrdef.adrelid AND pg_attribute.attnum = pg_attrdef.adnum
LEFT JOIN pg_description ON
pg_attribute.attrelid = pg_description.objoid AND
pg_attribute.attnum=pg_description.objsubid,
@@ -1627,8 +1623,7 @@ static void columnMetaData2DatabaseTypeDescription(
while( rs-next() )
{
-OUString columnName = xRow-getString(3);
-if( m_pSettings-showSystemColumns || ! isSystemColumn( columnName ) )
+if( m_pSettings-showSystemColumns || ! isSystemColumn(
xRow-getShort( 12 ) ) )
{
OUString sNewSchema( xRow-getString(1) );
OUString sNewTable( xRow-getString(2) );
@@ -1645,7 +1640,7 @@ static void columnMetaData2DatabaseTypeDescription(
row[0] = m_pSettings-catalog;
row[1] = sNewSchema;
row[2] = sNewTable;
-row[3] = columnName;
+row[3] = xRow-getString(3);
if( xRow-getString(8).equalsAscii( d ) )
{
DatabaseTypeDescription desc( domainMap[xRow-getInt(11)] );
@@ -1662,7 +1657,7 @@ static void columnMetaData2DatabaseTypeDescription(
// row[7] BUFFER_LENGTH not used
row[8] = scale;
// row[9] RADIX TODO
-if( xRow-getBoolean( 6 ) ! isSystemColumn(xRow-getString(3)) )
+if( xRow-getBoolean( 6 ) ! isSystemColumn(xRow-getInt( 12 )) )
{
row[10] =
OUString::valueOf(com::sun::star::sdbc::ColumnValue::NO_NULLS);
row[17] = statics.NO;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sw/source
editeng/source/accessibility/AccessibleStaticTextBase.cxx |2 +-
sw/source/core/doc/ftnidx.cxx | 10 ++
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 428c9d516d3408460f1b7f8ce2c753b9a829de87
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 1 19:36:28 2012 +0100
Some cppcheck cleaning
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 9e234d9..734dc1b 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -344,7 +344,7 @@ namespace accessibility
{
// Keep 'invalid' values at the TextSegment
if( aTextSegment.SegmentStart != -1
-aTextSegment.SegmentStart != -1 )
+aTextSegment.SegmentEnd != -1 )
{
// #112814# Correct TextSegment by paragraph offset
sal_Int32 nOffset(0);
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 3ccd856..52f9873 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -192,10 +192,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex rStt )
if( nSectNo )
{
-if( rFtn.IsEndNote() )
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
-else
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
+pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
}
}
}
@@ -281,10 +278,7 @@ void SwFtnIdxs::UpdateAllFtn()
if( nSectNo )
{
-if( rFtn.IsEndNote() )
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
-else
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
+pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/helper/propertymap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 34c5059b80777244e25dee1299ea258c8d7ba4fe
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 1 21:40:29 2012 +0100
Fix Prefer prefix ++/-- operators for non-primitive types
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index 0bf875c..bf92f7a 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -236,7 +236,7 @@ const Any* PropertyMap::getProperty( sal_Int32 nPropId )
const
void PropertyMap::assignAll( const PropertyMap rPropMap )
{
-for( PropertyMap::const_iterator it=rPropMap.begin(); it !=
rPropMap.end(); it++ )
+for( PropertyMap::const_iterator it=rPropMap.begin(); it !=
rPropMap.end(); ++it )
(*this)[it-first] = it-second;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source extensions/source filter/source framework/source sfx2/source
desktop/source/deployment/registry/dp_backend.cxx |2 +-
extensions/source/ole/oleobjw.cxx |2 --
filter/source/config/cache/basecontainer.cxx |2 +-
filter/source/config/cache/filterfactory.cxx |6 +++---
filter/source/config/cache/typedetection.cxx |2 +-
filter/source/msfilter/svdfppt.cxx|2 +-
framework/source/services/modulemanager.cxx |2 +-
sfx2/source/notify/eventsupplier.cxx |4 ++--
sfx2/source/view/ipclient.cxx |4 ++--
9 files changed, 12 insertions(+), 14 deletions(-)
New commits:
commit f2d66c1c50f81a2694447e8b197eb6ac97f7
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 1 22:52:43 2012 +0100
Some cppcheck cleaning
diff --git a/desktop/source/deployment/registry/dp_backend.cxx
b/desktop/source/deployment/registry/dp_backend.cxx
index cbb1bec..f25c8a8 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -309,7 +309,7 @@ void PackageRegistryBackend::deleteUnusedFolders(
//In case the folder containing all the data folder does not
//exist yet, we ignore the exception
if (e.Code != ucb::IOErrorCode_NOT_EXISTING)
-throw e;
+throw;
}
}
diff --git a/extensions/source/ole/oleobjw.cxx
b/extensions/source/ole/oleobjw.cxx
index 9d203c8..de7abc0 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -2171,8 +2171,6 @@ Any
IUnknownWrapper_Impl::invokeWithDispIdComTlb(FuncDesc aFuncDesc,
BasicErrorException aBasicErrExp(message,
ReferenceXInterface(), nErrorCode, message);
throw InvocationTargetException(message,
ReferenceXInterface(), makeAny(aBasicErrExp));
// End add
-
-break;
}
case DISP_E_MEMBERNOTFOUND:
message = OUSTR([automation bridge]: A function with the name \)
diff --git a/filter/source/config/cache/basecontainer.cxx
b/filter/source/config/cache/basecontainer.cxx
index 7fa2faa..642c726 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -344,7 +344,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const
::rtl::OUString sItem)
}
catch(const css::container::NoSuchElementException exNotExist)
{
-throw exNotExist;
+throw;
}
catch(const css::uno::Exception)
{
diff --git a/filter/source/config/cache/filterfactory.cxx
b/filter/source/config/cache/filterfactory.cxx
index 4620b3e..cbd1e7e 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -415,7 +415,7 @@ OUStringList
FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
lResult.push_back(sName);
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{ continue; }
}
@@ -540,7 +540,7 @@ OUStringList
FilterFactory::impl_getListOfInstalledModules() const
return lModules;
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
@@ -634,7 +634,7 @@ OUStringList
FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
}
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index 7a5ec96..0a06025 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -966,7 +966,7 @@ void
TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor rDescript
xSeek-seek(0);
}
catch(const css::uno::RuntimeException exRun)
-{ throw exRun; }
+{ throw; }
catch(const css::uno::Exception)
{}
}
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 326c56f..2b9f19f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7319,7 +7319,7 @@ void ApplyCellAttributes( const SdrObject* pObj,
Reference XCell xCell )
}
}
-void ApplyCellLineAttributes( const SdrObject* pLine, Reference XTable
xTable, const std::vector sal_Int32 vPositions, sal_Int32 nColumns )
+void ApplyCellLineAttributes( const SdrObject* pLine, Reference XTable
xTable, const std::vector sal_Int32 vPositions, sal_Int32 nColumns )
{
try
{
diff --git a/framework/source/services/modulemanager.cxx
b/framework/source/services/modulemanager.cxx
index 4cec298..9ae3cfd 100644
--- a/framework/source/services/modulemanager.cxx
+++
[Libreoffice-commits] .: vcl/win
vcl/win/source/app/saldata.cxx | 10 +-
vcl/win/source/app/salinfo.cxx |8
vcl/win/source/app/salinst.cxx | 16
3 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit 157a32f0dc2eaa195ff60e8b60902554e73e999f
Author: Jesús Corrius je...@softcatala.org
Date: Thu Feb 2 00:09:53 2012 +0100
Win32 API calls use the Unicode versions by default
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 4445315..617b03f 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -93,35 +93,35 @@ int ImplSalWICompareAscii( const wchar_t* pStr1, const
char* pStr2 )
BOOL ImplPostMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
-return PostMessageW( hWnd, nMsg, wParam, lParam );
+return PostMessage( hWnd, nMsg, wParam, lParam );
}
// ---
BOOL ImplSendMessage( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam )
{
-return SendMessageW( hWnd, nMsg, wParam, lParam );
+return SendMessage( hWnd, nMsg, wParam, lParam );
}
// ---
BOOL ImplGetMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT
wMsgFilterMax )
{
-return GetMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
+return GetMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax );
}
// ---
BOOL ImplPeekMessage( LPMSG lpMsg, HWND hWnd, UINT wMsgFilterMin, UINT
wMsgFilterMax, UINT wRemoveMsg )
{
-return PeekMessageW( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg
);
+return PeekMessage( lpMsg, hWnd, wMsgFilterMin, wMsgFilterMax, wRemoveMsg
);
}
// ---
LONG ImplDispatchMessage( CONST MSG *lpMsg )
{
-return DispatchMessageW( lpMsg );
+return DispatchMessage( lpMsg );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index efd4d08..d370589 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -67,9 +67,9 @@ static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor,
sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr,
sal_IntPtr )
{
-MONITORINFOEXW aInfo;
+MONITORINFOEX aInfo;
aInfo.cbSize = sizeof( aInfo );
-if( GetMonitorInfoW( reinterpret_castHMONITOR(hMonitor), aInfo ) )
+if( GetMonitorInfo( reinterpret_castHMONITOR(hMonitor), aInfo ) )
{
aInfo.szDevice[CCHDEVICENAME-1] = 0;
rtl::OUString aDeviceName( reinterpret_castconst sal_Unicode
*(aInfo.szDevice) );
@@ -127,7 +127,7 @@ bool WinSalSystem::initMonitors()
aDev.cb = sizeof( aDev );
DWORD nDevice = 0;
boost::unordered_map rtl::OUString, int, rtl::OUStringHash
aDeviceStringCount;
-while( EnumDisplayDevicesW( NULL, nDevice++, aDev, 0 ) )
+while( EnumDisplayDevices( NULL, nDevice++, aDev, 0 ) )
{
if( (aDev.StateFlags DISPLAY_DEVICE_ACTIVE)
!(aDev.StateFlags DISPLAY_DEVICE_MIRRORING_DRIVER) ) //
sort out non/disabled monitors
@@ -236,7 +236,7 @@ int WinSalSystem::ShowNativeMessageBox(const rtl::OUString
rTitle, const rtl::O
nFlags |=
DEFAULT_BTN_MAPPING_TABLE[nButtonCombination][nDefaultButton];
ImplHideSplash();
-return MessageBoxW(
+return MessageBox(
0,
reinterpret_castLPCWSTR(rMessage.getStr()),
reinterpret_castLPCWSTR(rTitle.getStr()),
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index d491404..c75ee06 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -89,13 +89,13 @@ void SalAbort( const rtl::OUString rErrorText, bool )
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExitW( 0, LApplication Error );
+FatalAppExit( 0, LApplication Error );
}
else
{
// make sure crash reporter is triggered
RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExitW( 0, rErrorText.getStr() );
+FatalAppExit( 0, rErrorText.getStr() );
}
}
@@ -521,32 +521,32 @@ SalInstance* CreateSalInstance()
aWndClassEx.lpszMenuName= 0;
aWndClassEx.lpszClassName = SAL_FRAME_CLASSNAMEW;
ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon,
aWndClassEx.hIconSm );
-if ( !RegisterClassExW( aWndClassEx ) )
+if ( !RegisterClassEx( aWndClassEx ) )
return NULL;
aWndClassEx.hIcon = 0;
aWndClassEx.hIconSm = 0;
aWndClassEx.style |= CS_SAVEBITS;
aWndClassEx.lpszClassName =
[Libreoffice-commits] .: 4 commits - qadevOOo/tests sc/qa test/inc test/Library_subsequenttest.mk test/Package_inc.mk test/source
dev/null|binary
qadevOOo/tests/java/ifc/container/_XNamed.java |3
qadevOOo/tests/java/mod/_sc/ScIndexEnumeration_DDELinksEnumeration.java |4
qadevOOo/tests/java/mod/_sc/ScSheetLinkObj.java |2
qadevOOo/tests/java/mod/_sc/ScTableSheetObj.java|2
qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java |4
qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java |4
sc/qa/unoapi/sc.sce | 116
+-
sc/qa/unoapi/testdocuments/ScSheetLinksObj.ods |binary
test/Library_subsequenttest.mk |1
test/Package_inc.mk |1
test/inc/test/container/xnamereplace.hxx| 56
test/source/container/xnamereplace.cxx | 48
13 files changed, 171 insertions(+), 70 deletions(-)
New commits:
commit 513bbdf9c4664e2677537acb9387df84349529cd
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Feb 1 22:30:11 2012 +0100
remove unused test document, use the ods version instead
diff --git a/sc/qa/unoapi/testdocuments/ScSheetLinksObj.sdc
b/sc/qa/unoapi/testdocuments/ScSheetLinksObj.sdc
deleted file mode 100644
index a7f43fe..000
Binary files a/sc/qa/unoapi/testdocuments/ScSheetLinksObj.sdc and /dev/null
differ
commit 5bd82e6c7bad871689106158f2a82d56e7bffb35
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jan 31 21:04:27 2012 +0100
prevent hanging junit tests
diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
index 1068af5..b81a4b5 100644
--- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsEnumeration.java
@@ -75,9 +75,7 @@ public class ScUniqueCellFormatsEnumeration extends TestCase {
* Disposes Spreadsheet document.
*/
protected void cleanup(TestParameters tParam, PrintWriter log) {
-//add this lines after synchronisation
-//log.println(disposing xSheetDoc );
-//DesktopTools.closeDoc(xSheetDoc);
+util.DesktopTools.closeDoc(xSheetDoc);
}
protected TestEnvironment createTestEnvironment(TestParameters tParam,
diff --git a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
index e85fcb2..5a59204 100644
--- a/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
+++ b/qadevOOo/tests/java/mod/_sc/ScUniqueCellFormatsObj.java
@@ -74,9 +74,7 @@ public class ScUniqueCellFormatsObj extends TestCase {
* Disposes Spreadsheet document.
*/
protected void cleanup(TestParameters tParam, PrintWriter log) {
-//add this lines after synchronisation
-//log.println(disposing xSheetDoc );
-//DesktopTools.closeDoc(xSheetDoc);
+util.DesktopTools.closeDoc(xSheetDoc);
}
protected TestEnvironment createTestEnvironment(TestParameters tParam,
commit bd6187ae9fdf2535333d372be65f01131262d385
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jan 31 20:49:16 2012 +0100
add test for XNameReplace
diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk
index fea04b6..727b230 100644
--- a/test/Library_subsequenttest.mk
+++ b/test/Library_subsequenttest.mk
@@ -70,6 +70,7 @@ $(eval $(call
gb_Library_add_exception_objects,subsequenttest,\
test/source/container/xelementaccess \
test/source/container/xindexaccess \
test/source/container/xnamecontainer \
+test/source/container/xnamereplace \
test/source/container/xnamed \
test/source/sheet/cellproperties \
test/source/sheet/datapilotfield \
diff --git a/test/Package_inc.mk b/test/Package_inc.mk
index c424707..7199974 100644
--- a/test/Package_inc.mk
+++ b/test/Package_inc.mk
@@ -38,6 +38,7 @@ $(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xelementaccess.hxx
$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xnamed.hxx,test/container/xnamed.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xindexaccess.hxx,test/container/xindexaccess.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xnamecontainer.hxx,test/container/xnamecontainer.hxx))
+$(eval $(call
gb_Package_add_file,test_inc,inc/test/container/xnamereplace.hxx,test/container/xnamereplace.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/cellproperties.hxx,test/sheet/cellproperties.hxx))
$(eval $(call
gb_Package_add_file,test_inc,inc/test/sheet/xdatapilottable.hxx,test/sheet/xdatapilottable.hxx))
$(eval $(call
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/unitconv.hxx | 43 +---
sc/source/core/tool/unitconv.cxx | 82 ---
2 files changed, 55 insertions(+), 70 deletions(-)
New commits:
commit 051fb0d37a1f1c05ac5876fcfcc9a589938780e4
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Wed Feb 1 21:30:57 2012 -0500
Unit converter data no longer relies on StrCollection.
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index be51d3c..2b000fb 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -31,42 +31,41 @@
#include collect.hxx
+#include boost/noncopyable.hpp
+#include boost/ptr_container/ptr_map.hpp
-class ScUnitConverterData : public StrData
+class ScUnitConverterData
{
-double fValue;
-
+rtl::OUString maIndexString;
+double mfValue;
// not implemented
-ScUnitConverterDataoperator=( const ScUnitConverterData );
+ScUnitConverterData operator=( const ScUnitConverterData );
public:
-ScUnitConverterData( const String rFromUnit,
-const String rToUnit, double fValue = 1.0 );
-ScUnitConverterData( const ScUnitConverterData );
-virtual ~ScUnitConverterData() {};
-
-virtual ScDataObject* Clone() const;
+ScUnitConverterData( const rtl::OUString rFromUnit,
+const rtl::OUString rToUnit, double fValue = 1.0 );
+ScUnitConverterData( const ScUnitConverterData );
+~ScUnitConverterData();
-double GetValue() const{ return fValue; }
-
-static voidBuildIndexString( String rStr,
-const String rFromUnit, const String rToUnit
);
+double GetValue() const;
+const rtl::OUString GetIndexString() const;
+static rtl::OUString BuildIndexString(
+const rtl::OUString rFromUnit, const rtl::OUString rToUnit );
};
-class ScUnitConverter : public ScStrCollection
+class ScUnitConverter : public boost::noncopyable
{
-// not implemented
-ScUnitConverter( const ScUnitConverter );
-ScUnitConverteroperator=( const ScUnitConverter );
+typedef boost::ptr_maprtl::OUString, ScUnitConverterData MapType;
+MapType maData;
public:
-ScUnitConverter( sal_uInt16 nInit = 16, sal_uInt16
nDelta = 4 );
-virtual ~ScUnitConverter() {};
+ScUnitConverter();
+~ScUnitConverter();
-sal_BoolGetValue( double fValue, const String
rFromUnit,
-const String rToUnit ) const;
+bool GetValue(
+double fValue, const rtl::OUString rFromUnit, const rtl::OUString
rToUnit ) const;
};
diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx
index 9392bd8..b37379c 100644
--- a/sc/source/core/tool/unitconv.cxx
+++ b/sc/source/core/tool/unitconv.cxx
@@ -48,52 +48,36 @@ const sal_Unicode cDelim = 0x01;// Delimiter
zwischen From und To
// --- ScUnitConverterData
-ScUnitConverterData::ScUnitConverterData( const String rFromUnit,
-const String rToUnit, double fVal )
-:
-StrData( rFromUnit ),
-fValue( fVal )
-{
-String aTmp;
-ScUnitConverterData::BuildIndexString( aTmp, rFromUnit, rToUnit );
-SetString( aTmp );
-}
+ScUnitConverterData::ScUnitConverterData(
+const rtl::OUString rFromUnit, const rtl::OUString rToUnit, double
fValue ) :
+maIndexString(BuildIndexString(rFromUnit, rToUnit)),
+mfValue(fValue) {}
+ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData r ) :
+maIndexString(r.maIndexString),
+mfValue(r.mfValue) {}
-ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData r )
-:
-StrData( r ),
-fValue( r.fValue )
+ScUnitConverterData::~ScUnitConverterData() {}
+
+double ScUnitConverterData::GetValue() const
{
+return mfValue;
}
-
-ScDataObject* ScUnitConverterData::Clone() const
+const rtl::OUString ScUnitConverterData::GetIndexString() const
{
-return new ScUnitConverterData( *this );
+return maIndexString;
}
-
-void ScUnitConverterData::BuildIndexString( String rStr,
-const String rFromUnit, const String rToUnit )
+rtl::OUString ScUnitConverterData::BuildIndexString(
+const rtl::OUString rFromUnit, const rtl::OUString rToUnit )
{
-#if 1
-// case sensitive
-rStr = rFromUnit;
-rStr += cDelim;
-rStr += rToUnit;
-#else
-// not case sensitive
-rStr = rFromUnit;
-String aTo( rToUnit );
-ScGlobal::pCharClass-toUpper( rStr );
-ScGlobal::pCharClass-toUpper( aTo );
-rStr += cDelim;
-rStr += aTo;
-#endif
+rtl::OUStringBuffer aBuf(rFromUnit);
+aBuf.append(cDelim);
+aBuf.append(rToUnit);
+return aBuf.makeStringAndClear();
}
-
//
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/salframe.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 54d278ae5feea82d105e4bd11d554ad5fcb41099
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Thu Feb 2 09:44:10 2012 +0700
missing semicolon
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index c21f95b..6a2a16f 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1107,7 +1107,7 @@ void WinSalFrame::SetTitle( const rtl::OUString rTitle )
{
DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ),
WinSalFrame::SetTitle(): WCHAR != sal_Unicode );
-SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) )
+SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) );
}
// ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
