[Libreoffice-commits] .: basegfx/source
basegfx/source/tools/unotools.cxx | 113 +++---
1 file changed, 58 insertions(+), 55 deletions(-)
New commits:
commit d37abad97d72bae0fd0269de12e94c7a7d3fd7e1
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 11:25:57 2012 +0100
Fix fdo#45779 - accessing empty polygon.
Guard access to first polygon point.
diff --git a/basegfx/source/tools/unotools.cxx
b/basegfx/source/tools/unotools.cxx
index 63b0f4e..6febfd3 100644
--- a/basegfx/source/tools/unotools.cxx
+++ b/basegfx/source/tools/unotools.cxx
@@ -187,70 +187,73 @@ namespace unotools
std::vectorawt::Point aPoints; aPoints.reserve(nLoopCount);
std::vectordrawing::PolygonFlags aFlags;
aFlags.reserve(nLoopCount);
-// prepare insert index and current point
-basegfx::B2DCubicBezier aBezier;
-aBezier.setStartPoint(rPoly.getB2DPoint(0));
-
-for(sal_uInt32 b(0L); bnLoopCount; b++)
+if( nCount )
{
-// add current point (always) and remember StartPointIndex for
evtl. later corrections
-const awt::Point
aStartPoint(fround(aBezier.getStartPoint().getX()),
-
fround(aBezier.getStartPoint().getY()));
-const sal_uInt32 nStartPointIndex(aPoints.size());
-aPoints.push_back(aStartPoint);
-aFlags.push_back(drawing::PolygonFlags_NORMAL);
-
-// prepare next segment
-const sal_uInt32 nNextIndex((b + 1) % nCount);
-aBezier.setEndPoint(rPoly.getB2DPoint(nNextIndex));
-aBezier.setControlPointA(rPoly.getNextControlPoint(b));
-
aBezier.setControlPointB(rPoly.getPrevControlPoint(nNextIndex));
-
-if(aBezier.isBezier())
-{
-// if one is used, add always two control points due to
the old schema
-aPoints.push_back(
awt::Point(fround(aBezier.getControlPointA().getX()),
-
fround(aBezier.getControlPointA().getY())) );
-aFlags.push_back(drawing::PolygonFlags_CONTROL);
-
-aPoints.push_back(
awt::Point(fround(aBezier.getControlPointB().getX()),
-
fround(aBezier.getControlPointB().getY())) );
-aFlags.push_back(drawing::PolygonFlags_CONTROL);
-}
+// prepare insert index and current point
+basegfx::B2DCubicBezier aBezier;
+aBezier.setStartPoint(rPoly.getB2DPoint(0));
-// test continuity with previous control point to set flag
value
-if(aBezier.getControlPointA() != aBezier.getStartPoint()
(bClosed || b))
+for(sal_uInt32 b(0L); bnLoopCount; b++)
{
-const basegfx::B2VectorContinuity
eCont(rPoly.getContinuityInPoint(b));
-
-if(basegfx::CONTINUITY_C1 == eCont)
+// add current point (always) and remember StartPointIndex
for evtl. later corrections
+const awt::Point
aStartPoint(fround(aBezier.getStartPoint().getX()),
+
fround(aBezier.getStartPoint().getY()));
+const sal_uInt32 nStartPointIndex(aPoints.size());
+aPoints.push_back(aStartPoint);
+aFlags.push_back(drawing::PolygonFlags_NORMAL);
+
+// prepare next segment
+const sal_uInt32 nNextIndex((b + 1) % nCount);
+aBezier.setEndPoint(rPoly.getB2DPoint(nNextIndex));
+aBezier.setControlPointA(rPoly.getNextControlPoint(b));
+
aBezier.setControlPointB(rPoly.getPrevControlPoint(nNextIndex));
+
+if(aBezier.isBezier())
{
-aFlags[nStartPointIndex] =
drawing::PolygonFlags_SMOOTH;
+// if one is used, add always two control points due
to the old schema
+aPoints.push_back(
awt::Point(fround(aBezier.getControlPointA().getX()),
+
fround(aBezier.getControlPointA().getY())) );
+aFlags.push_back(drawing::PolygonFlags_CONTROL);
+
+aPoints.push_back(
awt::Point(fround(aBezier.getControlPointB().getX()),
+
fround(aBezier.getControlPointB().getY())) );
+aFlags.push_back(drawing::PolygonFlags_CONTROL);
}
-else if(basegfx::CONTINUITY_C2 == eCont)
+
+// test continuity with previous control point to set flag
value
+if(aBezier.getControlPointA() != aBezier.getStartPoint()
(bClosed || b))
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basegfx/source
basegfx/source/tools/unotools.cxx | 113 +++---
1 file changed, 58 insertions(+), 55 deletions(-)
New commits:
commit 3c65e1fef5a4b4e41b4b3846712d7e76e94a34e8
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 11:25:57 2012 +0100
Fix fdo#45779 - accessing empty polygon.
Guard access to first polygon point.
(cherry picked from commit d37abad97d72bae0fd0269de12e94c7a7d3fd7e1)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/basegfx/source/tools/unotools.cxx
b/basegfx/source/tools/unotools.cxx
index 63b0f4e..6febfd3 100644
--- a/basegfx/source/tools/unotools.cxx
+++ b/basegfx/source/tools/unotools.cxx
@@ -187,70 +187,73 @@ namespace unotools
std::vectorawt::Point aPoints; aPoints.reserve(nLoopCount);
std::vectordrawing::PolygonFlags aFlags;
aFlags.reserve(nLoopCount);
-// prepare insert index and current point
-basegfx::B2DCubicBezier aBezier;
-aBezier.setStartPoint(rPoly.getB2DPoint(0));
-
-for(sal_uInt32 b(0L); bnLoopCount; b++)
+if( nCount )
{
-// add current point (always) and remember StartPointIndex for
evtl. later corrections
-const awt::Point
aStartPoint(fround(aBezier.getStartPoint().getX()),
-
fround(aBezier.getStartPoint().getY()));
-const sal_uInt32 nStartPointIndex(aPoints.size());
-aPoints.push_back(aStartPoint);
-aFlags.push_back(drawing::PolygonFlags_NORMAL);
-
-// prepare next segment
-const sal_uInt32 nNextIndex((b + 1) % nCount);
-aBezier.setEndPoint(rPoly.getB2DPoint(nNextIndex));
-aBezier.setControlPointA(rPoly.getNextControlPoint(b));
-
aBezier.setControlPointB(rPoly.getPrevControlPoint(nNextIndex));
-
-if(aBezier.isBezier())
-{
-// if one is used, add always two control points due to
the old schema
-aPoints.push_back(
awt::Point(fround(aBezier.getControlPointA().getX()),
-
fround(aBezier.getControlPointA().getY())) );
-aFlags.push_back(drawing::PolygonFlags_CONTROL);
-
-aPoints.push_back(
awt::Point(fround(aBezier.getControlPointB().getX()),
-
fround(aBezier.getControlPointB().getY())) );
-aFlags.push_back(drawing::PolygonFlags_CONTROL);
-}
+// prepare insert index and current point
+basegfx::B2DCubicBezier aBezier;
+aBezier.setStartPoint(rPoly.getB2DPoint(0));
-// test continuity with previous control point to set flag
value
-if(aBezier.getControlPointA() != aBezier.getStartPoint()
(bClosed || b))
+for(sal_uInt32 b(0L); bnLoopCount; b++)
{
-const basegfx::B2VectorContinuity
eCont(rPoly.getContinuityInPoint(b));
-
-if(basegfx::CONTINUITY_C1 == eCont)
+// add current point (always) and remember StartPointIndex
for evtl. later corrections
+const awt::Point
aStartPoint(fround(aBezier.getStartPoint().getX()),
+
fround(aBezier.getStartPoint().getY()));
+const sal_uInt32 nStartPointIndex(aPoints.size());
+aPoints.push_back(aStartPoint);
+aFlags.push_back(drawing::PolygonFlags_NORMAL);
+
+// prepare next segment
+const sal_uInt32 nNextIndex((b + 1) % nCount);
+aBezier.setEndPoint(rPoly.getB2DPoint(nNextIndex));
+aBezier.setControlPointA(rPoly.getNextControlPoint(b));
+
aBezier.setControlPointB(rPoly.getPrevControlPoint(nNextIndex));
+
+if(aBezier.isBezier())
{
-aFlags[nStartPointIndex] =
drawing::PolygonFlags_SMOOTH;
+// if one is used, add always two control points due
to the old schema
+aPoints.push_back(
awt::Point(fround(aBezier.getControlPointA().getX()),
+
fround(aBezier.getControlPointA().getY())) );
+aFlags.push_back(drawing::PolygonFlags_CONTROL);
+
+aPoints.push_back(
awt::Point(fround(aBezier.getControlPointB().getX()),
+
fround(aBezier.getControlPointB().getY())) );
+aFlags.push_back(drawing::PolygonFlags_CONTROL);
}
-else if(basegfx::CONTINUITY_C2 == eCont)
+
+// test continuity with previous
[Libreoffice-commits] .: tools/inc tools/source unusedcode.easy
tools/inc/tools/string.hxx | 55 tools/source/string/strimp.cxx | 513 --- tools/source/string/tstring.cxx | 50 --- tools/source/string/tustring.cxx | 513 +++ unusedcode.easy | 19 - 5 files changed, 526 insertions(+), 624 deletions(-) New commits: commit 48649cdfb8671fb49a28b33c1ba1cd71c0999a07 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 15 10:05:30 2012 + lock in those ByteString gains so there's no back-sliding diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index b91170a..c232c07 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -148,26 +148,36 @@ private: sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making something to fit ByteString( const sal_Unicode* pUniStr, xub_StrLen nLen, rtl_TextEncoding eTextEncoding, -sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making somethiing to fit +sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making something to fit ByteString( const UniString rUniStr, rtl_TextEncoding eTextEncoding, -sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making somethiing to fit +sal_uInt32 nCvtFlags = UNISTRING_TO_BYTESTRING_CVTFLAGS ); //not implemented, to detect use of removed methods without compiler making something to fit +ByteString( const sal_Char* pCharStr, xub_StrLen nLen ); //not implemented, to detect use of removed methods without compiler making something to fit voidAssign(int); // not implemented; to detect misuses of // Assign(sal_Char) +ByteString Assign( const sal_Char* pCharStr, xub_StrLen nLen ); //not implemented, to detect use of removed methods without compiler making something to fit +ByteString operator =(const sal_Char); //not implemented, to detect use of removed methods without compiler making something to fit + +ByteString Assign(sal_Char); //not implemented, to detect use of removed methods without compiler making something to fit voidoperator =(int); // not implemented; to detect misuses // of operator =(sal_Char) voidAppend(int); // not implemented; to detect misuses of // Append(char) +ByteString Append( const sal_Char* pCharStr, xub_StrLen nLen ); // not implemented, to detect use of removed methods without compiler making something to fit +ByteString operator +=(sal_Char); //not implemented, to detect use of removed methods without compiler making something to fit +ByteString Append( char c ); //not implemented, to detect use of removed methods without compiler making something to fit voidoperator +=(int); // not implemented; to detect misuses // of operator +=(sal_Char) +friend sal_Bool operator == ( const ByteString rStr1, const ByteString rStr2 ); //not implemented, to detect use of removed methods without compiler making something to fit +friend sal_Bool operator ( const ByteString rStr1, const ByteString rStr2 ); //not implemented, to detect use of removed methods without compiler making something to fit +friend sal_Bool operator ( const ByteString rStr1, const ByteString rStr2 ); //not implemented, to detect use of removed methods without compiler making something to fit public: ByteString(); ByteString( const ByteString rStr ); ByteString( const ByteString rStr, xub_StrLen nPos, xub_StrLen nLen ); ByteString( const rtl::OString rStr ); ByteString( const sal_Char* pCharStr ); -ByteString( const sal_Char* pCharStr, xub_StrLen nLen ); ~ByteString(); operator rtl::OString () const @@ -178,27 +188,19 @@ public: ByteString Assign( const ByteString rStr ); ByteString Assign( const rtl::OString rStr ); ByteString Assign( const sal_Char* pCharStr ); -ByteString Assign( const sal_Char* pCharStr, xub_StrLen nLen ); -
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_tools/string.hxx |6 --
1 file changed, 6 deletions(-)
New commits:
commit 1807578ea9f2d5518244839d4607316b7455fb20
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 15 10:05:42 2012 +
lock in those ByteString gains so there's no back-sliding
diff --git a/binfilter/inc/bf_tools/string.hxx
b/binfilter/inc/bf_tools/string.hxx
index 3eab25a..b5944c0 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -261,8 +261,6 @@ public:
const sal_Char* GetBuffer() const { return mpData-maStr; }
-friend sal_Bool operator == ( const ::ByteString rStr1, const
ByteString rStr2 )
-{ return rStr1.Equals( rStr2 ); }
friend sal_Bool operator == ( const ByteString rStr1, const
::ByteString rStr2 )
{ return rStr1.Equals( rStr2 ); }
friend sal_Bool operator == ( const ByteString rStr1, const
ByteString rStr2 )
@@ -271,10 +269,6 @@ public:
{ return rStr.Equals( pCharStr ); }
friend sal_Bool operator == ( const sal_Char* pCharStr, const
ByteString rStr )
{ return rStr.Equals( pCharStr ); }
-friend sal_Bool operator != ( const ::ByteString rStr1, const
ByteString rStr2 )
-{ return !(operator == ( rStr1, rStr2 )); }
-friend sal_Bool operator != ( const ByteString rStr1, const
::ByteString rStr2 )
-{ return !(operator == ( rStr1, rStr2 )); }
friend sal_Bool operator != ( const ByteString rStr1, const
ByteString rStr2 )
{ return !(operator == ( rStr1, rStr2 )); }
friend sal_Bool operator != ( const ByteString rStr, const
sal_Char* pCharStr )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in | 53 +
1 file changed, 25 insertions(+), 28 deletions(-)
New commits:
commit c1f5475bd626849fe7a98cb8986219990a526ce3
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Feb 15 13:06:04 2012 +0200
Do try to use ccache even if CC/CXX are set
For Android, they could have been set earlier in the configure script
even. We do want to use ccache also for Android cross-compilation.
diff --git a/configure.in b/configure.in
index b96b081..752f761 100644
--- a/configure.in
+++ b/configure.in
@@ -2032,37 +2032,34 @@ dnl
===
dnl Checks if ccache is available
dnl ===
if test $enable_ccache = yes -o \( $enable_ccache = -a
$enable_icecream != yes \) ; then
-if test -z $CC ; then
-if test -z $CXX ; then
-AC_PATH_PROG([CCACHE],[ccache],[not found])
-if test $CCACHE = not found ; then
-CCACHE=
-else
-CCACHE=ccache
-# need to check for ccache version: otherwise prevents
-# caching of the results (like -x objective-c++ for Mac)
-if test $_os = Darwin -o $_os = iOS; then
-# check ccache version
-AC_MSG_CHECKING([whether version of ccache is suitable])
-CCACHE_VERSION=`$CCACHE -V | $AWK '/^ccache
version/{print $3}'`
-CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print
\$1*1+\$2*100+\$3 }'`
-if test $CCACHE_VERSION = 2.4_OOo -o $CCACHE_NUMVER
-ge 030100; then
-AC_MSG_RESULT([yes])
-else
-AC_MSG_RESULT([no])
-AC_MSG_NOTICE([ccache version $CCACHE_VERSION not
accepted. ccache will not be used.])
-CCACHE=
-fi
+case %$CC%$CXX% in
+# If $CC and/or $CXX already contain ccache (possibly suffixed with some
verison number etc),
+# assume that's good then
+ccache[[-_' ']]*|*/ccache[[-_' ']]*)
+AC_MSG_NOTICE([ccache seems to be included in a pre-defined CC and/or
CXX])
+;;
+*)
+AC_PATH_PROG([CCACHE],[ccache],[not found])
+if test $CCACHE = not found ; then
+CCACHE=
+else
+# Need to check for ccache version: otherwise prevents
+# caching of the results (like -x objective-c++ for Mac)
+if test $_os = Darwin -o $_os = iOS; then
+# Check ccache version
+AC_MSG_CHECKING([whether version of ccache is suitable])
+CCACHE_VERSION=`$CCACHE -V | $AWK '/^ccache version/{print
$3}'`
+CCACHE_NUMVER=`echo $CCACHE_VERSION | $AWK -F. '{ print
\$1*1+\$2*100+\$3 }'`
+if test $CCACHE_VERSION = 2.4_OOo -o $CCACHE_NUMVER -ge
030100; then
+AC_MSG_RESULT([yes, $CCACHE_VERSION])
+else
+AC_MSG_RESULT([no, $CCACHE_VERSION])
+CCACHE=
fi
fi
-else
-AC_MSG_NOTICE([Automatic ccache detection ignored: CXX is
pre-defined])
-CCACHE=
fi
-else
-AC_MSG_NOTICE([Automatic ccache detection ignored: CC is pre-defined])
-CCACHE=
-fi
+;;
+esac
else
CCACHE=
fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/app/svmain.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit 2185849852aa4cdf4d288d4bd01be44ebd3b4433
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Feb 15 13:14:38 2012 +0200
Revert temporary and not properly ifdeffed Android stuff
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 4db7b12..cf98fb8 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -155,16 +155,12 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void*
/*pData*/, oslSignalInfo
}
-extern void VCL_DLLPUBLIC plasma_now(const char *msg);
-
// ===
int ImplSVMain()
{
// The 'real' SVMain()
RTL_LOGFILE_CONTEXT( aLog, vcl (ss112471) ::SVMain );
-//plasma_now(top); - works here
-
ImplSVData* pSVData = ImplGetSVData();
DBG_ASSERT( pSVData-mpApp, no instance of class Application );
@@ -179,7 +175,6 @@ int ImplSVMain()
{
// Application-Main rufen
pSVData-maAppData.mbInAppMain = sal_True;
-//plasma_now(after vcl init); - works here
nReturn = pSVData-mpApp-Main();
pSVData-maAppData.mbInAppMain = sal_False;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/app/app.cxx | 37 ++---
1 file changed, 22 insertions(+), 15 deletions(-)
New commits:
commit 12f689687e3017bfe9ffaf6bbc4593eb3ca21c2b
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Feb 15 13:22:50 2012 +0200
Ifdefify temporary (?) Android hacks
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index dc490ed..53a19f6 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,7 +102,13 @@
#include sys/wait.h
#endif
+#ifdef ANDROID
+// mmeeks debugging stuff?
extern void VCL_DLLPUBLIC plasma_now(const char *msg);
+#define PLASMA_NOW(s) plasma_now(s)
+#else
+#define PLASMA_NOW(s)
+#endif
#define DEFINE_CONST_UNICODE(CONSTASCII)
UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
#define U2S(STRING)
::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
@@ -1472,7 +1478,7 @@ int Desktop::Main()
ResMgr::SetReadStringHook( ReplaceStringHookProc );
-//::plasma_now(after desktoppy bits); - fine to here ...
+//::PLASMA_NOW(after desktoppy bits); - fine to here ...
// Startup screen
RTL_LOGFILE_CONTEXT_TRACE( aLog, desktop (lo119109) Desktop::Main {
OpenSplashScreen );
@@ -1481,7 +1487,7 @@ int Desktop::Main()
SetSplashScreenProgress(10);
-//::plasma_now(after splash open);
+//::PLASMA_NOW(after splash open);
{
UserInstall::UserInstallError instErr_fin = UserInstall::finalize();
if ( instErr_fin != UserInstall::E_None)
@@ -1509,7 +1515,7 @@ int Desktop::Main()
{
RegisterServices( xSMgr );
-//::plasma_now(registered services);
+//::PLASMA_NOW(registered services);
SetSplashScreenProgress(25);
@@ -1555,7 +1561,7 @@ int Desktop::Main()
if ( !InitializeConfiguration() )
return EXIT_FAILURE;
-//::plasma_now(init configuration);
+//::PLASMA_NOW(init configuration);
SetSplashScreenProgress(30);
@@ -1574,7 +1580,7 @@ int Desktop::Main()
String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE,
*pLabelResMgr ) ) : String();
delete pLabelResMgr;
-//::plasma_now(after title string);
+//::PLASMA_NOW(after title string);
#ifdef DBG_UTIL
//include version ID in non product builds
@@ -1592,7 +1598,7 @@ int Desktop::Main()
SetSplashScreenProgress(40);
RTL_LOGFILE_CONTEXT_TRACE( aLog, } create SvtPathOptions and
SvtLanguageOptions );
-//::plasma_now(unrestricted folders); -- got this.
+//::PLASMA_NOW(unrestricted folders); -- got this.
// Check special env variable
std::vector String aUnrestrictedFolders;
@@ -1614,7 +1620,7 @@ int Desktop::Main()
( xSMgr-createInstance(
DEFINE_CONST_UNICODE( com.sun.star.frame.GlobalEventBroadcaster
) ), UNO_QUERY );
-::plasma_now(done global event broadcaster);
+::PLASMA_NOW(done global event broadcaster);
/* ensure existance of a default window that messages can be
dispatched to
This is for the benefit of testtool which uses PostUserEvent
extensively
@@ -1653,7 +1659,7 @@ int Desktop::Main()
pExecGlobals-xGlobalBroadcaster-notifyEvent(aEvent);
}
-::plasma_now(invoked OnStartupApp);
+::PLASMA_NOW(invoked OnStartupApp);
SetSplashScreenProgress(50);
@@ -1684,7 +1690,7 @@ int Desktop::Main()
aMiscOptions.SetUseSystemFileDialog( sal_False );
}
-::plasma_now(nearly there !);
+::PLASMA_NOW(nearly there !);
if ( !pExecGlobals-bRestartRequested )
{
@@ -1755,7 +1761,7 @@ int Desktop::Main()
aOptions.SetVCLSettings();
SetSplashScreenProgress(60);
-::plasma_now(setup appearance !);
+::PLASMA_NOW(setup appearance !);
if ( !pExecGlobals-bRestartRequested )
{
@@ -1790,7 +1796,7 @@ int Desktop::Main()
// Release solar mutex just before we wait for our client to connect
int nAcquireCount = Application::ReleaseSolarMutex();
-::plasma_now(wait client connect !);
+::PLASMA_NOW(wait client connect !);
// Post user event to startup first application component window
// We have to send this OpenClients message short before execute() to
@@ -1810,7 +1816,7 @@ int Desktop::Main()
// call Application::Execute to process messages in vcl message loop
RTL_LOGFILE_PRODUCT_TRACE( PERFORMANCE - enter
Application::Execute() );
-::plasma_now(before java foo !);
+::PLASMA_NOW(before java foo !);
try
{
@@ -1827,15 +1833,16 @@ int Desktop::Main()
// if this run of the office is triggered by restart, some
additional actions should be done
DoRestartActionsIfNecessary( !rCmdLineArgs.IsInvisible()
!rCmdLineArgs.IsNoQuickstart() );
-
[Libreoffice-commits] .: desktop/source
desktop/source/app/app.cxx | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit bebd171db7735e3063f4cbb15b78f5436dde
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 15 13:16:52 2012 +0100
PLASMA_NOW fix
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 53a19f6..4df6346 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -105,7 +105,7 @@
#ifdef ANDROID
// mmeeks debugging stuff?
extern void VCL_DLLPUBLIC plasma_now(const char *msg);
-#define PLASMA_NOW(s) plasma_now(s)
+#define PLASMA_NOW(s) ::plasma_now(s)
#else
#define PLASMA_NOW(s)
#endif
@@ -1478,7 +1478,7 @@ int Desktop::Main()
ResMgr::SetReadStringHook( ReplaceStringHookProc );
-//::PLASMA_NOW(after desktoppy bits); - fine to here ...
+//PLASMA_NOW(after desktoppy bits); - fine to here ...
// Startup screen
RTL_LOGFILE_CONTEXT_TRACE( aLog, desktop (lo119109) Desktop::Main {
OpenSplashScreen );
@@ -1487,7 +1487,7 @@ int Desktop::Main()
SetSplashScreenProgress(10);
-//::PLASMA_NOW(after splash open);
+//PLASMA_NOW(after splash open);
{
UserInstall::UserInstallError instErr_fin = UserInstall::finalize();
if ( instErr_fin != UserInstall::E_None)
@@ -1515,7 +1515,7 @@ int Desktop::Main()
{
RegisterServices( xSMgr );
-//::PLASMA_NOW(registered services);
+//PLASMA_NOW(registered services);
SetSplashScreenProgress(25);
@@ -1561,7 +1561,7 @@ int Desktop::Main()
if ( !InitializeConfiguration() )
return EXIT_FAILURE;
-//::PLASMA_NOW(init configuration);
+//PLASMA_NOW(init configuration);
SetSplashScreenProgress(30);
@@ -1580,7 +1580,7 @@ int Desktop::Main()
String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE,
*pLabelResMgr ) ) : String();
delete pLabelResMgr;
-//::PLASMA_NOW(after title string);
+//PLASMA_NOW(after title string);
#ifdef DBG_UTIL
//include version ID in non product builds
@@ -1598,7 +1598,7 @@ int Desktop::Main()
SetSplashScreenProgress(40);
RTL_LOGFILE_CONTEXT_TRACE( aLog, } create SvtPathOptions and
SvtLanguageOptions );
-//::PLASMA_NOW(unrestricted folders); -- got this.
+//PLASMA_NOW(unrestricted folders); -- got this.
// Check special env variable
std::vector String aUnrestrictedFolders;
@@ -1620,7 +1620,7 @@ int Desktop::Main()
( xSMgr-createInstance(
DEFINE_CONST_UNICODE( com.sun.star.frame.GlobalEventBroadcaster
) ), UNO_QUERY );
-::PLASMA_NOW(done global event broadcaster);
+PLASMA_NOW(done global event broadcaster);
/* ensure existance of a default window that messages can be
dispatched to
This is for the benefit of testtool which uses PostUserEvent
extensively
@@ -1659,7 +1659,7 @@ int Desktop::Main()
pExecGlobals-xGlobalBroadcaster-notifyEvent(aEvent);
}
-::PLASMA_NOW(invoked OnStartupApp);
+PLASMA_NOW(invoked OnStartupApp);
SetSplashScreenProgress(50);
@@ -1690,7 +1690,7 @@ int Desktop::Main()
aMiscOptions.SetUseSystemFileDialog( sal_False );
}
-::PLASMA_NOW(nearly there !);
+PLASMA_NOW(nearly there !);
if ( !pExecGlobals-bRestartRequested )
{
@@ -1761,7 +1761,7 @@ int Desktop::Main()
aOptions.SetVCLSettings();
SetSplashScreenProgress(60);
-::PLASMA_NOW(setup appearance !);
+PLASMA_NOW(setup appearance !);
if ( !pExecGlobals-bRestartRequested )
{
@@ -1796,7 +1796,7 @@ int Desktop::Main()
// Release solar mutex just before we wait for our client to connect
int nAcquireCount = Application::ReleaseSolarMutex();
-::PLASMA_NOW(wait client connect !);
+PLASMA_NOW(wait client connect !);
// Post user event to startup first application component window
// We have to send this OpenClients message short before execute() to
@@ -1816,7 +1816,7 @@ int Desktop::Main()
// call Application::Execute to process messages in vcl message loop
RTL_LOGFILE_PRODUCT_TRACE( PERFORMANCE - enter
Application::Execute() );
-::PLASMA_NOW(before java foo !);
+PLASMA_NOW(before java foo !);
try
{
@@ -1834,14 +1834,14 @@ int Desktop::Main()
DoRestartActionsIfNecessary( !rCmdLineArgs.IsInvisible()
!rCmdLineArgs.IsNoQuickstart() );
#ifdef ANDROID
-::PLASMA_NOW(pre hit execute!);
+PLASMA_NOW(pre hit execute!);
// For some reason we're not getting a desktop frame or
component [odd]
ErrorBox aKickStartVCL( NULL, WB_OK,
rtl::OUString::createFromAscii(My very own title!) );
aKickStartVCL.SetText(
[Libreoffice-commits] .: 3 commits - scp2/source sw/source
scp2/source/ooo/file_ooo.scp| 14 --
sw/source/filter/ww8/ww8par.cxx |3 +--
2 files changed, 5 insertions(+), 12 deletions(-)
New commits:
commit 9c4581a6b61c0836c3a44eaaf454b9ba560e937a
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 15 13:13:29 2012 +0100
fdo#45530: scp2: java accessibilty bridge cleanup:
AFAIK java_uno_accessbridge.jar is only required on WNT.
Also remove the duplicate old definition of gid_File_Jar_Accessbridge
that was effectively disabled by 6fdde9acfd5aebd23400e7101c8ddff80fcdd8fa.
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index e2c0c68..4d5d771 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -379,16 +379,6 @@ File gid_File_Help_Schart_Zip
End
#endif
-#if defined SOLAR_JAVA defined INCLUDE_JAVA_ACCESSBRIDGE defined WNT
-
-File gid_File_Jar_Accessbridge
-TXT_FILE_BODY;
-Name = java_uno_accessbridge.jar;
-Dir = gid_Dir_Classes;
-Styles = (PACKED,DONT_OVERWRITE);
-End
-
-#endif
#ifdef SOLAR_JAVA
#ifndef SYSTEM_LUCENE
@@ -426,6 +416,9 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax )
STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
STD_JAR_FILE( gid_File_Jar_Query, query )
STD_JAR_FILE( gid_File_Jar_Web, web )
+#endif
+
+#if defined SOLAR_JAVA defined WNT
STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
#endif
commit fbe60c962259ae0449acd65e74fd790530045e93
Author: Masataka Shinke mshi...@users.sourceforge.jp
Date: Wed Feb 15 13:10:44 2012 +0100
fdo#45530: Accessibility does not work on WNT
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index cae313a..e2c0c68 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -426,6 +426,7 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax )
STD_JAR_FILE( gid_File_Jar_Agenda, agenda )
STD_JAR_FILE( gid_File_Jar_Query, query )
STD_JAR_FILE( gid_File_Jar_Web, web )
+STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge )
#endif
#ifdef SOLAR_JAVA
commit c1f723fd53e8c41b80285d11a149e0044f580e2f
Author: Michael Stahl mst...@redhat.com
Date: Tue Feb 14 17:47:28 2012 +0100
sw: ww8: ~SwIndexReg assertion:
Remove pointless SwPosition that triggers the assertion when
loading bugdoc from i#87910 from wwSectionManager::InsertSegments.
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 5c74e18..ad88e98 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4118,8 +4118,7 @@ void wwSectionManager::InsertSegments()
if (pTxtNd)
{
SwNodeIndex aIdx(*pTxtNd);
-SwPosition aPos(aIdx);
-SwPaM aTest(aPos);
+SwPaM aTest(aIdx);
mrReader.rDoc.DelFullPara(aTest);
pTxtNd = 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - scp2/source
scp2/source/ooo/file_ooo.scp | 14 -- 1 file changed, 4 insertions(+), 10 deletions(-) New commits: commit 78a5d35ec1907e4b5add1014801dbac992cee48e Author: Michael Stahl mst...@redhat.com Date: Wed Feb 15 13:13:29 2012 +0100 fdo#45530: scp2: java accessibilty bridge cleanup: AFAIK java_uno_accessbridge.jar is only required on WNT. Also remove the duplicate old definition of gid_File_Jar_Accessbridge that was effectively disabled by 6fdde9acfd5aebd23400e7101c8ddff80fcdd8fa. Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index dd6cd74..7f1cc64 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -376,16 +376,6 @@ File gid_File_Help_Schart_Zip End #endif -#if defined SOLAR_JAVA defined INCLUDE_JAVA_ACCESSBRIDGE defined WNT - -File gid_File_Jar_Accessbridge -TXT_FILE_BODY; -Name = java_uno_accessbridge.jar; -Dir = gid_Dir_Classes; -Styles = (PACKED,DONT_OVERWRITE); -End - -#endif #ifdef SOLAR_JAVA #ifndef SYSTEM_LUCENE @@ -423,6 +413,9 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax ) STD_JAR_FILE( gid_File_Jar_Agenda, agenda ) STD_JAR_FILE( gid_File_Jar_Query, query ) STD_JAR_FILE( gid_File_Jar_Web, web ) +#endif + +#if defined SOLAR_JAVA defined WNT STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif commit 24dfc1a6238902a122f5cf835c83b2f54b8819fb Author: Masataka Shinke mshi...@users.sourceforge.jp Date: Wed Feb 15 13:10:44 2012 +0100 fdo#45530: Accessibility does not work on WNT Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index e7bc85a..dd6cd74 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -423,6 +423,7 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax ) STD_JAR_FILE( gid_File_Jar_Agenda, agenda ) STD_JAR_FILE( gid_File_Jar_Query, query ) STD_JAR_FILE( gid_File_Jar_Web, web ) +STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif #ifdef SOLAR_JAVA ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/source
basic/source/sbx/sbxdec.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a62395237ed78f982ae74efe5ed8ad7834a2f95b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 15 13:00:08 2012 +
WaE: moaning about unintialized variables
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index c7267f1..bf36d88 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -685,7 +685,7 @@ start:
break;
case SbxBYREF | SbxCURRENCY:
{
-double d;
+double d(0.0);
if( !pDec-getDouble( d ) )
SbxBase::SetError( SbxERR_OVERFLOW );
*p-pnInt64 = ImpDoubleToCurrency( d );
@@ -693,7 +693,7 @@ start:
break;
case SbxBYREF | SbxSALINT64:
{
-double d;
+double d(0.0);
if( !pDec-getDouble( d ) )
SbxBase::SetError( SbxERR_OVERFLOW );
else
@@ -702,7 +702,7 @@ start:
break;
case SbxBYREF | SbxSALUINT64:
{
-double d;
+double d(0.0);
if( !pDec-getDouble( d ) )
SbxBase::SetError( SbxERR_OVERFLOW );
else
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svtools/inc svtools/source unusedcode.easy vcl/inc vcl/source
svtools/inc/svtools/imap.hxx|3 ---
svtools/source/edit/svmedit.cxx |6 --
svtools/source/misc/imap.cxx| 18 --
unusedcode.easy |6 --
vcl/inc/ilstbox.hxx |1 -
vcl/inc/image.h |1 -
vcl/inc/vcl/button.hxx |3 ---
vcl/inc/vcl/settings.hxx|6 --
vcl/source/app/settings.cxx | 12
vcl/source/control/button.cxx |8
vcl/source/control/ilstbox.cxx |7 ---
vcl/source/gdi/impimage.cxx |5 -
12 files changed, 76 deletions(-)
New commits:
commit 3626c2cef7c39bda96e2d3bc0d5a53ba1044aadc
Author: Alexander Bergmann myadd...@gmx.de
Date: Wed Feb 15 13:15:50 2012 +
unusedcode.easy: Removed unused code
diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx
index 9418d98..8d81c00 100644
--- a/svtools/inc/svtools/imap.hxx
+++ b/svtools/inc/svtools/imap.hxx
@@ -132,9 +132,6 @@ public:
const String GetName() const { return aName; }
voidSetName( const String rName ) { aName = rName; }
-// gibt das BoundRect aller IMap-Objekte in 1/100mm zurueck
-Rectangle GetBoundRect() const;
-
// skaliert alle Objekte der ImageMap entpr. dem uebergebenen Faktor
voidScale( const Fraction rFractX, const Fraction rFracY
);
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 44ad0d1..267a203 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.cxx
@@ -139,7 +139,6 @@ public:
voidSetMaxTextLen( xub_StrLen nLen );
xub_StrLen GetMaxTextLen() const;
-voidSetInsertMode( sal_Bool bInsert );
sal_BoolIsInsertMode() const;
voidInsertText( const String rStr );
@@ -396,11 +395,6 @@ sal_Bool ImpSvMEdit::IsModified() const
return mpTextWindow-GetTextEngine()-IsModified();
}
-void ImpSvMEdit::SetInsertMode( sal_Bool bInsert )
-{
-mpTextWindow-GetTextView()-SetInsertMode( bInsert );
-}
-
void ImpSvMEdit::SetReadOnly( sal_Bool bRdOnly )
{
mpTextWindow-GetTextView()-SetReadOnly( bRdOnly );
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index d4199e2..dd15a4b 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -989,24 +989,6 @@ IMapObject* ImageMap::GetHitIMapObject( const Size
rTotalSize,
|*
\**/
-Rectangle ImageMap::GetBoundRect() const
-{
-Rectangle aBoundRect;
-size_t nCount = maList.size();
-
-for ( size_t i = 0; i nCount; i++ )
-aBoundRect.Union( maList[ i ]-GetBoundRect() );
-
-return aBoundRect;
-}
-
-
-/**
-|*
-|*
-|*
-\**/
-
void ImageMap::Scale( const Fraction rFracX, const Fraction rFracY )
{
size_t nCount = maList.size();
diff --git a/unusedcode.easy b/unusedcode.easy
index af2cff9..b65437f 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -28,19 +28,13 @@ HTMLControls::Insert(HTMLControl const**, unsigned short)
HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short)
HTMLControls::Remove(HTMLControl const*, unsigned short)
HTMLControls::Remove(unsigned short, unsigned short)
-ImageButton::ImageButton(unsigned short)
-ImageMap::GetBoundRect() const
-ImpSvMEdit::SetInsertMode(unsigned char)
ImpSvtData::~ImpSvtData()
ImplDevFontList::ImplFindByLocale(com::sun::star::lang::Locale) const
-ImplEntryList::IsEntrySelected(String const) const
-ImplImageList::GetImageCount() const
InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short)
InsCapOptArr::Insert(InsCaptionOpt* const, unsigned short)
InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short)
InsCapOptArr::Remove(InsCaptionOpt* const, unsigned short)
InsCapOptArr::Remove(unsigned short, unsigned short)
-KeyboardSettings::CopyData()
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned
short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index c1355f0..cecf3b8 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -168,7 +168,6 @@ public:
sal_uInt16 GetSelectEntryCount() const;
XubString GetSelectEntry( sal_uInt16 nIndex ) const;
sal_uInt16 GetSelectEntryPos( sal_uInt16 nIndex ) const;
-sal_BoolIsEntrySelected( const XubString rStr ) const;
sal_BoolIsEntryPosSelected( sal_uInt16 nIndex ) const;
voidSetLastSelected( sal_uInt16 nPos ) { mnLastSelected =
nPos; }
diff --git a/vcl/inc/image.h b/vcl/inc/image.h
index 1497750..f8abc4e
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx |1 +
sw/inc/index.hxx |1 +
sw/inc/ndindex.hxx |1 +
sw/inc/ndtxt.hxx |2 +-
sw/inc/pam.hxx |2 ++
sw/source/core/inc/hffrm.hxx |2 ++
sw/source/core/inc/pagefrm.hxx |1 +
sw/source/core/inc/rootfrm.hxx |1 +
8 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 335b38d831558ce786f726b4b6a014d2a312cf29
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 15 11:36:56 2012 +0100
sw: add doxygen comments for some document model / layout classes
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 8fb1c1b..580108e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -249,6 +249,7 @@ void SetAllScriptItem( SfxItemSet rSet, const SfxPoolItem
rItem );
// global function to start grammar checking in the document
void StartGrammarChecking( SwDoc rDoc );
+/// Represents the model of a Writer document.
class SW_DLLPUBLIC SwDoc :
public IInterface,
public IDocumentSettingAccess,
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 329fcb4..8d183db 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -48,6 +48,7 @@ struct SwPosition;
#define INLINE inline
#endif
+/// Marks a character position inside a document model node.
class SW_DLLPUBLIC SwIndex
{
private:
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 566d180..4283408 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -38,6 +38,7 @@
class SwNode;
class SwNodes;
+/// Marks a node in the document model.
class SW_DLLPUBLIC SwNodeIndex
{
friend void SwNodes::RegisterIndex( SwNodeIndex );
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index b412aa4..21e9fb4 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -79,7 +79,7 @@ namespace com { namespace sun { namespace star {
typedef std::set xub_StrLen SwSoftPageBreakList;
-// SwTxtNode
+/// SwTxtNode is a paragraph in the document model.
class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
{
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 53d1486..1ca3905 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -53,6 +53,7 @@ namespace utl {
class TextSearch;
}
+/// Marks a position in the document model.
struct SW_DLLPUBLIC SwPosition
{
SwNodeIndex nNode;
@@ -157,6 +158,7 @@ extern SwGoInDoc fnGoCntntCellsSkipHidden;
void _InitPam();
+/// PaM is Point and Mark: a selection of the document model.
class SW_DLLPUBLIC SwPaM : public Ring
{
SwPosition m_Bound1;
diff --git a/sw/source/core/inc/hffrm.hxx b/sw/source/core/inc/hffrm.hxx
index dcf9a2b..993da32 100644
--- a/sw/source/core/inc/hffrm.hxx
+++ b/sw/source/core/inc/hffrm.hxx
@@ -49,6 +49,7 @@ public:
virtual void PaintSubsidiaryLines( const SwPageFrm*, const SwRect ) const;
};
+/// Header in the document layout, inside a page.
class SwHeaderFrm: public SwHeadFootFrm
{
public:
@@ -57,6 +58,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwHeaderFrm)
};
+/// Footer in the document layout, inside a page.
class SwFooterFrm: public SwHeadFootFrm
{
public:
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 779c4cd..0091e24 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -58,6 +58,7 @@ enum SwPageChg
CHG_CHGPAGE
};
+/// A page of the document layout.
class SwPageFrm: public SwFtnBossFrm
{
friend class SwFrm;
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index 788fc55..b8f0f8f 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -62,6 +62,7 @@ struct SwCrsrMoveState;
#include vector
+/// The root element of a Writer document layout.
class SwRootFrm: public SwLayoutFrm
{
//Muss das Superfluous temporaer abschalten.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - oox/source
oox/source/ole/axcontrol.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 636abb692afb818b797794ff14384aefe16a7ae2
Author: Noel Power noel.po...@novell.com
Date: Mon Feb 13 14:50:09 2012 +
handle imported picture attribute from MSO Dialog ( fdo#45995 )
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 498296b..ebbd71a 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -1745,6 +1745,7 @@ void AxUserFormModel::convertProperties( PropertyMap
rPropMap, const ControlCon
{
rPropMap.setProperty( PROP_Title, maCaption );
rConv.convertColor( rPropMap, PROP_BackgroundColor, mnBackColor );
+rConv.convertAxPicture( rPropMap, maPictureData, AX_PICPOS_CENTER );
AxContainerModelBase::convertProperties( rPropMap, rConv );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - toolkit/inc toolkit/source
toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx |1
toolkit/inc/toolkit/controls/dialogcontrol.hxx |4 +
toolkit/inc/toolkit/controls/unocontrols.hxx | 13 +++
toolkit/source/controls/controlmodelcontainerbase.cxx | 25 ---
toolkit/source/controls/dialogcontrol.cxx | 35 --
toolkit/source/controls/unocontrols.cxx| 44 -
6 files changed, 88 insertions(+), 34 deletions(-)
New commits:
commit 715b102a41eb89aff9cf5cc5e206e98d363274ee
Author: Noel Power noel.po...@novell.com
Date: Wed Feb 15 14:46:29 2012 +0100
fix support for embedded images for basic Dialogs ( fdo#45992 )
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index 673f4d6..c4d2dd5 100644
--- a/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
@@ -233,7 +233,6 @@ protected:
virtual void ImplSetPosSize(
::com::sun::star::uno::Reference ::com::sun::star::awt::XControl rxCtrl );
voidImplUpdateResourceResolver();
voidImplStartListingForResourceEvents();
-::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic
Impl_getGraphicFromURL_nothrow( const ::rtl::OUString _rURL );
ControlContainerBase();
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 78fc078..9620e65 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -33,6 +33,7 @@
#include com/sun/star/awt/XDialog2.hpp
#include com/sun/star/awt/XSimpleTabController.hpp
#include com/sun/star/resource/XStringResourceResolver.hpp
+#include com/sun/star/graphic/XGraphicObject.hpp
#include toolkit/helper/servicenames.hxx
#include toolkit/helper/macros.hxx
#include toolkit/controls/unocontrolcontainer.hxx
@@ -47,8 +48,11 @@
class UnoControlDialogModel : public ControlModelContainerBase
{
protected:
+::com::sun::star::uno::Reference
::com::sun::star::graphic::XGraphicObject mxGrfObj;
::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16
nPropId ) const;
::cppu::IPropertyArrayHelper SAL_CALL getInfoHelper();
+// ::cppu::OPropertySetHelper
+void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
::com::sun::star::uno::Any rValue ) throw (::com::sun::star::uno::Exception);
public:
UnoControlDialogModel( const
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory
i_factory );
UnoControlDialogModel( const UnoControlDialogModel
rModel );
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx
b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 91b8e2a..3fffee3 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -72,6 +72,19 @@
#define UNO_NAME_GRAPHOBJ_URLPREFIX
vnd.sun.star.GraphicObject:
#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX vnd.sun.star.Package:
+class ImageHelper
+{
+public:
+// The routine will always attempt to return a valid XGraphic for the
+// passed _rURL, additionallly xOutGraphicObject will contain the
+// associated XGraphicObject ( if url is valid for that ) and is set
+// appropriately ( e.g. NULL if non GraphicObject scheme ) or a valid
+// object if the rURL points to a valid object
+static ::com::sun::star::uno::Reference
::com::sun::star::graphic::XGraphic
getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference
::com::sun::star::graphic::XGraphicObject xOutGraphicObject, const
::rtl::OUString _rURL );
+static ::com::sun::star::uno::Reference
::com::sun::star::graphic::XGraphic getGraphicFromURL_nothrow( const
::rtl::OUString _rURL );
+
+};
+
//
// class UnoControlEditModel
//
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 2be6fa2..f2dd50a 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1842,31 +1842,6 @@ void ControlContainerBase::ImplUpdateResourceResolver()
}
}
-
-uno::Reference graphic::XGraphic
ControlContainerBase::Impl_getGraphicFromURL_nothrow( const ::rtl::OUString
_rURL )
-{
-uno::Reference graphic::XGraphic xGraphic;
-if ( !_rURL.getLength() )
-return xGraphic;
-
-try
-{
-uno::Reference graphic::XGraphicProvider xProvider;
-if ( maContext.createComponent(
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - Repository.mk
Repository.mk |3 +++ 1 file changed, 3 insertions(+) New commits: commit 4161ce76cd0fa7135d1f51fbe89a9118cdee94bf Author: Andras Timar ati...@suse.com Date: Wed Feb 15 15:12:21 2012 +0100 fix build on Windows diff --git a/Repository.mk b/Repository.mk index 3c2c93e..863024f 100644 --- a/Repository.mk +++ b/Repository.mk @@ -61,11 +61,14 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sdraw \ simpress \ soffice \ + soffice_bin \ smath \ sweb \ swriter \ unoinfo \ unopkg \ + unopkg_bin \ + unopkg_com \ unopkgio \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 10 commits - android/qa Library_merged.mk sal/Library_sal.mk sal/Module_sal.mk sal/textenc sc/CppunitTest_sc_filters_test.mk sc/qa solenv/gbuild vcl/source
Library_merged.mk |6 +++---
android/qa/desktop/Makefile|7 ---
android/qa/sc/Makefile |9 +
sal/Library_sal.mk | 17 +
sal/Module_sal.mk |3 ++-
sal/textenc/textenc.cxx|2 +-
sc/CppunitTest_sc_filters_test.mk |3 +++
sc/qa/unit/helper/qahelper.hxx | 21 +
solenv/gbuild/extensions/pre_MergedLibsList.mk |3 +++
vcl/source/app/svapp.cxx |8 +++-
10 files changed, 58 insertions(+), 21 deletions(-)
New commits:
commit 60323f6bcf75cb80b203ae50f328ca78d035851b
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Feb 14 20:09:01 2012 +0200
When using libmerged there is no tk library
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 10d7f63..a0bcc15 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1544,7 +1544,13 @@ UnoWrapperBase* Application::GetUnoWrapper( sal_Bool
bCreateIfNotExist )
static sal_Bool bAlreadyTriedToCreate = sal_False;
if ( !pSVData-mpUnoWrapper bCreateIfNotExist !bAlreadyTriedToCreate
)
{
-::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName( tk,
sal_True );
+::rtl::OUString aLibName = ::vcl::unohelper::CreateLibraryName(
+#ifdef LIBO_MERGELIBS
+
merged,
+#else
+ tk,
+#endif
+
sal_True );
oslModule hTkLib = osl_loadModuleRelative(
thisModule, aLibName.pData, SAL_LOADMODULE_DEFAULT );
if ( hTkLib )
commit 3a2cbe739db31139e03beacd4c886a486acf6922
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Feb 14 13:06:10 2012 +0200
Add comment wondering why this loadFile() isn't in osl
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index c679c73..0974e70 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -38,6 +38,12 @@
#include osl/detail/android-bootstrap.h
+// Why is this here and not in osl, and using the already existing file
+// handling APIs? Do we really want to add arbitrary new file handling
+// wrappers here and there (and then having to handle the Android (and
+// eventually perhaps iOS) special cases here, too)? Please move this to osl,
+// it sure looks gemerally useful. Or am I missing something?
+
void loadFile(const rtl::OUString aFileName, std::string aContent)
{
rtl::OString aOFileName = rtl::OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8);
commit 4eaf1feb56632e8e4da34c9a5275bd409395f009
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Feb 14 12:56:43 2012 +0200
Special-case files in /assets on Android
diff --git a/sc/CppunitTest_sc_filters_test.mk
b/sc/CppunitTest_sc_filters_test.mk
index 26bcc7a..32f7d47 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -63,6 +63,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sc_filters_test,
\
utl \
vcl \
xo \
+ $(if $(filter $(OS),ANDROID), \
+ lo-bootstrap \
+ ) \
$(gb_STDLIBS) \
))
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 4c9ae91..c679c73 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -36,9 +36,24 @@
#include string
#include sstream
+#include osl/detail/android-bootstrap.h
+
void loadFile(const rtl::OUString aFileName, std::string aContent)
{
rtl::OString aOFileName = rtl::OUStringToOString(aFileName,
RTL_TEXTENCODING_UTF8);
+
+#ifdef ANDROID
+const char *contents;
+size_t size;
+if (strncmp(aOFileName.getStr(), /assets/, sizeof(/assets/)-1) == 0) {
+contents = (const char *) lo_apkentry(aOFileName.getStr(), size);
+if (contents != 0) {
+aContent = std::string(contents, size);
+return;
+}
+}
+#endif
+
std::ifstream aFile(aOFileName.getStr());
rtl::OStringBuffer aErrorMsg(Could not open csv file: );
commit 888d96f6b48a60abdf9077854f9a5f883f1e84be
Author: Tor Lillqvist tlillqv...@suse.com
Date: Tue Feb 14 12:39:43 2012 +0200
Add svt and tk to libmerged
diff --git a/Library_merged.mk b/Library_merged.mk
index 0b2268c..b994231 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -30,13 +30,13 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
cppuhelper \
i18nisolang1 \
i18npaper \
+i18nutil \
+jvmfwk \
sal \
salhelper \
sax \
sot \
svl \
- svt \
- tk \
tl \
ucbhelper \
utl \
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
[Libreoffice-commits] .: sw/source
sw/source/filter/rtf/rtffly.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 4c8307053e3003af6cef5056e36a650f19c8cdb3
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Jun 27 14:46:16 2011 +
n#695479: Remove properties when removing empty fly frame
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 92a7ca9..6d40010 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -1092,6 +1092,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
// dann zerstoere den FlySave wieder.
aFlyArr.DeleteAndDestroy( --nFlyArrCnt );
+// Remove the properties that have been parsed before in the paragraph
+GetAttrStack().Pop();
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/Library_sal.mk sal/Module_sal.mk sal/textenc
sal/Library_sal.mk |2 +-
sal/Module_sal.mk |2 +-
sal/textenc/textenc.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 17bcaca217523916188b28914f99bcfb12debc4b
Author: Tor Lillqvist t...@iki.fi
Date: Wed Feb 15 16:36:31 2012 +0200
Merge sal_textenc into sal just on Android
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 13a514f..60ab9c9 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -132,7 +132,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/all/filepath \
))
-ifeq ($(MERGELIBS),TRUE)
+ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/textenc/context \
sal/textenc/convertbig5hkscs \
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 7a3304a..d9b5ffb 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,sal,\
$(if $(filter $(OS),ANDROID), \
Library_lo-bootstrap) \
Library_sal \
- $(if $(filter TRUE,$(MERGELIBS)),, \
+ $(if $(filter $(OS),ANDROID),, \
Library_sal_textenc) \
$(if $(filter $(OS),WNT), \
Library_uwinapi) \
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index b668492..42f1711 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -364,7 +364,7 @@ static ImplTextEncodingData const
aImplJavaUtf8TextEncodingData
namespace {
-#if defined IOS || defined LIBO_MERGELIBS
+#if defined IOS || defined ANDROID
extern C ImplTextEncodingData const * sal_getFullTextEncodingData(
rtl_TextEncoding); // from tables.cxx in sal_textenc library
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sal/Library_sal.mk sal/Module_sal.mk sal/textenc
sal/Library_sal.mk |2 +-
sal/Module_sal.mk |2 +-
sal/textenc/textenc.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 42422f2599220b678aa41c4aadeec28df113c3ec
Author: Tor Lillqvist t...@iki.fi
Date: Wed Feb 15 16:36:31 2012 +0200
Merge sal_textenc into sal just on Android
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 13a514f..60ab9c9 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -132,7 +132,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/all/filepath \
))
-ifeq ($(MERGELIBS),TRUE)
+ifeq ($(OS),ANDROID)
$(eval $(call gb_Library_add_exception_objects,sal,\
sal/textenc/context \
sal/textenc/convertbig5hkscs \
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 7a3304a..d9b5ffb 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,sal,\
$(if $(filter $(OS),ANDROID), \
Library_lo-bootstrap) \
Library_sal \
- $(if $(filter TRUE,$(MERGELIBS)),, \
+ $(if $(filter $(OS),ANDROID),, \
Library_sal_textenc) \
$(if $(filter $(OS),WNT), \
Library_uwinapi) \
diff --git a/sal/textenc/textenc.cxx b/sal/textenc/textenc.cxx
index b668492..42f1711 100644
--- a/sal/textenc/textenc.cxx
+++ b/sal/textenc/textenc.cxx
@@ -364,7 +364,7 @@ static ImplTextEncodingData const
aImplJavaUtf8TextEncodingData
namespace {
-#if defined IOS || defined LIBO_MERGELIBS
+#if defined IOS || defined ANDROID
extern C ImplTextEncodingData const * sal_getFullTextEncodingData(
rtl_TextEncoding); // from tables.cxx in sal_textenc library
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svtools
binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx | 31 --
1 file changed, 15 insertions(+), 16 deletions(-)
New commits:
commit b0035dae18266c4fd219b29dbc635497c0fa53ec
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 15 15:38:04 2012 +0100
Adapted to string function clean up
Also fixed some apparent misuses of RTL_CONSTASCII_USTRINGPARAM -
RTL_CONSTASCII_STRINGPARAM.
diff --git a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
index fd8bc49..e2bcfe0 100644
--- a/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
+++ b/binfilter/bf_svtools/source/filter.vcl/filter/svt_sgvtext.cxx
@@ -1189,22 +1189,21 @@ void SgfFontOne::ReadOne( const rtl::OString rID,
ByteString Dsc )
if (!s.isEmpty())
{
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
= osl_getThreadTextEncoding();
+if (s.matchL(RTL_CONSTASCII_STRINGPARAM(BOLD)))
Bold=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(ITAL)))
Ital=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SERF)))
Serf=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SANS)))
Sans=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(FIXD)))
Fixd=sal_True;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(ROMAN)))
SVFamil=FAMILY_ROMAN;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SWISS)))
SVFamil=FAMILY_SWISS;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(MODERN)))
SVFamil=FAMILY_MODERN;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SCRIPT)))
SVFamil=FAMILY_SCRIPT;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(DECORA)))
SVFamil=FAMILY_DECORATIVE;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(ANSI)))
SVChSet=RTL_TEXTENCODING_MS_1252;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(IBMPC)))
SVChSet=RTL_TEXTENCODING_IBM_850;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(MAC)))
SVChSet=RTL_TEXTENCODING_APPLE_ROMAN;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SYMBOL)))
SVChSet=RTL_TEXTENCODING_SYMBOL;
+else if (s.matchL(RTL_CONSTASCII_STRINGPARAM(SYSTEM))) SVChSet =
osl_getThreadTextEncoding();
else if (comphelper::string::isdigitAsciiString(s) )
SVWidth=sal::static_int_cast sal_uInt16 (s.toInt32());
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/filter/rtf/rtffly.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9efe123eec58bcf14faa7e18c2625bdd0c420fb7
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 15 15:47:20 2012 +0100
sw: SvxRTFItemStack has been changed to std::deque in the meantime
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 6d40010..b4c6573 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -1093,7 +1093,7 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
aFlyArr.DeleteAndDestroy( --nFlyArrCnt );
// Remove the properties that have been parsed before in the paragraph
-GetAttrStack().Pop();
+GetAttrStack().pop_back();
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/rtf/rtffly.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit a12a832280db27877c30ee177e9a079cd9c2eed9
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Jun 27 14:46:16 2011 +
n#695479: Remove properties when removing empty fly frame
(cherry picked from commits 4c8307053e3003af6cef5056e36a650f19c8cdb3 and
b208f71ddd19f1419558e7eb8c413d17d7e9f9da)
diff --git a/sw/source/filter/rtf/rtffly.cxx b/sw/source/filter/rtf/rtffly.cxx
index 92a7ca9..b4c6573 100644
--- a/sw/source/filter/rtf/rtffly.cxx
+++ b/sw/source/filter/rtf/rtffly.cxx
@@ -1092,6 +1092,8 @@ void SwRTFParser::ReadFly( int nToken, SfxItemSet* pSet )
// dann zerstoere den FlySave wieder.
aFlyArr.DeleteAndDestroy( --nFlyArrCnt );
+// Remove the properties that have been parsed before in the paragraph
+GetAttrStack().pop_back();
}
else
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |1 +
1 file changed, 1 insertion(+)
New commits:
commit de9c3dcb769bc2df9abaefbae4f8ed90131176e0
Author: Tor Lillqvist tlillqv...@suse.com
Date: Wed Feb 15 17:01:14 2012 +0200
Set SOLARLIB for Android
diff --git a/configure.in b/configure.in
index 437da5f..18adc1b 100644
--- a/configure.in
+++ b/configure.in
@@ -2967,6 +2967,7 @@ linux-androideabi*)
;;
esac
SOLARINC=$SOLARINC -I$SRC_ROOT/solenv/inc/$OUTPATH
+SOLARLIB=-L$SRC_ROOT/solver/${OUTPATH}${PROEXT}/lib
;;
mingw*)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - extensions/source sfx2/source svx/source ucb/source vcl/inc vcl/source
extensions/source/scanner/scanwin.cxx |4
sfx2/source/appl/app.cxx |2
sfx2/source/appl/shutdowniconw32.cxx |2
svx/source/dialog/sendreportw32.cxx |2
ucb/source/ucp/odma/odma.h|4
vcl/inc/vcl/settings.hxx | 191 -
vcl/source/app/settings.cxx | 308 --
7 files changed, 18 insertions(+), 495 deletions(-)
New commits:
commit 1893585d243c7daf5c8782ec6c90c26142d428e8
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 15 15:05:29 2012 +
I can't see the point of these masses of vcl settings which go nowhere
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index e0110e0..2f333ca 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -45,66 +45,6 @@ namespace vcl {
class I18nHelper;
}
-// ---
-// - ImplMachineData -
-// ---
-
-class ImplMachineData
-{
-friend class MachineSettings;
-
-ImplMachineData();
-ImplMachineData( const ImplMachineData
rData );
-
-private:
-sal_uLong mnRefCount;
-sal_uLong mnOptions;
-sal_uLong mnScreenOptions;
-sal_uLong mnPrintOptions;
-longmnScreenRasterFontDeviation;
-};
-
-// ---
-// - MachineSettings -
-// ---
-
-class VCL_DLLPUBLIC MachineSettings
-{
-voidCopyData();
-
-private:
-ImplMachineData*mpData;
-
-public:
-MachineSettings();
-MachineSettings( const MachineSettings
rSet );
-~MachineSettings();
-
-voidSetOptions( sal_uLong nOptions )
-{ CopyData(); mpData-mnOptions =
nOptions; }
-sal_uLong GetOptions() const
-{ return mpData-mnOptions; }
-voidSetScreenOptions( sal_uLong nOptions )
-{ CopyData(); mpData-mnScreenOptions
= nOptions; }
-sal_uLong GetScreenOptions() const
-{ return mpData-mnScreenOptions; }
-voidSetPrintOptions( sal_uLong nOptions )
-{ CopyData(); mpData-mnPrintOptions =
nOptions; }
-sal_uLong GetPrintOptions() const
-{ return mpData-mnPrintOptions; }
-
-voidSetScreenRasterFontDeviation( long
nDeviation )
-{ CopyData();
mpData-mnScreenRasterFontDeviation = nDeviation; }
-longGetScreenRasterFontDeviation() const
-{ return
mpData-mnScreenRasterFontDeviation; }
-
-const MachineSettings operator =( const MachineSettings rSet );
-
-sal_Booloperator ==( const MachineSettings
rSet ) const;
-sal_Booloperator !=( const MachineSettings
rSet ) const
-{ return !(*this == rSet); }
-};
-
// -
// - ImplMouseData -
// -
@@ -272,52 +212,6 @@ public:
{ return !(*this == rSet); }
};
-//
-// - ImplKeyboardData -
-//
-
-class ImplKeyboardData
-{
-friend class KeyboardSettings;
-
-ImplKeyboardData();
-ImplKeyboardData( const ImplKeyboardData
rData );
-
-private:
-sal_uLong mnRefCount;
-Accelerator maStandardAccel;
-sal_uLong mnOptions;
-};
-
-//
-// - KeyboardSettings -
-//
-
-#define KEYBOARD_OPTION_QUICKCURSOR ((sal_uLong)0x0001)
-
-class VCL_DLLPUBLIC KeyboardSettings
-{
-private:
-ImplKeyboardData* mpData;
-
-public:
-KeyboardSettings();
-KeyboardSettings( const KeyboardSettings
rSet );
-~KeyboardSettings();
-
-const Accelerator GetStandardAccel() const
-{ return mpData-maStandardAccel; }
-
-sal_uLong GetOptions() const
-{ return mpData-mnOptions; }
-
-const KeyboardSettings operator =( const KeyboardSettings rSet );
-
-sal_Booloperator ==( const
[Libreoffice-commits] .: 2 commits - desktop/source solenv/bin
desktop/source/app/app.cxx | 35
solenv/bin/modules/installer/copyproject.pm |3 ++
solenv/bin/modules/installer/exiter.pm |3 ++
solenv/bin/modules/installer/files.pm |5 +++-
solenv/bin/modules/installer/logger.pm |3 ++
5 files changed, 13 insertions(+), 36 deletions(-)
New commits:
commit 0ebee1ef39a77c4394e7d0ec9346daf002e52884
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 15 15:16:02 2012 +
remove hideous plasma debugging bits from android branch
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 4df6346..393db72 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -102,14 +102,6 @@
#include sys/wait.h
#endif
-#ifdef ANDROID
-// mmeeks debugging stuff?
-extern void VCL_DLLPUBLIC plasma_now(const char *msg);
-#define PLASMA_NOW(s) ::plasma_now(s)
-#else
-#define PLASMA_NOW(s)
-#endif
-
#define DEFINE_CONST_UNICODE(CONSTASCII)
UniString(RTL_CONSTASCII_USTRINGPARAM(CONSTASCII))
#define U2S(STRING)
::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
@@ -1478,8 +1470,6 @@ int Desktop::Main()
ResMgr::SetReadStringHook( ReplaceStringHookProc );
-//PLASMA_NOW(after desktoppy bits); - fine to here ...
-
// Startup screen
RTL_LOGFILE_CONTEXT_TRACE( aLog, desktop (lo119109) Desktop::Main {
OpenSplashScreen );
OpenSplashScreen();
@@ -1487,7 +1477,6 @@ int Desktop::Main()
SetSplashScreenProgress(10);
-//PLASMA_NOW(after splash open);
{
UserInstall::UserInstallError instErr_fin = UserInstall::finalize();
if ( instErr_fin != UserInstall::E_None)
@@ -1515,8 +1504,6 @@ int Desktop::Main()
{
RegisterServices( xSMgr );
-//PLASMA_NOW(registered services);
-
SetSplashScreenProgress(25);
#ifndef UNX
@@ -1561,8 +1548,6 @@ int Desktop::Main()
if ( !InitializeConfiguration() )
return EXIT_FAILURE;
-//PLASMA_NOW(init configuration);
-
SetSplashScreenProgress(30);
// set static variable to enabled/disable crash reporter
@@ -1580,8 +1565,6 @@ int Desktop::Main()
String aTitle = pLabelResMgr ? String( ResId( RID_APPTITLE,
*pLabelResMgr ) ) : String();
delete pLabelResMgr;
-//PLASMA_NOW(after title string);
-
#ifdef DBG_UTIL
//include version ID in non product builds
::rtl::OUString aDefault(RTL_CONSTASCII_USTRINGPARAM(development));
@@ -1598,8 +1581,6 @@ int Desktop::Main()
SetSplashScreenProgress(40);
RTL_LOGFILE_CONTEXT_TRACE( aLog, } create SvtPathOptions and
SvtLanguageOptions );
-//PLASMA_NOW(unrestricted folders); -- got this.
-
// Check special env variable
std::vector String aUnrestrictedFolders;
svt::getUnrestrictedFolders( aUnrestrictedFolders );
@@ -1620,8 +1601,6 @@ int Desktop::Main()
( xSMgr-createInstance(
DEFINE_CONST_UNICODE( com.sun.star.frame.GlobalEventBroadcaster
) ), UNO_QUERY );
-PLASMA_NOW(done global event broadcaster);
-
/* ensure existance of a default window that messages can be
dispatched to
This is for the benefit of testtool which uses PostUserEvent
extensively
and else can deadlock while creating this window from another tread
while
@@ -1659,8 +1638,6 @@ int Desktop::Main()
pExecGlobals-xGlobalBroadcaster-notifyEvent(aEvent);
}
-PLASMA_NOW(invoked OnStartupApp);
-
SetSplashScreenProgress(50);
// Backing Component
@@ -1690,8 +1667,6 @@ int Desktop::Main()
aMiscOptions.SetUseSystemFileDialog( sal_False );
}
-PLASMA_NOW(nearly there !);
-
if ( !pExecGlobals-bRestartRequested )
{
if ((!rCmdLineArgs.WantsToLoadDocument()
!rCmdLineArgs.IsInvisible() !rCmdLineArgs.IsHeadless()
!rCmdLineArgs.IsQuickstart())
@@ -1761,8 +1736,6 @@ int Desktop::Main()
aOptions.SetVCLSettings();
SetSplashScreenProgress(60);
-PLASMA_NOW(setup appearance !);
-
if ( !pExecGlobals-bRestartRequested )
{
Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
@@ -1796,8 +1769,6 @@ int Desktop::Main()
// Release solar mutex just before we wait for our client to connect
int nAcquireCount = Application::ReleaseSolarMutex();
-PLASMA_NOW(wait client connect !);
-
// Post user event to startup first application component window
// We have to send this OpenClients message short before execute() to
// minimize the risk that this message overtakes type detection
contruction!!
@@ -1816,8 +1787,6 @@ int Desktop::Main()
// call Application::Execute to process messages in vcl message loop
RTL_LOGFILE_PRODUCT_TRACE( PERFORMANCE - enter
Application::Execute() );
-
[Libreoffice-commits] .: filter/source framework/source package/source svl/source
filter/source/config/cache/typedetection.cxx |4 ++--
framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx |2 +-
framework/source/uiconfiguration/uiconfigurationmanager.cxx |2 +-
package/source/xstor/xfactory.cxx |2 +-
svl/source/fsstor/fsfactory.cxx |4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit c91ff959b0527852fde12a5f994b30121ff3c817
Author: Takeshi Abe t...@fixedpoint.jp
Date: Thu Feb 16 00:21:01 2012 +0900
Use RTL_CONSTASCII_STRINGPARAM instead of bare number
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index 0a06025..af907bc 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -454,7 +454,7 @@ sal_Bool TypeDetection::impl_getPreselectionForType(const
::rtl::OUString sPreS
{
// We cant check a preselected type for a given stream!
// So we must believe, that it can work ...
-if (aParsedURL.Complete.equalsAsciiL(private:stream, 14))
+if
(aParsedURL.Complete.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(private:stream)))
bBreakDetection = sal_True;
}
@@ -1092,7 +1092,7 @@ void
TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor rDescript
if (
(sURL.isEmpty() ) || // non
existing file ?
(!xStream.is() ) || // non
existing file !
-(sURL.equalsIgnoreAsciiCaseAsciiL(private:stream, 14))// not a
good idea .-)
+
(sURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(private:stream)))
// not a good idea .-)
)
return ::rtl::OUString();
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index c4679f5..8e4aec6 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -273,7 +273,7 @@ void
ModuleUIConfigurationManager::impl_preloadUIElementTypeList( Layer eLayer,
OUString aUIElementName( aUIElementNames[n].copy( 0,
nIndex ));
if (!aUIElementName.isEmpty()
-( aExtension.equalsIgnoreAsciiCaseAsciiL( xml, 3 )))
+(
aExtension.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(xml
{
aUIElementData.aResourceURL = aResURLPrefix +
aUIElementName;
aUIElementData.aName= aUIElementNames[n];
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
index 0803ff0..f0caf7f 100644
--- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx
@@ -216,7 +216,7 @@ void UIConfigurationManager::impl_preloadUIElementTypeList(
sal_Int16 nElementTy
rtl::OUString aUIElementName( aUIElementNames[n].copy( 0,
nIndex ));
if (!aUIElementName.isEmpty()
-( aExtension.equalsIgnoreAsciiCaseAsciiL( xml, 3 )))
+(
aExtension.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(xml
{
aUIElementData.aResourceURL = aResURLPrefix +
aUIElementName;
aUIElementData.aName= aUIElementNames[n];
diff --git a/package/source/xstor/xfactory.cxx
b/package/source/xstor/xfactory.cxx
index 3602ab0..7037e61 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -156,7 +156,7 @@ uno::Reference uno::XInterface SAL_CALL
OStorageFactory::createInstanceWithAr
throw lang::IllegalArgumentException(); // TODO:
}
-if ( aURL.equalsIgnoreAsciiCaseAsciiL( vnd.sun.star.pkg, 16 ) )
+if (
aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.pkg))
)
{
OSL_FAIL( Packages URL's are not valid for storages!\n ); // ???
throw lang::IllegalArgumentException(); // TODO:
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 8e21da6..ae9427d 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -143,8 +143,8 @@ uno::Reference uno::XInterface SAL_CALL
FSStorageFactory::createInstanceWithA
// allow to use other ucp's
// if ( !isLocalNotFile_Impl( aURL ) )
-if ( aURL.equalsIgnoreAsciiCaseAsciiL( vnd.sun.star.pkg, 16 )
- || aURL.equalsIgnoreAsciiCaseAsciiL( vnd.sun.star.zip, 16 )
+if (
aURL.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(vnd.sun.star.pkg))
+ ||
[Libreoffice-commits] .: 2 commits - sd/source
sd/source/ui/func/fuoltext.cxx |5 +
sd/source/ui/view/outlview.cxx |6 --
2 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 57e6f04066cfddfa79eb2b79cf5c45653c79eff3
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 16:51:52 2012 +0100
Fix fdo#45177 - avoid linked undo for the while.
While I try to wrap head around subtleties for linked undo in
Impress outline view, disable that here for the while. Better than
a crash for sure.
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 8d4d1cc..f4c9dfe 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1664,12 +1664,6 @@ void OutlineView::EndModelChange()
DBG_ASSERT( bHasUndoActions ==
(mrOutliner.GetUndoManager().GetUndoActionCount() != 0),
sd::OutlineView::EndModelChange(), undo actions not in sync! );
-if( bHasUndoActions )
-{
-SfxLinkUndoAction* pLink = new SfxLinkUndoAction(pDocUndoMgr);
-mrOutliner.GetUndoManager().AddUndoAction(pLink);
-}
-
mrOutliner.GetUndoManager().LeaveListAction();
if( bHasUndoActions
mrOutliner.GetEditEngine().HasTriedMergeOnLastAddUndo() )
commit 4fa7f074b38a65a6e0b5e9ceb164f31ce8086042
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 16:50:59 2012 +0100
Cleanup: auto_ptr uses as a plain scope guard.
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index df1108f..c48c254 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -230,10 +230,7 @@ sal_Bool FuOutlineText::KeyInput(const KeyEvent rKEvt)
{
mpWindow-GrabFocus();
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-std::auto_ptr OutlineViewModelChangeGuard aGuard;
-SAL_WNODEPRECATED_DECLARATIONS_POP
-
+boost::scoped_ptr OutlineViewModelChangeGuard aGuard;
if( (nKeyGroup != KEYGROUP_CURSOR) (nKeyGroup != KEYGROUP_FKEYS) )
aGuard.reset( new OutlineViewModelChangeGuard( *pOutlineView ) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: package/source
package/source/zipapi/Deflater.cxx |8
package/source/zipapi/Inflater.cxx |4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 372a0d505c722fd8b39cf4f65487e7f08049896b
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 15 16:02:47 2012 +
these were surely meant to be Z_PREFIX not ZLIB_PREFIX
seeing as Z_PREFIX is what we set in our internal zlib
and one of these was ZLIB_PREFIXB anyway
diff --git a/package/source/zipapi/Deflater.cxx
b/package/source/zipapi/Deflater.cxx
index a6d7c45..5aab0c5 100644
--- a/package/source/zipapi/Deflater.cxx
+++ b/package/source/zipapi/Deflater.cxx
@@ -93,7 +93,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence sal_Int8
rBuffer, sal_Int
pStream-avail_in = nLength;
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
nResult = deflateParams(pStream, nLevel, nStrategy);
#else
nResult = z_deflateParams(pStream, nLevel, nStrategy);
@@ -119,7 +119,7 @@ sal_Int32 Deflater::doDeflateBytes (uno::Sequence
sal_Int8 rBuffer, sal_Int
pStream-avail_in = nLength;
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
nResult = deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
#else
nResult = z_deflate(pStream, bFinish ? Z_FINISH : Z_NO_FLUSH);
@@ -188,7 +188,7 @@ sal_Int32 SAL_CALL Deflater::getTotalOut( )
}
void SAL_CALL Deflater::reset( )
{
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIXB
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
deflateReset(pStream);
#else
z_deflateReset(pStream);
@@ -201,7 +201,7 @@ void SAL_CALL Deflater::end( )
{
if (pStream != NULL)
{
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
deflateEnd(pStream);
#else
z_deflateEnd(pStream);
diff --git a/package/source/zipapi/Inflater.cxx
b/package/source/zipapi/Inflater.cxx
index 87e7a4b..1bc9972 100644
--- a/package/source/zipapi/Inflater.cxx
+++ b/package/source/zipapi/Inflater.cxx
@@ -105,7 +105,7 @@ void SAL_CALL Inflater::end( )
{
if (pStream != NULL)
{
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
inflateEnd(pStream);
#else
z_inflateEnd(pStream);
@@ -130,7 +130,7 @@ sal_Int32 Inflater::doInflateBytes (Sequence sal_Int8
rBuffer, sal_Int32 n
pStream-next_out = reinterpret_cast unsigned char* (
rBuffer.getArray() + nNewOffset );
pStream-avail_out = nNewLength;
-#if defined SYSTEM_ZLIB || !defined ZLIB_PREFIX
+#if defined SYSTEM_ZLIB || !defined Z_PREFIX
sal_Int32 nResult = ::inflate(pStream, Z_PARTIAL_FLUSH);
#else
sal_Int32 nResult = ::z_inflate(pStream, Z_PARTIAL_FLUSH);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - package/source zlib/zlib-1.2.3.patch zlib/zlib-valgrind.patch
package/source/zipapi/CRC32.cxx | 12 +--- zlib/zlib-1.2.3.patch | 103 zlib/zlib-valgrind.patch| 78 -- 3 files changed, 3 insertions(+), 190 deletions(-) New commits: commit a5384f5640dd9d571dff7663b0d69029fc6c2d82 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 15 16:11:34 2012 + remove unapplied patches diff --git a/zlib/zlib-1.2.3.patch b/zlib/zlib-1.2.3.patch deleted file mode 100644 index 4bfad28..000 --- a/zlib/zlib-1.2.3.patch +++ /dev/null @@ -1,103 +0,0 @@ misc/zlib-1.2.3/makefile.mkFri Mar 14 10:17:06 2008 -+++ misc/build/zlib-1.2.3/makefile.mk Fri Mar 14 10:16:56 2008 -@@ -1 +1,73 @@ --dummy -+#* -+# -+# Copyright according the GNU Public License. -+# -+#* -+ -+PRJ=..$/..$/..$/.. -+ -+PRJNAME=zlib -+TARGET=zlib -+LIBTARGET=NO -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+ -+# --- Settings - -+ -+.INCLUDE : settings.mk -+ -+# --- Files -+ -+INCEXT=contrib$/minizip -+ -+SLOFILES= $(SLO)$/adler32.obj \ -+ $(SLO)$/compress.obj\ -+ $(SLO)$/deflate.obj \ -+ $(SLO)$/crc32.obj \ -+ $(SLO)$/inffast.obj \ -+ $(SLO)$/inflate.obj \ -+ $(SLO)$/inftrees.obj\ -+ $(SLO)$/infback.obj \ -+ $(SLO)$/trees.obj \ -+ $(SLO)$/zutil.obj \ -+ $(SLO)$/uncompr.obj \ -+ $(SLO)$/gzio.obj\ -+ $(SLO)$/unzip.obj \ -+ $(SLO)$/ioapi.obj -+ -+ -+LIB1TARGET=$(SLB)$/$(TARGET).lib -+LIB1ARCHIV=$(LB)$/lib$(TARGET).a -+LIB1OBJFILES=$(SLOFILES) -+ -+.IF $(BUILD_X64)!= -+SLOFILES_X64= $(SLO_X64)$/adler32.obj \ -+ $(SLO_X64)$/compress.obj\ -+ $(SLO_X64)$/deflate.obj \ -+ $(SLO_X64)$/crc32.obj \ -+ $(SLO_X64)$/inffast.obj \ -+ $(SLO_X64)$/inflate.obj \ -+ $(SLO_X64)$/inftrees.obj\ -+ $(SLO_X64)$/infback.obj \ -+ $(SLO_X64)$/trees.obj \ -+ $(SLO_X64)$/zutil.obj \ -+ $(SLO_X64)$/uncompr.obj \ -+ $(SLO_X64)$/gzio.obj\ -+ $(SLO_X64)$/unzip.obj \ -+ $(SLO_X64)$/ioapi.obj -+ -+LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib -+LIB1OBJFILES_X64=$(SLOFILES_X64) -+.ENDIF # $(BUILD_X64)!= -+ -+ -+# --- Targets -- -+ -+$(MISC)$/%.c : contrib$/minizip$/%.c -+ @echo -- -+ @echo Making: $@ -+@$(COPY) $ $@ -+ -+.INCLUDE : set_wntx64.mk -+.INCLUDE : target.mk -+.INCLUDE : tg_wntx64.mk -+ misc/zlib-1.2.3/zconf.h2010-07-15 09:33:48.921875000 +0200 -+++ misc/build/zlib-1.2.3/zconf.h 2010-07-15 09:39:27.0 +0200 -@@ -12,6 +12,12 @@ - * If you *really* need a unique prefix for all types and library functions, - * compile with -DZ_PREFIX. The standard zlib should be compiled without it. - */ -+/* -+ * we need the prefix to get the same names as in 1.1.3 -+*/ -+ -+#define Z_PREFIX -+ - #ifdef Z_PREFIX - # define deflateInit_ z_deflateInit_ - # define deflate z_deflate misc/zlib-1.2.3/zutil.h -+++ misc/build/zlib-1.2.3/zutil.h -@@ -175,7 +175,7 @@ - - /* functions */ - --#if defined(STDC99) || (defined(__TURBOC__) __TURBOC__ = 0x550) -+#if defined(STDC99) || (defined(__TURBOC__) __TURBOC__ = 0x550) || defined(_MSC_VER) - # ifndef HAVE_VSNPRINTF - #define HAVE_VSNPRINTF - # endif diff --git a/zlib/zlib-valgrind.patch b/zlib/zlib-valgrind.patch deleted file mode 100644 index 3789ee4..000 --- a/zlib/zlib-valgrind.patch +++ /dev/null @@ -1,78 +0,0 @@ misc/zlib-1.2.3/deflate.c -+++ misc/build/zlib-1.2.3/deflate.c -@@ -288,6 +288,8 @@ - s-prev = (Posf *) ZALLOC(strm, s-w_size, sizeof(Pos)); - s-head = (Posf *) ZALLOC(strm, s-hash_size, sizeof(Pos)); - -+s-high_water = 0; /* nothing written to s-window yet */ -+ - s-lit_bufsize = 1 (memLevel + 6); /* 16K elements by default */ - - overlay = (ushf *) ZALLOC(strm, s-lit_bufsize, sizeof(ush)+2); -@@ -1355,6 +1355,40 @@ - */ - - } while (s-lookahead MIN_LOOKAHEAD s-strm-avail_in != 0); -+ -+/* If the WIN_INIT bytes after the end of
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - Repository.mk
Repository.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d532c1d111f76a581af6d3d1ccbeca7940bdb840 Author: Jan Holesovsky ke...@suse.cz Date: Wed Feb 15 17:55:45 2012 +0100 Fix Windows build. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/Repository.mk b/Repository.mk index 863024f..251405b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ + crashrep_com \ guiloader \ guistdio \ odbcconfig \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx |7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 4e679ee2501a0babcdce498732d68428d46481e3
Author: Jani Monoses j...@ubuntu.com
Date: Fri Feb 3 22:11:08 2012 +0200
Simplify code and use proper register names for linux armhf
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index 9502b87..ac8ca23 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -152,11 +152,6 @@ namespace arm
void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference
* pReturnType, sal_uInt32* pRegisterReturn)
{
-#if !defined(__ARM_EABI__) !defined(__SOFTFP__)
-register float fret asm(f0);
-register double dret asm(f0);
-#endif
-
switch( pReturnType-eTypeClass )
{
case typelib_TypeClass_HYPER:
@@ -176,6 +171,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1,
typelib_TypeDescriptionReference *
#if !defined(__ARM_PCS_VFP) (defined(__ARM_EABI__) || defined(__SOFTFP__))
pRegisterReturn[0] = r0;
#else
+register float fret asm(s0);
*(float*)pRegisterReturn = fret;
#endif
break;
@@ -184,6 +180,7 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1,
typelib_TypeDescriptionReference *
pRegisterReturn[1] = r1;
pRegisterReturn[0] = r0;
#else
+register double dret asm(d0);
*(double*)pRegisterReturn = dret;
#endif
break;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bridges/source
bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 49 --
1 file changed, 20 insertions(+), 29 deletions(-)
New commits:
commit a55fa2d0a8f709bd58e2729b66fd8ecc807c0286
Author: Jani Monoses j...@ubuntu.com
Date: Wed Feb 8 21:23:50 2012 +0200
Remove unnecessary variable
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
index ac8ca23..fc8a9e2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
@@ -258,16 +258,14 @@ void callVirtualMethod(
}
}
-#define INSERT_INT32( pSV, nr, pGPR, pDS, bOverflow ) \
+#define INSERT_INT32( pSV, nr, pGPR, pDS ) \
if ( nr arm::MAX_GPR_REGS ) \
pGPR[nr++] = *reinterpret_castsal_uInt32 *( pSV ); \
else \
-bOverFlow = true; \
-if (bOverFlow) \
*pDS++ = *reinterpret_castsal_uInt32 *( pSV );
#ifdef __ARM_EABI__
-#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart, bOverflow ) \
+#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart ) \
if ( (nr arm::MAX_GPR_REGS) (nr % 2) ) \
{ \
++nr; \
@@ -278,8 +276,6 @@ void callVirtualMethod(
pGPR[nr++] = *(reinterpret_castsal_uInt32 *( pSV ) + 1); \
} \
else \
-bOverFlow = true; \
-if (bOverFlow) \
{ \
if ( (pDS - pStart) % 2) \
{ \
@@ -289,31 +285,27 @@ void callVirtualMethod(
*pDS++ = reinterpret_castsal_uInt32 *( pSV )[1]; \
}
#else
-#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart, bOverflow ) \
-INSERT_INT32( pSV, nr, pGPR, pDS, bOverflow) \
-INSERT_INT32( ((sal_uInt32*)pSV)+1, nr, pGPR, pDS, bOverflow)
+#define INSERT_INT64( pSV, nr, pGPR, pDS, pStart ) \
+INSERT_INT32( pSV, nr, pGPR, pDS ) \
+INSERT_INT32( ((sal_uInt32*)pSV)+1, nr, pGPR, pDS )
#endif
-#define INSERT_FLOAT( pSV, nr, pFPR, pDS, bOverflow ) \
-INSERT_INT32( pSV, nr, pGPR, pDS, bOverflow)
+#define INSERT_FLOAT( pSV, nr, pFPR, pDS ) \
+INSERT_INT32( pSV, nr, pGPR, pDS )
-#define INSERT_DOUBLE( pSV, nr, pFPR, pDS, pStart, bOverflow ) \
-INSERT_INT64( pSV, nr, pGPR, pDS, pStart, bOverflow )
+#define INSERT_DOUBLE( pSV, nr, pFPR, pDS, pStart ) \
+INSERT_INT64( pSV, nr, pGPR, pDS, pStart )
-#define INSERT_INT16( pSV, nr, pGPR, pDS, bOverflow ) \
+#define INSERT_INT16( pSV, nr, pGPR, pDS ) \
if ( nr arm::MAX_GPR_REGS ) \
pGPR[nr++] = *reinterpret_castsal_uInt16 *( pSV ); \
else \
-bOverFlow = true; \
-if (bOverFlow) \
*pDS++ = *reinterpret_castsal_uInt16 *( pSV );
-#define INSERT_INT8( pSV, nr, pGPR, pDS, bOverflow ) \
+#define INSERT_INT8( pSV, nr, pGPR, pDS ) \
if ( nr arm::MAX_GPR_REGS ) \
pGPR[nr++] = *reinterpret_castsal_uInt8 *( pSV ); \
else \
-bOverFlow = true; \
-if (bOverFlow) \
*pDS++ = *reinterpret_castsal_uInt8 *( pSV );
namespace {
@@ -340,7 +332,6 @@ static void cpp_call(
void * pCppReturn = 0; // if != 0 != pUnoReturn, needs reconversion
-bool bOverFlow = false;
bool bSimpleReturn = true;
if (pReturnTypeDescr)
{
@@ -356,13 +347,13 @@ static void cpp_call(
? __builtin_alloca( pReturnTypeDescr-nSize )
: pUnoReturn); // direct way
-INSERT_INT32( pCppReturn, nGPR, pGPR, pStack, bOverFlow );
+INSERT_INT32( pCppReturn, nGPR, pGPR, pStack );
}
}
// push this
void * pAdjustedThisPtr = reinterpret_cast void ** (pThis-getCppI())
+ aVtableSlot.offset;
-INSERT_INT32( pAdjustedThisPtr, nGPR, pGPR, pStack, bOverFlow );
+INSERT_INT32( pAdjustedThisPtr, nGPR, pGPR, pStack );
// stack space
OSL_ENSURE( sizeof(void *) == sizeof(sal_Int32), ### unexpected size! );
@@ -394,7 +385,7 @@ static void cpp_call(
#if OSL_DEBUG_LEVEL 2
fprintf(stderr, hyper is %lx\n, pCppArgs[nPos]);
#endif
-INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, pStackStart,
bOverFlow );
+INSERT_INT64( pCppArgs[nPos], nGPR, pGPR, pStack, pStackStart
);
break;
case typelib_TypeClass_LONG:
case typelib_TypeClass_UNSIGNED_LONG:
@@ -402,22 +393,22 @@ static void cpp_call(
#if OSL_DEBUG_LEVEL 2
fprintf(stderr, long is %x\n, pCppArgs[nPos]);
#endif
-INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+INSERT_INT32( pCppArgs[nPos], nGPR, pGPR, pStack );
break;
case typelib_TypeClass_SHORT:
case typelib_TypeClass_CHAR:
case typelib_TypeClass_UNSIGNED_SHORT:
-INSERT_INT16( pCppArgs[nPos], nGPR, pGPR, pStack, bOverFlow );
+
[Libreoffice-commits] .: 2 commits - editeng/inc editeng/source
editeng/inc/editeng/forbiddencharacterstable.hxx | 27 +---
editeng/source/misc/forbiddencharacterstable.cxx | 50 +--
editeng/source/uno/UnoForbiddenCharsTable.cxx|7 +--
3 files changed, 27 insertions(+), 57 deletions(-)
New commits:
commit 843eafc765a3d1d0ea4c9a89855c73e81784aa8b
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Feb 15 20:44:26 2012 +0400
tweak Convert tools/table.hxx in editeng/forbiddencharacterstable.hxx...
* remove 'const' from GetForbiddenCharacters
* CharInfoMap - Map
* pInf - pForbiddenCharacters
* remove 'inline' from the function defined within the class definition
* some code simplifications
diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx
b/editeng/inc/editeng/forbiddencharacterstable.hxx
index afe6d5b..55db6db 100644
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -45,17 +45,17 @@ namespace lang {
class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public
salhelper::SimpleReferenceObject
{
public:
-typedef std::mapsal_uInt16, com::sun::star::i18n::ForbiddenCharacters
CharInfoMap;
+typedef std::mapsal_uInt16, com::sun::star::i18n::ForbiddenCharacters
Map;
private:
-mutable CharInfoMap maCharInfoMap;
+Map maMap;
::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory mxMSF;
public:
SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xMSF);
~SvxForbiddenCharactersTable() {}
-inline CharInfoMap Map() { return maCharInfoMap; }
-const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters(
sal_uInt16 nLanguage, sal_Bool bGetDefault ) const;
+Map GetMap() { return maMap; }
+const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters(
sal_uInt16 nLanguage, sal_Bool bGetDefault );
voidSetForbiddenCharacters( sal_uInt16 nLanguage , const
com::sun::star::i18n::ForbiddenCharacters );
voidClearForbiddenCharacters( sal_uInt16 nLanguage );
};
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx
b/editeng/source/misc/forbiddencharacterstable.cxx
index e809282..9760b0f 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -39,31 +39,29 @@ SvxForbiddenCharactersTable::SvxForbiddenCharactersTable(
::com::sun::star::uno:
mxMSF = xMSF;
}
-const com::sun::star::i18n::ForbiddenCharacters*
SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage,
sal_Bool bGetDefault ) const
+const com::sun::star::i18n::ForbiddenCharacters*
SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage,
sal_Bool bGetDefault )
{
-com::sun::star::i18n::ForbiddenCharacters* pInf = NULL;
-CharInfoMap::iterator it = maCharInfoMap.find( nLanguage );
-if ( it != maCharInfoMap.end() )
-pInf = (it-second);
-if ( !pInf bGetDefault mxMSF.is() )
+com::sun::star::i18n::ForbiddenCharacters* pForbiddenCharacters = NULL;
+Map::iterator it = maMap.find( nLanguage );
+if ( it != maMap.end() )
+pForbiddenCharacters = (it-second);
+else if ( bGetDefault mxMSF.is() )
{
LocaleDataWrapper aWrapper( mxMSF, SvxCreateLocale( nLanguage ) );
-maCharInfoMap[ nLanguage ] = aWrapper.getForbiddenCharacters();
-pInf = maCharInfoMap[ nLanguage ];
+maMap[ nLanguage ] = aWrapper.getForbiddenCharacters();
+pForbiddenCharacters = maMap[ nLanguage ];
}
-return pInf;
+return pForbiddenCharacters;
}
void SvxForbiddenCharactersTable::SetForbiddenCharacters( sal_uInt16
nLanguage, const com::sun::star::i18n::ForbiddenCharacters rForbiddenChars )
{
-maCharInfoMap[ nLanguage ] = rForbiddenChars;
+maMap[ nLanguage ] = rForbiddenChars;
}
void SvxForbiddenCharactersTable::ClearForbiddenCharacters( sal_uInt16
nLanguage )
{
-CharInfoMap::iterator it = maCharInfoMap.find( nLanguage );
-if ( it != maCharInfoMap.end() )
-maCharInfoMap.erase( it );
+maMap.erase( nLanguage );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/editeng/source/uno/UnoForbiddenCharsTable.cxx
b/editeng/source/uno/UnoForbiddenCharsTable.cxx
index 5d2c79e..5957520 100644
--- a/editeng/source/uno/UnoForbiddenCharsTable.cxx
+++ b/editeng/source/uno/UnoForbiddenCharsTable.cxx
@@ -117,15 +117,15 @@ Sequence Locale SAL_CALL
SvxUnoForbiddenCharsTable::getLocales()
{
SolarMutexGuard aGuard;
-const sal_Int32 nCount = mxForbiddenChars.is() ?
mxForbiddenChars-Map().size() : 0;
+const sal_Int32 nCount = mxForbiddenChars.is() ?
mxForbiddenChars-GetMap().size() : 0;
Sequence Locale aLocales( nCount );
if( nCount )
{
Locale* pLocales = aLocales.getArray();
-for( SvxForbiddenCharactersTable::CharInfoMap::iterator it =
[Libreoffice-commits] .: sc/source
sc/source/ui/docshell/docfunc.cxx | 100 --
sc/source/ui/inc/docfunc.hxx |4 -
sc/source/ui/inc/viewfunc.hxx |2
sc/source/ui/view/cellsh.cxx | 57 -
sc/source/ui/view/viewfun2.cxx|4 -
5 files changed, 124 insertions(+), 43 deletions(-)
New commits:
commit ab0096ed68cdc08906f518d3499a8e1afc5ba80c
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Wed Feb 15 14:06:48 2012 -0500
fdo#46070: Allow copying of adjacent cells via Fill Down/Up/Left/Right.
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 8b9d068..5804190 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -3933,19 +3933,91 @@ inline ScDirection DirFromFillDir( FillDir eDir )
return DIR_LEFT;
}
-sal_Bool ScDocFunc::FillSimple( const ScRange rRange, const ScMarkData*
pTabMark,
-FillDir eDir, sal_Bool bRecord, sal_Bool bApi )
+namespace {
+
+/**
+ * Expand the fill range as necessary, to allow copying of adjacent cell(s)
+ * even when those cells are not in the original range.
+ */
+void adjustFillRangeForAdjacentCopy(ScRange rRange, FillDir eDir)
{
-ScDocShellModificator aModificator( rDocShell );
+switch (eDir)
+{
+case FILL_TO_BOTTOM:
+{
+if (rRange.aStart.Row() == 0)
+return;
-sal_Bool bSuccess = false;
+if (rRange.aStart.Row() != rRange.aEnd.Row())
+return;
+
+// Include the above row.
+ScAddress s = rRange.aStart;
+s.SetRow(s.Row()-1);
+}
+break;
+case FILL_TO_TOP:
+{
+if (rRange.aStart.Row() == MAXROW)
+return;
+
+if (rRange.aStart.Row() != rRange.aEnd.Row())
+return;
+
+// Include the row below.
+ScAddress e = rRange.aEnd;
+e.SetRow(e.Row()+1);
+}
+break;
+case FILL_TO_LEFT:
+{
+if (rRange.aStart.Col() == MAXCOL)
+return;
+
+if (rRange.aStart.Col() != rRange.aEnd.Col())
+return;
+
+// Include the column to the right.
+ScAddress e = rRange.aEnd;
+e.SetCol(e.Col()+1);
+}
+break;
+case FILL_TO_RIGHT:
+{
+if (rRange.aStart.Col() == 0)
+return;
+
+if (rRange.aStart.Col() != rRange.aEnd.Col())
+return;
+
+// Include the column to the left.
+ScAddress s = rRange.aStart;
+s.SetCol(s.Col()-1);
+}
+break;
+default:
+;
+}
+}
+
+}
+
+bool ScDocFunc::FillSimple( const ScRange rRange, const ScMarkData* pTabMark,
+FillDir eDir, bool bRecord, bool bApi )
+{
+ScDocShellModificator aModificator( rDocShell );
ScDocument* pDoc = rDocShell.GetDocument();
-SCCOL nStartCol = rRange.aStart.Col();
-SCROW nStartRow = rRange.aStart.Row();
-SCTAB nStartTab = rRange.aStart.Tab();
-SCCOL nEndCol = rRange.aEnd.Col();
-SCROW nEndRow = rRange.aEnd.Row();
-SCTAB nEndTab = rRange.aEnd.Tab();
+
+bool bSuccess = false;
+ScRange aRange = rRange;
+adjustFillRangeForAdjacentCopy(aRange, eDir);
+
+SCCOL nStartCol = aRange.aStart.Col();
+SCROW nStartRow = aRange.aStart.Row();
+SCTAB nStartTab = aRange.aStart.Tab();
+SCCOL nEndCol = aRange.aEnd.Col();
+SCROW nEndRow = aRange.aEnd.Row();
+SCTAB nEndTab = aRange.aEnd.Tab();
if (bRecord !pDoc-IsUndoEnabled())
bRecord = false;
@@ -3964,8 +4036,8 @@ sal_Bool ScDocFunc::FillSimple( const ScRange rRange,
const ScMarkData* pTabMar
{
WaitObject aWait( rDocShell.GetActiveDialogParent() );
-ScRange aSourceArea = rRange;
-ScRange aDestArea = rRange;
+ScRange aSourceArea = aRange;
+ScRange aDestArea = aRange;
SCCOLROW nCount = 0;
switch (eDir)
@@ -4010,7 +4082,7 @@ sal_Bool ScDocFunc::FillSimple( const ScRange rRange,
const ScMarkData* pTabMar
pDoc-Fill( aSourceArea.aStart.Col(), aSourceArea.aStart.Row(),
aSourceArea.aEnd.Col(), aSourceArea.aEnd.Row(), aMark,
nCount, eDir, FILL_SIMPLE );
-AdjustRowHeight(rRange);
+AdjustRowHeight(aRange);
if ( bRecord ) // Draw-Undo erst jetzt verfuegbar
{
@@ -4022,7 +4094,7 @@ sal_Bool ScDocFunc::FillSimple( const ScRange rRange,
const ScMarkData* pTabMar
rDocShell.PostPaintGridAll();
aModificator.SetDocumentModified();
-bSuccess = sal_True;
+bSuccess = true;
}
else if (!bApi)
rDocShell.ErrorMessage(aTester.GetMessageId());
diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 63cbc39..a2e6fd2 100644
---
[Libreoffice-commits] .: svtools/source
svtools/source/misc/imap2.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 715ac8c1b402e33930317a69bbdd61ad88133740
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 15 21:55:57 2012 +0100
Fixed some more apparent misuses of RTL_CONSTASCII_USTRINGPARAM
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 60225a8..c29525b 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.cxx
@@ -536,8 +536,8 @@ sal_uLong ImageMap::ImpDetectFormat( SvStream rIStm )
aStr = aStr.toAsciiLowerCase();
if ( (aStr.indexOfL(RTL_CONSTASCII_STRINGPARAM(rect)) != -1) ||
- (aStr.indexOfL(RTL_CONSTASCII_USTRINGPARAM(circ)) != -1) ||
- (aStr.indexOfL(RTL_CONSTASCII_USTRINGPARAM(poly)) != -1) )
+ (aStr.indexOfL(RTL_CONSTASCII_STRINGPARAM(circ)) != -1) ||
+ (aStr.indexOfL(RTL_CONSTASCII_STRINGPARAM(poly)) != -1) )
{
if ( ( aStr.indexOf('(') != -1 )
( aStr.indexOf(')') != -1 ) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - dbaccess/Module_dbaccess.mk sc/Module_sc.mk sc/qa test/inc test/source
dbaccess/Module_dbaccess.mk|6 +-
sc/Module_sc.mk|1 +
sc/qa/extras/scdatabaserangeobj.cxx|6 --
sc/qa/unit/filters-test.cxx|2 +-
test/inc/test/sheet/xdatabaserange.hxx |2 ++
test/source/sheet/xdatabaserange.cxx | 13 +
6 files changed, 26 insertions(+), 4 deletions(-)
New commits:
commit a5661d717197a6723b80fb65cde463c479983934
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Feb 16 00:52:44 2012 +0100
add two more test cases to XDatabaseRange
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx
b/sc/qa/extras/scdatabaserangeobj.cxx
index 93eb261..e9f09c6 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -37,7 +37,7 @@
namespace sc_apitest {
-#define NUMBER_OF_TESTS 3
+#define NUMBER_OF_TESTS 5
class ScDatabaseRangeObj : public UnoApiTest, apitest::XDatabaseRange
{
@@ -51,6 +51,8 @@ public:
CPPUNIT_TEST(testDataArea);
CPPUNIT_TEST(testGetSortDescriptor);
CPPUNIT_TEST(testGetSubtotalDescriptor);
+CPPUNIT_TEST(testGetImportDescriptor);
+CPPUNIT_TEST(testGetFilterDescriptor);
CPPUNIT_TEST_SUITE_END();
private:
static sal_Int32 nTest;
diff --git a/test/inc/test/sheet/xdatabaserange.hxx
b/test/inc/test/sheet/xdatabaserange.hxx
index 6c5eac0..d388aa3 100644
--- a/test/inc/test/sheet/xdatabaserange.hxx
+++ b/test/inc/test/sheet/xdatabaserange.hxx
@@ -43,6 +43,8 @@ public:
void testDataArea();
void testGetSortDescriptor();
void testGetSubtotalDescriptor();
+void testGetImportDescriptor();
+void testGetFilterDescriptor();
};
}
diff --git a/test/source/sheet/xdatabaserange.cxx
b/test/source/sheet/xdatabaserange.cxx
index ef68e8e..51e3c32 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -140,6 +140,19 @@ void XDatabaseRange::testGetSortDescriptor()
}
}
+void XDatabaseRange::testGetFilterDescriptor()
+{
+uno::Reference sheet::XDatabaseRange xDBRange(
init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(FilterDescriptor))),
UNO_QUERY_THROW);
+uno::Reference uno::XInterface xFilterDescr(
xDBRange-getFilterDescriptor(), UNO_QUERY_THROW);
+CPPUNIT_ASSERT(xFilterDescr.is());
+}
+
+void XDatabaseRange::testGetImportDescriptor()
+{
+uno::Reference sheet::XDatabaseRange xDBRange(
init(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ImportDescriptor))),
UNO_QUERY_THROW);
+uno::Sequence beans::PropertyValue xImportDescr =
xDBRange-getImportDescriptor();
+}
+
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1263cafe8e487b5db0c439966056516be99bc1e4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Feb 16 00:18:03 2012 +0100
enable XDatabaseRangeTest again
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 074b1f1..a221f22 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\
JunitTest_sc_complex \
JunitTest_sc_unoapi \
CppunitTest_sc_cellrangeobj \
+CppunitTest_sc_databaserangeobj \
CppunitTest_sc_datapilottableobj \
CppunitTest_sc_datapilotfieldobj \
CppunitTest_sc_macros_test \
diff --git a/sc/qa/extras/scdatabaserangeobj.cxx
b/sc/qa/extras/scdatabaserangeobj.cxx
index 69a3d48..93eb261 100644
--- a/sc/qa/extras/scdatabaserangeobj.cxx
+++ b/sc/qa/extras/scdatabaserangeobj.cxx
@@ -63,7 +63,7 @@ uno::Reference lang::XComponent
ScDatabaseRangeObj::mxComponent;
uno::Reference uno::XInterface ScDatabaseRangeObj::init( const
rtl::OUString rDBName )
{
rtl::OUString aFileURL;
-
createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(xdatabaserange.ods)),
aFileURL);
+
createFileURL(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ScDatabaseRangeObj.ods)),
aFileURL);
if(!mxComponent.is())
mxComponent = loadFromDesktop(aFileURL);
CPPUNIT_ASSERT(mxComponent.is());
commit a05286296b3ba51029f0ff57a5a9173d3623b864
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Feb 15 22:27:11 2012 +0100
dbaccess' macros_test is still failing in some situations
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 11a7cf6..f087ba8 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -46,9 +46,13 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
))
$(eval $(call gb_Module_add_check_targets,dbaccess,\
-CppunitTest_dbaccess_macros_test \
))
+# disable test because it still fails in some situations
+#CppunitTest_dbaccess_macros_test \
+#
+
+
$(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\
JunitTest_dbaccess_complex \
JunitTest_dbaccess_unoapi \
commit 2bedc40e55fd7b51f948f60ba1d757d2912d3afb
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Feb 15 22:24:58 2012 +0100
this should test ods and not xls
diff --git a/sc/qa/unit/filters-test.cxx
[Libreoffice-commits] .: 2 commits - l10ntools/source sal/inc
l10ntools/source/srclex.l |1 +
sal/inc/rtl/string.hxx| 16
sal/inc/rtl/ustring.hxx | 25 +
3 files changed, 42 insertions(+)
New commits:
commit 3ac780d8a2f8d1b94e9b4776d7f556274d3197dc
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 16 08:29:47 2012 +0100
Missing return statement
diff --git a/l10ntools/source/srclex.l b/l10ntools/source/srclex.l
index 40ae022..814e236 100644
--- a/l10ntools/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -238,4 +238,5 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
yylex();
e = GetError();
Close();
+return EXIT_SUCCESS;
}
commit acc9fb5ca0bc378ac03637cba948520a29938940
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Feb 16 08:29:16 2012 +0100
Prevent misuses of RTL_CONSTASCII_USTRINGPARAM
works only on 64 bit platforms, though.
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 68f2aa1..0809c26 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -495,6 +495,14 @@ public:
str, strLength, strLength) == 0;
}
+// This overload is left undefined, to detect calls of matchL that
+// erroneously use RTL_CONSTASCII_USTRINGPARAM instead of
+// RTL_CONSTASCII_STRINGPARAM (but would lead to ambiguities on 32 bit
+// platforms):
+#if SAL_TYPES_SIZEOFLONG == 8
+void matchL(char const *, sal_Int32, rtl_TextEncoding) const;
+#endif
+
/**
Match against a substring appearing in this string, ignoring the case of
ASCII letters.
@@ -686,6 +694,14 @@ public:
return n 0 ? n : n + fromIndex;
}
+// This overload is left undefined, to detect calls of indexOfL that
+// erroneously use RTL_CONSTASCII_USTRINGPARAM instead of
+// RTL_CONSTASCII_STRINGPARAM (but would lead to ambiguities on 32 bit
+// platforms):
+#if SAL_TYPES_SIZEOFLONG == 8
+void indexOfL(char const *, sal_Int32, rtl_TextEncoding) const;
+#endif
+
/**
Returns the index within this string of the last occurrence of
the specified substring, searching backward starting at the end.
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index cf1ec92..2318243 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -681,6 +681,14 @@ public:
asciiStr,
asciiStrLength ) == 0;
}
+// This overload is left undefined, to detect calls of matchAsciiL that
+// erroneously use RTL_CONSTASCII_USTRINGPARAM instead of
+// RTL_CONSTASCII_STRINGPARAM (but would lead to ambiguities on 32 bit
+// platforms):
+#if SAL_TYPES_SIZEOFLONG == 8
+void matchAsciiL(char const *, sal_Int32, rtl_TextEncoding) const;
+#endif
+
/**
Match against a substring appearing in this string, ignoring the case of
ASCII letters.
@@ -711,6 +719,15 @@ public:
asciiStr, asciiStrLength ) == 0;
}
+// This overload is left undefined, to detect calls of
+// matchIgnoreAsciiCaseAsciiL that erroneously use
+// RTL_CONSTASCII_USTRINGPARAM instead of RTL_CONSTASCII_STRINGPARAM (but
+// would lead to ambiguities on 32 bit platforms):
+#if SAL_TYPES_SIZEOFLONG == 8
+void matchIgnoreAsciiCaseAsciiL(char const *, sal_Int32, rtl_TextEncoding)
+const;
+#endif
+
/**
Check whether this string ends with a given substring.
@@ -905,6 +922,14 @@ public:
return ret 0 ? ret : ret + fromIndex;
}
+// This overload is left undefined, to detect calls of indexOfAsciiL that
+// erroneously use RTL_CONSTASCII_USTRINGPARAM instead of
+// RTL_CONSTASCII_STRINGPARAM (but would lead to ambiguities on 32 bit
+// platforms):
+#if SAL_TYPES_SIZEOFLONG == 8
+void indexOfAsciiL(char const *, sal_Int32 len, rtl_TextEncoding) const;
+#endif
+
/**
Returns the index within this string of the last occurrence of
the specified substring, searching backward starting at the end.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: New tool for better understanding the codebase, to complement the wiki.
On 02/14/2012 02:33 PM, Michael Meeks wrote: On Tue, 2012-02-14 at 23:07 +1030, Josh Heidenreich wrote: What is the markup format to be used in the READMEs? It's a loose copy of the wikimedia syntax used in the wiki, so: - Paragraphs are separated by a blank line. - Headings are in the form == heading == (without the quotes) - Links to modules are [[module]]. - External links are [link] - Links to cgit are [git:path/to/file] Sounds rather nice; good to re-use wiki markup I suppose, I imagine the above needs documenting somewhere though; README.README ? ;-) I wonder whether there's not some package to translate one of those newfangled lightweight markups into HTML which could be reused here? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANN] Referencing bugs in commits
hello, The bug reference has to have fdo#ABCDE form (where ABCDE is the bug number), and has to be at the first line of the commit (it does not matter where on that line). Sorry, one point is for me not clear: by the first line, do you mean title line or would it works also as first line of the comment (hence not being into the title) ? Thanks Pierre-André ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
input for fdo#45779 from a basegfx knowledgeable person needed
hello,
I have quickly investigated the crash in fdo#45779 when saving an
impress document.
The reason of the crash is in basegfx/inc/basegfx/point/b2dpoint.hxx
(line 82) where this is called:
2DPoint::B2DPoint (this=0xbfffc850, rPoint=...)
: B2DTuple(rPoint)
(from back-trace)
It turns out that in this case, rPoint is 0x0, the null pointer.
and B2DTuple does not support it
B2DTuple(const B2DTuple rTup)
: mfX( rTup.mfX ),
mfY( rTup.mfY )
{}
Here you dereference the null pointer, which crash.
Ok, the basic attitude would be to let B2DTuple be Null-pointer
consistent: (checking that rTup is not NULL), but is it really a good idea?
What is a NULL B2DTuple ?
Or should the caller (this is called due to
basegfx/source/polygon/b2dpolygon.cxx:1257) take care of the case,
returning either the value, ... or NULL ?
B2DPoint B2DPolygon::getB2DPoint(sal_uInt32 nIndex) const
{
OSL_ENSURE(nIndex mpPolygon-count(), B2DPolygon a
return mpPolygon-getPoint(nIndex);
}
Or should I look higher in the hierarchy, saying that a NULL point in a
B2DPolygon has nothing to do and disallow it ?
As far as I could seee, this polygon had 4 elements / points, all with
NULL data at the time of the crash :-/
What would be the right (and most meaningfull) approach ?
Thanks regards
Pierre-André
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: one-big library approach of mozilla ...
On 2/14/2012 4:24 AM, Michael Meeks wrote: Hi Taras, We're running into some fun performance development iteration problems with LibreOffice as we plan to merge more libraries together; and I was wondering - how does Mozilla deal with that ? How long does it take your developers to link / go around a development iteration ? are you using incremental linking ? and/or is there a different library separation for developers ? or is it basically fast to link (even with debuginfo) :-) Sorry, don't have a magic bullet for this. We just suffer 30second+ link times for our main library. Apparently gold has incremental linking support on some platforms now, that might help. Tips tricks appreciated; oh - and ! thanks for your hospitality during FOSDEM :-) great to catch up. Always great to trade ideas with you :) Taras ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] Remove unused VolumeDevice functions and related code
On Tue, Feb 14, 2012 at 06:18:52PM +0100, Stephan Bergmann wrote:
On 02/05/2012 09:52 PM, François Tigeot wrote:
Remove unused VolumeDevice functions and related code
[...]
diff --git a/sal/util/sal.map b/sal/util/sal.map
index 472ea8f..338854d 100644
--- a/sal/util/sal.map
+++ b/sal/util/sal.map
@@ -443,8 +443,6 @@ UDK_3_0_0 {
osl_getSystemTimeFromLocalTime;
osl_getAbsoluteFileURL;
-osl_unmountVolumeDevice;
-osl_automountVolumeDevice;
osl_releaseVolumeDeviceHandle;
osl_getVolumeDeviceMountPath;
osl_acquireVolumeDeviceHandle;
I'm not sure this change is a good idea, given that it incompatibly
changes the stable URE interface. (Arguably, those functions are of
~no use, but changing existing sections of sal.map post-facto always
feels like a no-no to me.)
I may have been a bit too enthusiastic with sal.map; feel free to add
the entries back if you think they are needed.
The actual functions are of course useless; that code was related to
floppy handling (stardesktop remains ?) and only fully implemented for
Solaris and maybe Linux.
--
Francois Tigeot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: poor little bug
On Tue, 2012-02-14 at 20:06 +0100, Luc Castermans wrote: I'm this poor little bug left alone in the corner. When will I be solved ? Feel free to have a look at the code! You seem to forget that I already spent days for a first fix that improves the situation. That's not the way I was told to say Thank you to someone! -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: No page and Columns boundaries in 3.5
That was a design choice that was started long ago in the OpenOffice.org times, discussed at least lively with Christoph Noack (and most probably on the ux-advise list) a few months ago... I don't really like being asked to get some different feature back right after the release when people have plenty of times to report the (not-really-a) bug months before. -- Cedric On Tue, 2012-02-14 at 19:16 +0100, Fernand Vanrie wrote: On the user lists the first complaints about no page and column boundaries for LO Writer 3.5 are comming in. For some documents the new corner layout can be helpfull but without visible page and column boundaries it becomes very difficult to place images and other objects in a mulptiple column layout. Please make a simple option in Appearance to make the boundaries back to the user's choise. Greetz Fernand ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New tool for better understanding the codebase, to complement the wiki.
Stephan Bergmann wrote: I wonder whether there's not some package to translate one of those newfangled lightweight markups into HTML which could be reused here? Sure - e.g. http://search.cpan.org/~rwstauner/Pod-Markdown-1.20/lib/Pod/Markdown.pm or http://pypi.python.org/pypi/Markdown (to list two languages acceptable for in-build scripting) Cheers, -- Thorsten pgpJ3GDltdrkE.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] Remove unused VolumeDevice functions and related code
On Wed, 2012-02-15 at 09:05 +0100, Francois Tigeot wrote: I may have been a bit too enthusiastic with sal.map; feel free to add the entries back if you think they are needed. Heh - so, we should of course leave the functions there so linking continues to work, but have dummy implementations of them I think :-) Thanks for the cleanup though ! :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New tool for better understanding the codebase, to complement the wiki.
On Tue, 2012-02-14 at 23:01 +0100, Stephan Bergmann wrote: On 02/14/2012 10:39 PM, Josh Heidenreich wrote: Do we need licence blocks in a README? Can we just write the licence in on all pages generated by the script? My (naive?) take on it is that, technically, all the files committed to the git repo are source files that should have a legal header. I think that's rather an over-conservative approach ;-) Certainly, everything that is included in the end-product needs cast-iron legal provenance, but the excessive and un-necessary presence of legal boiler-plate everywhere makes this horribly ugly IMHO. That's particularly true for a few lines of README, committed by people who have made broad licensing commitments anyway :-) And even more particularly when using source code licenses for things that are not source code ;-) Personally, seeing that hideous Oracle (C) and vast ugly license block intruding into our world, I'm tempted to junk and re-write the text from scratch to avoid having that stuff borking up our nice new, clean README system :-) If we want to retain the text, we could move that README away again I think. ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: .: bin/get-bugzilla-attachments-by-mimetype
On 21/11/11 11:18, Caolán McNamara wrote: On Mon, 2011-11-21 at 02:04 +0100, Miklos Vajna wrote: On Mon, Nov 14, 2011 at 02:37:07AM -0800, Caolán McNamara cao...@kemper.freedesktop.org wrote: add script to download documents from various bugzillas i've pimped it a bit and it can now download ~all document types that LO can load (to get images you need to edit the script though because i found that half the attachments are JPEG/PNG). i've also added a retry loop so it works with the Apache bugzilla as well, which apparently adheres to the old Abrahamic principle on the seventh connection thou shalt rest. Which reminds me, if someone tweaks it to get public Novell attachments of the requested mime-types that would be a very useful thing to do as well. that's the only thing that's still missing... should i file an easy hack? :) ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: input for fdo#45779 from a basegfx knowledgeable person needed
Pierre-André Jacquod wrote: B2DTuple(const B2DTuple rTup) ... Here you dereference the null pointer, which crash. Ok, the basic attitude would be to let B2DTuple be Null-pointer consistent: (checking that rTup is not NULL), but is it really a good idea? Hi Pierre-André, no, what's passed is a reference, which by definition is always de-referencable - so the bug is in the calling code. Or should I look higher in the hierarchy, saying that a NULL point in a B2DPolygon has nothing to do and disallow it ? Yes, the calling code somehow accesses invalid elements. Let me have a look. Cheers, -- Thorsten pgplfBS1Fa9aK.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [EasyHack] #44681 port to CLucene from java/Lucene
On Tue, 2012-02-14 at 12:01 +, Caolán McNamara wrote: On Tue, 2012-02-14 at 09:45 +0100, G.H.M.Valkenhoef, van wrote: Yes, I found that java code (the HelpIndexer I refer to). I'll work on a patch to replace the XInvocations of the Java code with calls to my code. I can try and knock together a skeleton of a conversion of that Java component to a C++ component for you to integration the clucene stuff into. FWIW, here's a suggested skeleton for replacing the java help component, with this applied going to help and typing something into search should print out on stderr implement me and same for the other case of indexing help of an extension on-demand if it doesn't come with an index already. C. From aec3a13d95a099635408f65923a4407f75ed263b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com Date: Wed, 15 Feb 2012 10:03:24 + Subject: [PATCH] bootstrap replacement c++ help component --- config_host.mk.in |3 - configure.in | 86 --- postprocess/packcomponents/makefile.mk |5 +- scp2/source/ooo/file_library_ooo.scp | 11 ++ scp2/source/ooo/file_ooo.scp | 11 -- scp2/source/ooo/makefile.mk|4 - scp2/source/ooo/module_hidden_ooo.scp |6 +- solenv/inc/extension_helplink.mk | 21 +--- solenv/inc/settings.mk |1 + xmlhelp/prj/build.lst |4 +- xmlhelp/prj/d.lst |4 +- xmlhelp/source/cxxhelp/provider/databases.cxx |2 + .../source/cxxhelp/provider/resultsetforquery.cxx |4 +- .../helpcomponent/CLuceneHelpWrapper.component | 35 + .../source/helpcomponent/CLuceneHelpWrapper.cxx| 161 xmlhelp/source/helpcomponent/makefile.mk | 68 16 files changed, 290 insertions(+), 136 deletions(-) create mode 100755 xmlhelp/source/helpcomponent/CLuceneHelpWrapper.component create mode 100644 xmlhelp/source/helpcomponent/CLuceneHelpWrapper.cxx create mode 100755 xmlhelp/source/helpcomponent/makefile.mk diff --git a/config_host.mk.in b/config_host.mk.in index 8d38959..b0b215a 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -256,8 +256,6 @@ export LIBXSLT_LIBS=@LIBXSLT_LIBS@ export LINK_X64_BINARY=@LINK_X64_BINARY@ export LO_PATH=@LO_PATH@ @x_Cygwin@ export LS=@WIN_LS@ -export LUCENE_ANALYZERS_JAR=@LUCENE_ANALYZERS_JAR@ -export LUCENE_CORE_JAR=@LUCENE_CORE_JAR@ export MANDIR=@MANDIR@ export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@ export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD=@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@ @@ -432,7 +430,6 @@ export SYSTEM_LIBXML=@SYSTEM_LIBXML@ export SYSTEM_LIBXSLT=@SYSTEM_LIBXSLT@ export SYSTEM_LIBXSLT_FOR_BUILD=@SYSTEM_LIBXSLT_FOR_BUILD@ export SYSTEM_LPSOLVE=@SYSTEM_LPSOLVE@ -export SYSTEM_LUCENE=@SYSTEM_LUCENE@ export SYSTEM_MDDS=@SYSTEM_MDDS@ export SYSTEM_MESA_HEADERS=@SYSTEM_MESA_HEADERS@ export SYSTEM_MOZILLA=@SYSTEM_MOZILLA@ diff --git a/configure.in b/configure.in index 0f5ba8a..b6118bf 100644 --- a/configure.in +++ b/configure.in @@ -1163,26 +1163,11 @@ AC_ARG_WITH(system-db, [Use Berkeley db already on system.]),, [with_system_db=$with_system_libs]) -AC_ARG_WITH(system-lucene, -AS_HELP_STRING([--with-system-lucene], -[Use Lucene already on system.]),, -[with_system_lucene=$with_system_jars]) - AC_ARG_WITH(system-apache-commons, AS_HELP_STRING([--with-system-apache-commons], [Use Apache commons libraries already on system.]),, [with_system_apache_commons=$with_system_jars]) -AC_ARG_WITH(lucene-core-jar, -AS_HELP_STRING([--with-lucene-core-jar=JARFILE], -[Specify path to jarfile manually.]), -LUCENE_CORE_JAR=$withval) - -AC_ARG_WITH(lucene-analyzers-jar, -AS_HELP_STRING([--with-lucene-analyzers-jar=JARFILE], -[Specify path to jarfile manually.]), -LUCENE_ANALYZERS_JAR=$withval ,) - AC_ARG_WITH(system-mysql, AS_HELP_STRING([--with-system-mysql], [Use MySQL libraries already on system, for building the MySQL Connector/LibreOffice @@ -6085,77 +6070,6 @@ AC_SUBST(SYSTEM_DB_CFLAGS) AC_SUBST(DB_LIB) AC_SUBST(DB_CPPLIB) -dnl === -dnl Check for system lucene -dnl === -if test $with_java != no; then -AC_MSG_CHECKING([which lucene to use]) -if test $with_system_lucene = yes; then -AC_MSG_RESULT([external]) -SYSTEM_LUCENE=YES -if test -z $LUCENE_CORE_JAR; then - AC_CHECK_FILE(/usr/share/java/lucene-core-2.3.jar, -[ LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar ], -[ - AC_CHECK_FILE(/usr/share/java/lucene-core.jar, -[
Re: .: bin/get-bugzilla-attachments-by-mimetype
On Wed, 2012-02-15 at 11:06 +0100, Michael Stahl wrote: that's the only thing that's still missing... should i file an easy hack? :) Indeed, that probably makes sense. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED-3-5] fdo#45995 fdo#45992
On 14/02/12 19:17, Petr Mladek wrote:
It did not work because the test document used linked picture. It
works well with the updated test document. The changes look
reasonable. They work well = I have pushed them into the 3-5 branch,
see
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=4ea4f80121eedc7f87d950ea8e15336fb691e52f
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=8015cd2cdbdb05b0048753e12b39fa940add2021
Noel, please ask for review once you have a working solution for 3.4
branch.
the solution for 3.4 is the same, the bogus test document fooled me into
thinking that the part addressed by
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=4ea4f80121eedc7f87d950ea8e15336fb691e52f
was already working in 3.4. I attach a version of that patch back-ported
to 3.4
thanks again
Noel
diff --git toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
index 673f4d6..c4d2dd5 100644
--- toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
+++ toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
@@ -233,7 +233,6 @@ protected:
virtual void ImplSetPosSize( ::com::sun::star::uno::Reference ::com::sun::star::awt::XControl rxCtrl );
voidImplUpdateResourceResolver();
voidImplStartListingForResourceEvents();
-::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic Impl_getGraphicFromURL_nothrow( const ::rtl::OUString _rURL );
ControlContainerBase();
diff --git toolkit/inc/toolkit/controls/dialogcontrol.hxx toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 78fc078..cf6717c 100644
--- toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -33,6 +33,7 @@
#include com/sun/star/awt/XDialog2.hpp
#include com/sun/star/awt/XSimpleTabController.hpp
#include com/sun/star/resource/XStringResourceResolver.hpp
+#include com/sun/star/graphic/XGraphicObject.hpp
#include toolkit/helper/servicenames.hxx
#include toolkit/helper/macros.hxx
#include toolkit/controls/unocontrolcontainer.hxx
@@ -47,8 +48,11 @@
class UnoControlDialogModel : public ControlModelContainerBase
{
protected:
+::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphicObject mxGrfObj;
::com::sun::star::uno::Any ImplGetDefaultValue( sal_uInt16 nPropId ) const;
::cppu::IPropertyArrayHelper SAL_CALL getInfoHelper();
+// ::cppu::OPropertySetHelper
+ void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any rValue ) throw (::com::sun::star::uno::Exception);
public:
UnoControlDialogModel( const ::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory i_factory );
UnoControlDialogModel( const UnoControlDialogModel rModel );
diff --git toolkit/inc/toolkit/controls/unocontrols.hxx toolkit/inc/toolkit/controls/unocontrols.hxx
index 91b8e2a..3fffee3 100644
--- toolkit/inc/toolkit/controls/unocontrols.hxx
+++ toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -72,6 +72,19 @@
#define UNO_NAME_GRAPHOBJ_URLPREFIX vnd.sun.star.GraphicObject:
#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX vnd.sun.star.Package:
+class ImageHelper
+{
+public:
+// The routine will always attempt to return a valid XGraphic for the
+// passed _rURL, additionallly xOutGraphicObject will contain the
+// associated XGraphicObject ( if url is valid for that ) and is set
+// appropriately ( e.g. NULL if non GraphicObject scheme ) or a valid
+// object if the rURL points to a valid object
+static ::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphicObject xOutGraphicObject, const ::rtl::OUString _rURL );
+static ::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic getGraphicFromURL_nothrow( const ::rtl::OUString _rURL );
+
+};
+
//
// class UnoControlEditModel
//
diff --git toolkit/source/controls/controlmodelcontainerbase.cxx toolkit/source/controls/controlmodelcontainerbase.cxx
index 2be6fa2..f2dd50a 100644
--- toolkit/source/controls/controlmodelcontainerbase.cxx
+++ toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1842,31 +1842,6 @@ void ControlContainerBase::ImplUpdateResourceResolver()
}
}
-
-uno::Reference graphic::XGraphic ControlContainerBase::Impl_getGraphicFromURL_nothrow( const ::rtl::OUString _rURL )
-{
-uno::Reference graphic::XGraphic xGraphic;
-if ( !_rURL.getLength() )
-return xGraphic;
-
-try
-{
-uno::Reference graphic::XGraphicProvider xProvider;
-if ( maContext.createComponent(
Re: input for fdo#45779 from a basegfx knowledgeable person needed
Or should I look higher in the hierarchy, saying that a NULL point in a B2DPolygon has nothing to do and disallow it ? Yes, the calling code somehow accesses invalid elements. Let me have a look. Fixed with d37abad97d72bae0fd0269de12e94c7a7d3fd7e1 - but, if you like, would be cool to chase down why in the first place the ppt import creates polygons with empty sub-paths, that looks like a worthwhile optimization - code is around filter/source/msfilter/msdffimp.cxx probably. Cheers, -- Thorsten pgp0hONMhEPAI.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-5] Fix for fdo#45779
Hi there, could someone please review cherry-pick http://cgit.freedesktop.org/libreoffice/core/commit/?id=d37abad97d72bae0fd0269de12e94c7a7d3fd7e1 for -3-5? TIA, -- Thorsten pgpMmILR9mq7a.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: No page and Columns boundaries in 3.5
On Tue, 14 Feb 2012 19:16:56 +0100, Fernand Vanrie s...@pmgroup.be wrote: On the user lists the first complaints about no page and column boundaries for LO Writer 3.5 are comming in. For some documents the new corner layout can be helpfull but without visible page and column boundaries it becomes very difficult to place images and other objects in a mulptiple column layout. Please make a simple option in Appearance to make the boundaries back to the user's choise. Greetz Fernand I think the issue is this one: https://bugs.freedesktop.org/show_bug.cgi?id=46073 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: linking performance
On 14/02/12 13:30, Mark Wielaard wrote: Hi, Added Tom to the CC, see thread here: http://thread.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/24055/focus=24096 (Although it seems posts from non-subscribers, aka me, are not allowed, so you won't see my earlier reply there. I'll send it to you separately.) On Tue, Feb 14, 2012 at 01:07:20PM +0100, Michael Stahl wrote: On 14/02/12 11:52, Michael Meeks wrote: On Mon, 2012-02-13 at 16:06 +0100, Michael Stahl wrote: [snip] Lubos was talking of using some more magic / smaller debug option in the past: -gdwarf-4 Are you using that ? I believe we turned it off by default again for some reason or other: potentially we want to add a check for a tolerably recent toolchain and debugger on the system before defaulting to that [ it supposedly saved 30% of the size ], but you need gdb 7.3 really. no, AFAIR Lubos enabled that on master and there were some problems with it (gdb was horribly slow or something), so he disabled it again a week later. That really needs some investigation (which is why I added Tom to the CC) recent GDB versions improved startup performance a lot, so if enabling DWARF4 would make GDB startup slower again (which surprises me) that would be really bad. Especially since DWARF4 is now the default at least on Fedora. Could you give some more specifics about what was tried, what the original startup times for gdb were and how much change you saw? hi Mark, Tom, the revert is here, which includes a link to a gdb bug: http://cgit.freedesktop.org/libreoffice/core/commit/?id=e87fc0bfde8bd48b449e123c1bdd28e1359e8c77 http://sourceware.org/bugzilla/show_bug.cgi?id=13498 regards, michael ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: README.cross patch [REJECTED]
Ther autogen.lastrun samples in README.cross are *examples*. If should be obvious that: --with-android-ndk=/home/tml/android-ndk-r7 is an example and not to be used literally. Replacing it with --with-android-ndk= Location of ndk download doesn't really help much. Especially as ndk download could be interpreted as meaning where the NDK *tarball* is downloaded... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [REVIEW-3-5] Fix for fdo#45779
On 15/02/12 11:32, Thorsten Behrens wrote: Hi there, could someone please review cherry-pick http://cgit.freedesktop.org/libreoffice/core/commit/?id=d37abad97d72bae0fd0269de12e94c7a7d3fd7e1 for -3-5? hmm.. dividing by 0 considered harmful indeed http://cgit.freedesktop.org/libreoffice/core/commit/?id=3c65e1fef5a4b4e41b4b3846712d7e76e94a34e8g=libreoffice-3-5 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW] fdo#45553 fix RTF import of space-before/after tokens
Hi, See http://cgit.freedesktop.org/libreoffice/core/commit/?id=c32b9cd2139249f0c680f664a0ceac3702dd0e73 Could someone review and cherry-pick to -3-5, please? Thanks, Miklos ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [PUSHED] Re: [PATCH]bug 44516 improved label and business card document creation
Hi Winfried, Winfried Donkers píše v St 15. 02. 2012 v 07:27 +0100: Pushed that, thank you a lot for that! http://cgit.freedesktop.org/libreoffice/core/commit/?id=80a72c4cc7edc6b4c0b88d841500617cd733cbf7 Kendy To my horror the behaviour of the pushed patch is not identical to the patch I tested last week. A newly created label document has all its labels (frames) placed without gaps between them. Did you change anything in the code (especially in applab.cxx), it could help me in locating the cause? I only changed some (leading) tabs to spaces, it should not affect anything. But to be sure, just take the patch from git and diff it with your patch that works for you, and look at the differences. [It might be a bit messy to look at a diff of diffs, but should point to problems if that is in the difference of those two.] And on top of that both my development machines (one ancient which needs 2hours+ to rebuild after the smallest change and a faster one which needs 2hours max for a clean build) are acting up on clean build, so I can't address the problem right away :(( - see separate post. I will change the bug status back to assigned and attack the problem as soon as I can build again. OK - should I revert the patch in the meantime? Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Turn on strictures for some installer Perl modules
Hi Tim ! On Tue, 2012-02-14 at 23:02 +, Tim Retout wrote: I'd like to try to clean up some of the code in the solenv Perl modules Cool ! it is long overdue. - as a first task, I want to turn on 'use strict', which I'd consider a bare minimum for maintainable Perl. Longer-term, Perl::Critic flags up lots of nice stuff, and then there's performance and so on. Great stuff. My first few attempts at this have ended up ballooning into large tasks - for instance, there seem to be lots of unused subroutines in the installer code, which could safely be removed. But I then end up not sending in any patches, and have no idea if I'm going way beyond what's acceptable. :) Oh - well; I would imagine that the installer code is riddled with unused stuff, certainly ! :-) a lot of this perl appears to have written by rather inexperienced perl programmers, without a very deep understanding (I'm afraid). So - if you see lots of low hanging fruit, that's because it is there ;-) Also the 'make_installer.pl' takes about 20 options, AFAIR there are however only a few legitimate parameters / configurations that are possible in the LibreOffice world. So - digging out the call sites (luckily the ooinstall wrapper seems to have swallowed most of them outside of instsetoo_native) and simplifying those paths would prolly expose much more redundancy to perl. So here's a first small patch that should be quite safe. Pushed; thanks :-) One thing I'd like to check: is the best way to test make_installer.pl to run: source config_host.mk solenv/bin/ooinstall /tmp/foo Norbert reports you want: make cmd cmd=solenv/bin/ooinstall ... (I get a few errors when sourcing config_host.mk.) Potentially you can make cmd cmd=bash :-) I've added my name to https://wiki.documentfoundation.org/Development/Developers with a link to my previous license statement on the mailing list. Great ! looking forward to your efforts here, there is a lot of dunging out to do. All the best, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [PUSHED] Re: [PATCH]bug 44516 improved label and business card document creation
Kendy wrote (15-02-2012 12.34) I only changed some (leading) tabs to spaces, it should not affect anything. But to be sure, just take the patch from git and diff it with your patch that works for you, and look at the differences. I thought so, but you never know. Thanks for checking. should I revert the patch in the meantime? I understood from Markus Mohrhard that Tor had fixed the git/qa problem. I intend to look into it later this afternoon (UTC); I don't think reverting the patch is necessary, it's 3.6, not a release, and as far as I saw, most of the patch worked as intended. You're the expert. I have set fdo#44516 to REOPENED. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 14 February 2012 19:23, Tor Lillqvist t...@iki.fi wrote: I also merged sal and sal_textenc (in the --enable-mergelibs case). Hmm, I experimented with this but apparently didn't commit and then did a git reset and lost the changes, or something. Will have a look again if I still have the stuff in Emacs buffers... --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: [PUSHED] Re: [PATCH]bug 44516 improved label and business card document creation
Hi Winfried, Winfried Donkers píše v St 15. 02. 2012 v 13:15 +0100: should I revert the patch in the meantime? I understood from Markus Mohrhard that Tor had fixed the git/qa problem. I intend to look into it later this afternoon (UTC); I don't think reverting the patch is necessary, it's 3.6, not a release, and as far as I saw, most of the patch worked as intended. Great - it was mostly to double check what is more convenient for you. It is great you are working on this, and I'll gladly let it in wait for the follow-up patch :-) All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
connectivity::ORowSetValue cleanup and behaviour
Hi,
The connectivity contains a ORowSetValue class, to hold a database
value, along with its type. Obviously this class is used all over
the place in our database-related code.
I'm itching to change it in non-trivial ways, and I've hit some
WTFs, so I thought I'd check if someone knows a good reason for some
of baroque choices made (which would mean my naive clean way might
introduce other bugs).
1) Variable-length strings and fixed-length strings never compare
equal. That's what started all this, because of a user-visible bug
consequence.
Errr... They obviously should?
2) Signed integers and unsigned integers never compare equal. But an
unsigned integer compares equal to the corresponding float...
Errr... They obviously should?
3) Unsigned integers are stored weirdly, that is as the next-bigger
size signed integer. Does anybody have *any* clue as to why this
could possibly be a good idea?
Oh, and unsigned 64 bit integer? Just stored as a *string*,
because, you know, we don't have a bigger signed integer at hand.
The data part of the class looks like:
class OOO_DLLPUBLIC_DBTOOLS ORowSetValue
{
union
{
sal_Boolm_bBool;
sal_Int8m_nInt8;
sal_Int16 m_nInt16;
sal_Int32 m_nInt32;
rtl_uString*m_pString;
void* m_pValue; // can contains double, etc
} m_aValue;
sal_Int32 m_eTypeKind;// the database type
sal_Boolm_bNull : 1;// value is null
sal_Boolm_bBound: 1;// is bound
sal_Boolm_bModified : 1;// value was changed
sal_Boolm_bSigned : 1;// value is signed
}
m_eTypeKind is a tag that says what type the value is: fixed-length
string, variable-length string, 8/16/32/64 bit (un)signed integer,
date, time, timestamp, decimal number, boolean, See
offapi/com/sun/star/sdbc/DataType.hdl
My first impulse was to reinterpret_cast() unsigned integers into
the *same* size signed integer and back, but actually cleaner to do:
class OOO_DLLPUBLIC_DBTOOLS ORowSetValue
{
union
{
sal_Boolm_bBool;
sal_Int8m_nInt8;
sal_Int16 m_nInt16;
sal_Int32 m_nInt32;
sal_uInt8 m_nuInt8;
sal_uInt16 m_nuInt16;
sal_uInt32 m_nuInt32;
rtl_uString*m_pString;
void* m_pValue; // can contains double, etc
} m_aValue;
sal_Int32 m_eTypeKind;// the database type
sal_Boolm_bNull : 1;// value is null
sal_Boolm_bBound: 1;// is bound
sal_Boolm_bModified : 1;// value was changed
sal_Boolm_bSigned : 1;// value is signed
}
That much shouldn't change the storage size of that class.
I'm tempted to actually go further and just make the class bigger, so
that we don't have to dynamically allocate storage for double, 64 bit
ints, etc, which (to me at least) seems like a bigger overhead than the
increase in memory:
class OOO_DLLPUBLIC_DBTOOLS ORowSetValue
{
union
{
sal_Boolm_bBool;
sal_Int8m_nInt8;
sal_Int16 m_nInt16;
sal_Int32 m_nInt32;
sal_Int64 m_nInt64;
sal_uInt8 m_nuInt8;
sal_uInt16 m_nuInt16;
sal_uInt32 m_nuInt32;
sal_uInt64 m_nuInt64;
rtl_uString*m_pString;
float m_fFloat;
double m_fDouble;
void* m_pValue; // for complex types
} m_aValue;
sal_Int32 m_eTypeKind;// the database type
sal_Boolm_bNull : 1;// value is null
sal_Boolm_bBound: 1;// is bound
sal_Boolm_bModified : 1;// value was changed
sal_Boolm_bSigned : 1;// value is signed
}
And since e.g. ::com::sun::star::util::Date and Time are structs of
three or four 16-bit integers, let's stick them in the union, too.
Any opinions, vetos, insights? Am I misguided about the minimal
memory amount taken vs dynamic allocation overhead balance?
--
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 15 February 2012 13:35, Tor Lillqvist t...@iki.fi wrote: On 14 February 2012 19:23, Tor Lillqvist t...@iki.fi wrote: I also merged sal and sal_textenc (in the --enable-mergelibs case). Hmm, I experimented with this but apparently didn't commit and then did a git reset and lost the changes, or something. Will have a look again if I still have the stuff in Emacs buffers... It was something more than this: ? http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/androidid=4866737a489d66fc2dc2153641390b609e1d5905 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [EasyHack] #44681 port to CLucene from java/Lucene
On Tue, 2012-02-14 at 22:27 +0100, Gert van Valkenhoef wrote:
1. how to convert the rtl::UOString to the TCHAR* that CLucene needs.
2. In xmlhelp/source/cxxhelp/provider/makefile.mk, I've hacked the
include path to include l10ntools/source/help
Attached patch hopefully basically takes care of those two
3. The conversion from using UNIX dirent.h and friends to using 'sal'
still needs to happen, and I think that will help get rid of some
awkward string conversions too.
Straight forward enough, e.g. search for FiltersTest::recursiveScan on
http://opengrok.libreoffice.org for similar.
C.
From e284bee921940b42885e4a9f92f1a7da1b51b847 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
Date: Wed, 15 Feb 2012 12:55:11 +
Subject: [PATCH] tweak build
---
l10ntools/inc/l10ntools/HelpIndexer.hxx | 71 +
l10ntools/inc/l10ntools/dllapi.h | 49 +
l10ntools/prj/d.lst |2 +
l10ntools/source/help/HelpIndexer.cxx | 22 +++-
l10ntools/source/help/HelpIndexer.hxx | 69
l10ntools/source/help/HelpIndexer_main.cxx|2 +-
l10ntools/source/help/makefile.mk | 20 +++
xmlhelp/source/cxxhelp/provider/databases.cxx |2 +-
xmlhelp/source/cxxhelp/provider/makefile.mk |2 -
xmlhelp/util/makefile.mk |1 +
10 files changed, 153 insertions(+), 87 deletions(-)
create mode 100644 l10ntools/inc/l10ntools/HelpIndexer.hxx
create mode 100644 l10ntools/inc/l10ntools/dllapi.h
delete mode 100644 l10ntools/source/help/HelpIndexer.hxx
diff --git a/l10ntools/inc/l10ntools/HelpIndexer.hxx b/l10ntools/inc/l10ntools/HelpIndexer.hxx
new file mode 100644
index 000..ac034b5
--- /dev/null
+++ b/l10ntools/inc/l10ntools/HelpIndexer.hxx
@@ -0,0 +1,71 @@
+#ifndef HELPINDEXER_HXX
+#define HELPINDEXER_HXX
+
+#include l10ntools/dllapi.h
+
+#include CLucene/StdHeader.h
+#include CLucene.h
+
+#include rtl/ustring.hxx
+#include set
+
+// I assume that TCHAR is defined as wchar_t throughout
+
+class L10N_DLLPUBLIC HelpIndexer {
+ private:
+ rtl::OUString d_lang;
+ rtl::OUString d_module;
+ rtl::OUString d_captionDir;
+ rtl::OUString d_contentDir;
+ rtl::OUString d_indexDir;
+ rtl::OUString d_error;
+ std::setrtl::OUString d_files;
+
+ public:
+
+ /**
+ * @param lang Help files language.
+ * @param module The module of the helpfiles.
+ * @param captionDir The directory to scan for caption files.
+ * @param contentDir The directory to scan for content files.
+ * @param indexDir The directory to write the index to.
+ */
+ HelpIndexer(rtl::OUString const lang, rtl::OUString const module,
+ rtl::OUString const captionDir, rtl::OUString const contentDir,
+ rtl::OUString const indexDir);
+
+ /**
+ * Run the indexer.
+ * @return true if index successfully generated.
+ */
+ bool indexDocuments();
+
+ /**
+ * Get the error string (empty if no error occurred).
+ */
+ rtl::OUString const getErrorMessage();
+
+ private:
+
+ /**
+ * Scan the caption contents directories for help files.
+ */
+ bool scanForFiles();
+
+ /**
+ * Scan for files in the given directory.
+ */
+ bool scanForFiles(rtl::OUString const path);
+
+ /**
+ * Fill the Document with information on the given help file.
+ */
+ bool helpDocument(rtl::OUString const fileName, lucene::document::Document *doc);
+
+ /**
+ * Create a reader for the given file, and create an empty reader in case the file doesn't exist.
+ */
+ lucene::util::Reader *helpFileReader(rtl::OUString const path);
+};
+
+#endif
diff --git a/l10ntools/inc/l10ntools/dllapi.h b/l10ntools/inc/l10ntools/dllapi.h
new file mode 100644
index 000..184a590
--- /dev/null
+++ b/l10ntools/inc/l10ntools/dllapi.h
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3
[PUSHED 3-5] Re: [REVIEW][3-5] Re: Bug 45530 - Accessibility does not work
Hi Michael, Michael Stahl píše v St 15. 02. 2012 v 13:35 +0100: please somebody review and backport the following to libreoffice-3-5: http://cgit.freedesktop.org/libreoffice/core/commit/?id=fbe60c962259ae0449acd65e74fd790530045e93 http://cgit.freedesktop.org/libreoffice/core/commit/?id=9c4581a6b61c0836c3a44eaaf454b9ba560e937a Pushed to libreoffice-3-5 :-) Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED][PATCH] unusedcode.easy: Removed unused code
On Fri, 2012-02-10 at 17:39 +0100, Alexander Bergmann wrote: --- editeng/source/editeng/editdoc.cxx |8 editeng/source/editeng/editdoc.hxx |1 - pushed this now, thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
It was something more than this: ? Umm, no, that was it. Now I am confused, why don't I see that in my master checkout after merging the branch to master? Git is a mystery. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments - final patch
On Wed, Feb 15, 2012 at 01:46:55PM +0100, Philipp Weissenbacher wrote: So, any developer wishes on what to translate next? In general, dbaccess/ and connectivity/ are the two modules of particular interest to me. I get the impression I'll have to dig into forms/ in the next months, just today, I stumbled on forms/source/component/DatabaseForm.cxx and ListBox.cxx extensions/source/propctrlr/formmetadata.cxx has very few comments, but some are in German. (You can CC patches against these modules to me when you send them to the list.) -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 02/14/2012 06:23 PM, Tor Lillqvist wrote: I also merged sal and sal_textenc (in the --enable-mergelibs case). I'm not sure this is not counter-productive. For Android and iOS it might be vital to get sal_textenc merged, to reduce the overall number of dynamic libraries. But for other platforms, it was a deliberate move to break sal_textenc out of sal to reduce start up time. As it stands, sal_textenc requires lots of relocations in data segments that have to be done by loaders upfront at load time. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Remove unused methods from PDFI
On Mon, 2012-02-13 at 19:48 +, Kate Goss wrote: I'm also contemplating tackling bugs in bugzilla assistant, if that would be helpful. Oh ! cool :-) yes very much so, Rainer has a number of tweaks and issues in there queued up for fixing if I remember correctly, it'd be just lovely to have someone to own and help maintain that beastie. I suspect you'll need to get access to the page from the website team too, perhaps Christian can get you setup, I believe Thorsten pointed you at the git repository. This would be most valuable, there is a lot of improvement possible there, from translation, through better instructions for subsetting documents to the minimum necessary to show the bug, to improving the authentication synchronisation ;-) Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] [PUSHED] Translate German comments - final patch
Hi, pushed this with minor modifications. Thanks a lot for your work, Philipp! I hope you weren't already on this, Lionel... if yes, sorry. Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [PATCH] Help - minor updates
Hi Stanislav, Radek Doulik píše v Út 14. 02. 2012 v 17:53 +0100: Makes sense, thanks for clarification. Pushed. (master and 3-5 branches) Marking the thread as [PUSHED] :-) BTW - it is great that you are working on the help! Do you want to continue? I think some of the new 3.5 features might need an update in the help too - would that be interesting for you? Can you please also confirm that your patch is under MPL / LGPLv3+ license? The best way is to send a blanket mail to this list that this is your preferred license for your past, present, and future contributions to LO, and add yourself to the following wiki page together with link to that mail [in an archive]: http://wiki.documentfoundation.org/Development/Developers Thank you a lot, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: changes in profile path in release notes for 3.5
Stephan Bergmann wrote (13-02-12 10:06) Introduced with http://cgit.freedesktop.org/libreoffice/core/commit/?id=9276f7d5740a28b342db2a9bcd8644ff2f4f5742 fdo#32263; should affect all Linux desktops. Thanks for the info, Stephan, -- - Cor - http://nl.libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments - final patch
On Wed, 2012-02-15 at 13:46 +0100, Philipp Weissenbacher wrote: Find attached the patch that finalises my efforts to get rid of the German comments in sw/source/core/doc. Wonderful ! :-) Thanks Michael BTW for the mention in your Easy Hacks talk at FOSDEM. Much appreciated! Hey ! not appreciated nearly as much as the good work you're doing - it's awesome. So, any developer wishes on what to translate next? Cedric was giving a personal plea for sw/source/core/layout/ which he wrestles with daily, is non-obvious code, and packed with impenetrable German ;-) ~2700 detected lines in there .. Any chance of that ? Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: connectivity::ORowSetValue cleanup and behaviour
On Wed, Feb 15, 2012 at 01:55:34PM +0100, Lionel Elie Mamane wrote: 2) Signed integers and unsigned integers never compare equal. But an unsigned integer compares equal to the corresponding float... Errr... They obviously should? I misread the code... Need coffee. integers never compare equal to floats, they don't even compare equal to the corresponding integer of different size? E.g. 5 as a 16-bit integer is not equal to 5 as a 32-bit integer. I'm suddenly more shy about changing that... The intended semantics seem different, but OTOH, frm::OListBoxModel::translateDbColumnToControlValue clearly expects wider semantics (more things are equal). Dunno about other callers. Mainly, I see no reason why floats of different subtypes should compare equal, but not integers. Thinking about it. -- Lionel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW 3-5] Reintroduce pyuno.so wrapper around libpyuno.so
As per https://bugs.freedesktop.org/show_bug.cgi?id=45696#c3 Importing uno bindings in python causes crash the master commit http://cgit.freedesktop.org/libreoffice/core/commit/?id=0b1be1ce0e0ac7b34c4b73d53f4bf32ec5df7290 Reintroduce pyuno.so wrapper around libpyuno.so should please be reviewed and cherry-picked to libreoffice-3-5. (It only actually affects platforms with somewhat old GCC versions, so there should typically be no need to backport this to any Linux-distro's 3.5.0 offerings.) Thanks, Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Code removal, first contribution
Hi Catalin Catalin Iacob píše v Po 13. 02. 2012 v 22:09 +0100: So it sounds like you did an excellent job; what's next ? an easy hack perhaps ? or more unused code ? :-) It would be cool to try an easy hack If you haven't chosen yet, the Easy Hack landing page is here: http://wiki.documentfoundation.org/Development/Easy_Hacks with more of them here: http://wiki.documentfoundation.org/Development/Easy_Hacks_by_Difficulty If none of them sounds as something you'd like to do, just tell us what is your favorite programming language and hacking topic, and I am sure in LibreOffice, we have something that fits :-) Regards, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments - final patch
On 15 February 2012 14:56, Michael Meeks michael.me...@suse.com wrote: So, any developer wishes on what to translate next? Cedric was giving a personal plea for sw/source/core/layout/ which he wrestles with daily, is non-obvious code, and packed with impenetrable German ;-) ~2700 detected lines in there .. Any chance of that ? I put it on my TODO list, but 2700 lines may take a while :). Cheers, Philipp ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments - final patch
2012/2/15 Philipp Weissenbacher p.weissenbac...@gmail.com: On 15 February 2012 14:56, Michael Meeks michael.me...@suse.com wrote: So, any developer wishes on what to translate next? Cedric was giving a personal plea for sw/source/core/layout/ which he wrestles with daily, is non-obvious code, and packed with impenetrable German ;-) ~2700 detected lines in there .. Any chance of that ? I put it on my TODO list, but 2700 lines may take a while :). Philipp: shall we team up on above ? In my experience good translation requires some understanding of the code, this is sometimes a Catch22 as comment were meant to explain the code -- Luc Castermans mailto:luc.casterm...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments - final patch
Hi On Wed, 2012-02-15 at 13:56 +, Michael Meeks wrote: [...] So, any developer wishes on what to translate next? Cedric was giving a personal plea for sw/source/core/layout/ which he wrestles with daily, is non-obvious code, and packed with impenetrable German ;-) ~2700 detected lines in there .. I'm already working on this and will provide patches in a few days :) kind regards signature.asc Description: This is a digitally signed message part ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments - final patch
Hi On Wed, 2012-02-15 at 13:56 +, Michael Meeks wrote: [...] So, any developer wishes on what to translate next? Cedric was giving a personal plea for sw/source/core/layout/ which he wrestles with daily, is non-obvious code, and packed with impenetrable German ;-) ~2700 detected lines in there .. I'm already working on this and will provide patches in a few days :) kind regards nicolas ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
On 02/15/2012 03:11 PM, Tor Lillqvist wrote: I'm not sure this is not counter-productive. For Android and iOS it might be vital to get sal_textenc merged, Well, --enable-mergelibs is probably actually intended for Android only, I think? I wasn't sure about the status of --enable-mergelibs, whether it is only something Android-specific or whether it is also used to enable that general merge/LTO endeavor. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [REVIEW] smoketest - gbuild, TestExtension.idl needed ?
I wasn't sure about the status of --enable-mergelibs, whether it is only something Android-specific or whether it is also used to enable that general merge/LTO endeavor. I don't know either, really. But anyway, I will make the sal_textenc+sal merge Android-specific and not mergelibs-specific;) --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Translate German comments
Hi all, Lionel, Here are the files you mentioned earlier. Hope quality didn't suffer with this quick job. You might want to take a look at line num 2185 in DatabaseForm.cxx. Looks like commented out code. If you still find any German strings, please contact me and I'll help you. Cheers, Philipp 0001-Translate-German-comments.patch Description: Binary data 0002-Translate-German-comments.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Re: [PATCH] Remove unused code
Just adding [PUSHED] :-) Radek Doulik píše v Út 14. 02. 2012 v 19:03 +0100: Hi Santiago, thanks for you patch, pushed. Cheers Radek On Mon, 2012-02-13 at 21:55 +0100, Santiago Martinez wrote: This patch removes unused code as listed in unusedcode.easy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] convert table.hxx use in editeng/inc/editeng/forbiddencharacterstable.hxx
Hi
Updated patch implementing Ivan's suggestion. Passes make and make check.
Convert tools/table.hxx usage in
editeng/inc/editeng/forbiddencharacterstable.hxx to std::map
Contributed under LGPLv3+ / MPL 1.1 or later.
(And my license statement is on file in the wiki)
Regards, Noel.
On 2012-02-12 12:08, Ivan Timofeev wrote:
Hi Noel,
On 10.02.2012 10:56, Noel Grandin wrote:
Convert tools/table.hxx usage in
editeng/inc/editeng/forbiddencharacterstable.hxx to boost::ptr_map
ForbiddenCharactersInfo is simple wrapper for ForbiddenCharacters. It
only adds the bTemporary flag. But bTemporary seems to be write-only,
i.e unused. So, I'd suggest to remove bTemporary
ForbiddenCharactersInfo, and then convert to std::mapsal_uInt16,
ForbiddenCharacters. What do you think?
Best Regards,
Ivan
Disclaimer: http://www.peralex.com/disclaimer.html
diff --git a/editeng/inc/editeng/forbiddencharacterstable.hxx
b/editeng/inc/editeng/forbiddencharacterstable.hxx
index 5d499e8..3b73eb3 100644
--- a/editeng/inc/editeng/forbiddencharacterstable.hxx
+++ b/editeng/inc/editeng/forbiddencharacterstable.hxx
@@ -29,12 +29,11 @@
#ifndef _FORBIDDENCHARACTERSTABLE_HXX
#define _FORBIDDENCHARACTERSTABLE_HXX
-#include tools/table.hxx
-
#include salhelper/simplereferenceobject.hxx
#include com/sun/star/uno/Reference.hxx
#include com/sun/star/i18n/ForbiddenCharacters.hpp
#include editeng/editengdllapi.h
+#include map
namespace com {
namespace sun {
@@ -43,26 +42,24 @@ namespace lang {
class XMultiServiceFactory;
-struct ForbiddenCharactersInfo
-{
-com::sun::star::i18n::ForbiddenCharacters aForbiddenChars;
-sal_Bool bTemporary;
-};
-
-DECLARE_TABLE( SvxForbiddenCharactersTableImpl, ForbiddenCharactersInfo* )
-
-class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public
SvxForbiddenCharactersTableImpl, public salhelper::SimpleReferenceObject
+class EDITENG_DLLPUBLIC SvxForbiddenCharactersTable : public
salhelper::SimpleReferenceObject
{
+public:
+typedef std::mapsal_uInt16, com::sun::star::i18n::ForbiddenCharacters
CharInfoMap;
private:
+mutable CharInfoMap maCharInfoMap;
::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory mxMSF;
+com::sun::star::i18n::ForbiddenCharacters* GetCharInfo( sal_uInt16
nLanguage );
+
public:
-SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xMSF, sal_uInt16 nISize = 4,
sal_uInt16 nGrow = 4 );
-~SvxForbiddenCharactersTable();
+SvxForbiddenCharactersTable( ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory xMSF);
+~SvxForbiddenCharactersTable() {}
-const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters(
sal_uInt16 nLanuage, sal_Bool bGetDefault ) const;
-voidSetForbiddenCharacters( sal_uInt16 nLanuage , const
com::sun::star::i18n::ForbiddenCharacters );
-voidClearForbiddenCharacters( sal_uInt16 nLanuage );
+inline CharInfoMap Map() { return maCharInfoMap; }
+const com::sun::star::i18n::ForbiddenCharacters* GetForbiddenCharacters(
sal_uInt16 nLanguage, sal_Bool bGetDefault ) const;
+voidSetForbiddenCharacters( sal_uInt16 nLanguage , const
com::sun::star::i18n::ForbiddenCharacters );
+voidClearForbiddenCharacters( sal_uInt16 nLanguage );
};
#endif // _FORBIDDENCHARACTERSTABLE_HXX
diff --git a/editeng/source/misc/forbiddencharacterstable.cxx
b/editeng/source/misc/forbiddencharacterstable.cxx
index deb8d4d..30aed79 100644
--- a/editeng/source/misc/forbiddencharacterstable.cxx
+++ b/editeng/source/misc/forbiddencharacterstable.cxx
@@ -34,60 +34,45 @@
#include com/sun/star/lang/XMultiServiceFactory.hpp
-SvxForbiddenCharactersTable::SvxForbiddenCharactersTable(
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory
xMSF, sal_uInt16 nISize, sal_uInt16 nGrow )
- : SvxForbiddenCharactersTableImpl( nISize, nGrow )
+SvxForbiddenCharactersTable::SvxForbiddenCharactersTable(
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory
xMSF)
{
mxMSF = xMSF;
}
-
-SvxForbiddenCharactersTable::~SvxForbiddenCharactersTable()
-{
-for ( sal_uLong n = Count(); n; )
-delete GetObject( --n );
-}
-
-
-
const com::sun::star::i18n::ForbiddenCharacters*
SvxForbiddenCharactersTable::GetForbiddenCharacters( sal_uInt16 nLanguage,
sal_Bool bGetDefault ) const
{
-ForbiddenCharactersInfo* pInf = Get( nLanguage );
+com::sun::star::i18n::ForbiddenCharacters* pInf = NULL;
+CharInfoMap::iterator it = maCharInfoMap.find( nLanguage );
+if ( it != maCharInfoMap.end() )
+pInf = (it-second);
if ( !pInf bGetDefault mxMSF.is() )
{
-const SvxForbiddenCharactersTableImpl *pConstImpl = dynamic_castconst
SvxForbiddenCharactersTableImpl*(this);
-SvxForbiddenCharactersTableImpl* pImpl =
JRE warning on startup ...
Hi guys, There have been a number of complaints about JRE's being required during install, with the infamous and horribly unpleasant: LibreOffice requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart LibreOffice IMHO - showing this is utterly unacceptable; and I finally lost patience with it :-) Since we switched ~everything to passive registration, I believe this comes from the bundled extension help indexing on very-first-start. IMHO it would be far better to have no help for the couple of extensions we bundle, rather than this hideous first-start user experience. Then again, prolly we can throw this exception down the plughole in the help indexer. Pushed to the TSC agenda ... HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments - final patch
Cedric was giving a personal plea for sw/source/core/layout/ which he wrestles with daily, is non-obvious code, and packed with impenetrable German ;-) ~2700 detected lines in there .. I'm already working on this and will provide patches in a few days :) So I think we'll wait for that, right? I'd be happy to review any interim patches for you. @Luc: How about you start in dbaccess/ and I do connectivity/ as suggested by Llionel? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] SwDocStub now prints out parameters
Hey, thanks a lot for your great work here. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PATCH] Translate German comments - final patch
2012/2/15 Philipp Weissenbacher p.weissenbac...@gmail.com: Cedric was giving a personal plea for sw/source/core/layout/ which he wrestles with daily, is non-obvious code, and packed with impenetrable German ;-) ~2700 detected lines in there .. I'm already working on this and will provide patches in a few days :) So I think we'll wait for that, right? I'd be happy to review any interim patches for you. @Luc: How about you start in dbaccess/ and I do connectivity/ as suggested by Llionel? OK, fine for me. Let's align off-list. Regards, -- Luc Castermans mailto:luc.casterm...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: JRE warning on startup ...
On Wed, 2012-02-15 at 15:13 +, Michael Meeks wrote: Since we switched ~everything to passive registration, I believe this comes from the bundled extension help indexing on very-first-start. So, if its the case that its from extension help indexing, then this would probably be from xmlhelp/source/cxxhelp/provider/databases.cxx and search for com.sun.star.help.HelpIndexer Thing is though, is that the extension-help indexer should only be run if there is help but no foo.idxl pre-created index set of files, at least since my recent look at help that's what I thought I saw. And the bundled-extensions that comes with help, at least presenter-screen, and so forth are supposed to come with .idxl files which are created at build-time, so they shouldn't need to generate any index files. And anyway, I got the impression that even if there is no .idxl file that it would only be generated on first help query or some such. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
javadep.c Java 7
Hi, I found soltools/javadep/javadep.c that contains a very simple parser for java class files. The problem is that it is old, at least it does not handle the class files generated by Java 7: as far as I remember, java guys added the new types of constant pool entries, but... javadep.c:520: /* Unknown Constant_pool entry, this means we are * in trouble */ err_quit(corrupted class file\n); My question: is javadep.c a useful tool? If yes, I could update it. Because the class file format is one of the few areas where I have some experience. :) (However, I didn't yet look at the new specs closely.) Thanks, Ivan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: qa-build errros on clean code
Tor already fixed it and after a pull you should be able to build. (http://cgit.freedesktop.org/libreoffice/core/commit/?id=49a4b4c32bda86b97ef48d1d2ce9bf8f02d3e2e3) Hope that your next build succeeds. Markus No such luck :( After git pull -r, the first clean build went ok, but the next build gave the now familiar error: *** warn:legacy.osl:5863:1:/home/winfried/git/libo/sc/source/core/data/postit.cxx:640: ScPostIt::CreateCaptionFromInitData - need caption object or initial caption data Value: 8 33formel: =A1+B1 3 ucalc.cxx:2924:Assertion Test name: N12_GLOBAL__N_14TestE::testPostIts assertion failed - Expression: m_pDoc-GetNote(rAddr) == NULL - note hasn't moved Failures !!! Run: 30 Failure total: 1 Failures: 1 Errors: 0 warn:legacy.osl:5863:1:/home/winfried/git/libo/unotools/source/config/configmgr.cxx:217: OSL_ASSERT Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export GDBCPPUNITTRACE=gdb --args # for interactive debugging export VALGRIND=memcheck# for memory checking and retry. make[1]: *** [/home/winfried/git/libo/workdir/unxlngi6/CppunitTest/sc_ucalc.test] Error 1 make[1]: *** Waiting for unfinished jobs dmake: Error code 2, while making 'all' *** Any suggestions? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
more (caligra) test files ...
On Wed, 2012-02-15 at 10:15 +, Caolán McNamara wrote: On Wed, 2012-02-15 at 11:06 +0100, Michael Stahl wrote: that's the only thing that's still missing... should i file an easy hack? :) Indeed, that probably makes sense. If we're doing this systematically, we should prolly also grok these guys: svn co svn://anonsvn.kde.org/home/kde/trunk/tests/calligratests/ At the same time, last I poked them there were some problems, but IIRC they only hit at the layout stage in writer. I havn't done anything there for 3.5 HTH, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: poor little bug
On Tue, 2012-02-14 at 20:06 +0100, Luc Castermans wrote: I'm this poor little bug left alone in the corner. When will I be solved ? This is in pretty poor taste, and doesn't belong on the developers list - which is for discussion of constructive development: hacking on fixes, code pointers to help people get stuck in, code review etc. Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: qa-build errros on clean code
Hi Winfried, Il 15/02/2012 16:30, Winfried Donkers ha scritto: Value: 8 33formel: =A1+B1 3 ucalc.cxx:2924:Assertion Test name: N12_GLOBAL__N_14TestE::testPostIts assertion failed - Expression: m_pDoc-GetNote(rAddr) == NULL - note hasn't moved Any suggestions? I have this very same failure plus another connectivity related, building with this patch applied to at least finish the build: http://paste.ubuntu.com/843064/ hth -- Riccardo Magliocchetti ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
