[Libreoffice-commits] .: 2 commits - android/experimental configure.in
android/experimental/eagles051387/.classpath.in | 15 +++ android/experimental/eagles051387/.project | 33 +++ android/experimental/eagles051387/AndroidManifest.xml | 23 + android/experimental/eagles051387/lint.xml |3 android/experimental/eagles051387/proguard-project.txt | 20 android/experimental/eagles051387/project.properties | 14 +++ android/experimental/eagles051387/res/drawable-hdpi/ic_launcher.png |binary android/experimental/eagles051387/res/drawable-ldpi/ic_launcher.png |binary android/experimental/eagles051387/res/drawable-mdpi/ic_launcher.png |binary android/experimental/eagles051387/res/drawable-xhdpi/ic_launcher.png |binary android/experimental/eagles051387/res/layout/main.xml |8 + android/experimental/eagles051387/res/layout/star_center_menu_list.xml |6 + android/experimental/eagles051387/res/values/strings.xml |9 ++ android/experimental/eagles051387/src/org/libreoffice/experimental/eagles051387/Main_Menu.java | 17 android/experimental/eagles051387/src/org/libreoffice/experimental/eagles051387/StartCenterMenu.java | 42 ++ configure.in |2 16 files changed, 192 insertions(+) New commits: commit 8f80a0af7e48193d0c035c220537d7f40b915f56 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Apr 18 09:53:47 2012 +0300 Expand android/experimental/eagles051387/.classpath.in (for ANDROID_SDK_HOME) diff --git a/configure.in b/configure.in index fc6fdb1..1ecadf5 100644 --- a/configure.in +++ b/configure.in @@ -3285,6 +3285,7 @@ if test $cross_compiling = yes; then bin/repo-list.in \ android/Bootstrap/local.properties.in \ android/experiments/DocumentLoader/local.properties.in \ +android/experimental/eagles051387/.classpath.in \ android/qa/sc/local.properties.in \ android/qa/desktop/local.properties.in \ config.guess \ @@ -11367,6 +11368,7 @@ fi AC_CONFIG_FILES([config_host.mk ooo.lst bin/repo-list \ android/Bootstrap/local.properties \ android/experiments/DocumentLoader/local.properties \ +android/experimental/eagles051387/.classpath \ android/qa/sc/local.properties \ android/qa/desktop/local.properties]) AC_OUTPUT commit 67fd00163fa223ac5205cde364975fc0fb1da422 Author: Jonathan Aquilina eagles051...@gmail.com Date: Sat Apr 7 19:46:52 2012 +0200 Initial start of an Android UI (experimental) Started creating the menu list for the start center Beginning of code for Start Center menu list finished creating menu, issue getting it to display when program run refractored package name to org.libreoffice.experimental added the java files with renamed package added new experimental dir and updated packages with appropriate name diff --git a/android/experimental/eagles051387/.classpath.in b/android/experimental/eagles051387/.classpath.in new file mode 100644 index 000..10e58d3 --- /dev/null +++ b/android/experimental/eagles051387/.classpath.in @@ -0,0 +1,15 @@ +?xml version=1.0 encoding=UTF-8? +classpath + classpathentry kind=src path=src/ + classpathentry kind=src path=gen/ + classpathentry kind=con path=com.android.ide.eclipse.adt.LIBRARIES/ + classpathentry kind=lib path=@ANDROID_SDK_HOME@/platforms/android-10/android.jar + attributes + attribute name=javadoc_location value=file:@ANDROID_SDK_HOME@/docs/reference/ + /attributes + accessrules + accessrule kind=nonaccessible pattern=com/android/internal/**/ + /accessrules + /classpathentry + classpathentry kind=output path=bin/classes/ +/classpath diff --git a/android/experimental/eagles051387/.project b/android/experimental/eagles051387/.project new file mode 100644 index 000..b3a56bf --- /dev/null +++ b/android/experimental/eagles051387/.project @@ -0,0 +1,33 @@ +?xml version=1.0 encoding=UTF-8? +projectDescription + nameExperimental_Android_UI/name + comment/comment + projects + /projects + buildSpec + buildCommand + namecom.android.ide.eclipse.adt.ResourceManagerBuilder/name + arguments + /arguments + /buildCommand +
[Libreoffice-commits] .: 3 commits - sc/source sdext/source
sc/source/core/data/table6.cxx|4 ++--
sdext/source/minimizer/pppoptimizeruno.cxx|2 +-
sdext/source/presenter/PresenterAccessibility.cxx |2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ea1cd1a10cc2d2bbf4f82aeca689fe81a3b79856
Author: David Tardon dtar...@redhat.com
Date: Wed Apr 18 09:44:19 2012 +0200
fdo#44861 make Replace All work with REs
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 45bf02e..f4dc35e 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -202,13 +202,13 @@ bool ScTable::SearchCell(const SvxSearchItem
rSearchItem, SCCOL nCol, SCROW nRo
else if (bDoBack)
{
xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp;
-bRepeat = ((bool)(pSearchText-SearchBkwrd(aString,
nStart, nEnd)));
+bRepeat = ((bool)(pSearchText-SearchBkwrd(aString,
nStart, nEnd, aSearchResult)));
// change results to definition before 614:
--nEnd;
}
else
{
-bRepeat = ((bool)(pSearchText-SearchFrwrd(aString,
nStart, nEnd)));
+bRepeat = ((bool)(pSearchText-SearchFrwrd(aString,
nStart, nEnd, aSearchResult)));
// change results to definition before 614:
--nEnd;
}
commit 23d3532f9d7e60eca70930a7c2321192812c0c80
Author: David Tardon dtar...@redhat.com
Date: Tue Apr 17 14:58:53 2012 +0200
fix presentation minimizer registration
diff --git a/sdext/source/minimizer/pppoptimizeruno.cxx
b/sdext/source/minimizer/pppoptimizeruno.cxx
index cc3fd35..c95e828 100644
--- a/sdext/source/minimizer/pppoptimizeruno.cxx
+++ b/sdext/source/minimizer/pppoptimizeruno.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::registry;
extern C
{
-sal_Bool SAL_CALL component_writeInfo(
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
SAL_UNUSED_PARAMETER void* /*pServiceManager*/, void* pRegistryKey )
{
if (pRegistryKey)
commit 0ac093f3445dbf58907d8a9f9b7a2dfc07d306ef
Author: David Tardon dtar...@redhat.com
Date: Tue Apr 17 10:43:26 2012 +0200
mpAccessibleConsole is not a child of itself .-)
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx
b/sdext/source/presenter/PresenterAccessibility.cxx
index ff90539..522e4b8 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -688,7 +688,7 @@ void PresenterAccessible::UpdateAccessibilityHierarchy (
{
if (mpAccessibleNotes.is())
{
-mpAccessibleConsole-RemoveChild(mpAccessibleConsole.get());
+mpAccessibleConsole-RemoveChild(mpAccessibleNotes);
mpAccessibleNotes = NULL;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/table6.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 4bd76b74c0145635ef69caa94e3235f6ce3ab5de
Author: David Tardon dtar...@redhat.com
Date: Wed Apr 18 09:44:19 2012 +0200
fdo#44861 make Replace All work with REs
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 55ac066..44c5ecc 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -207,13 +207,13 @@ bool ScTable::SearchCell(const SvxSearchItem
rSearchItem, SCCOL nCol, SCROW nRo
else if (bDoBack)
{
xub_StrLen nTemp=nStart; nStart=nEnd; nEnd=nTemp;
-bRepeat = ((bool)(pSearchText-SearchBkwrd(aString,
nStart, nEnd)));
+bRepeat = ((bool)(pSearchText-SearchBkwrd(aString,
nStart, nEnd, aSearchResult)));
// change results to definition before 614:
--nEnd;
}
else
{
-bRepeat = ((bool)(pSearchText-SearchFrwrd(aString,
nStart, nEnd)));
+bRepeat = ((bool)(pSearchText-SearchFrwrd(aString,
nStart, nEnd, aSearchResult)));
// change results to definition before 614:
--nEnd;
}
___
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 - sw/source
sw/source/core/layout/paintfrm.cxx | 36
1 file changed, 24 insertions(+), 12 deletions(-)
New commits:
commit fe2a1f6bcb72b17d050355377b68e986f17cf1ff
Author: Michael Stahl mst...@redhat.com
Date: Tue Apr 17 22:30:25 2012 +0200
fdo#38635: sw: fix border corner gaps:
The start and end points of the vertical and adjacent horizontal borders
were apart by 1.5 to 3 twips, leading to small visible gaps in the corners.
This is fixed by using lcl_AlignWidth/lcl_AlignHeight on the border widths,
and by always computing the start/end positions from the outer edge,
which makes the horizontal and vertical start/end points match.
(regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2)
(cherry picked from commit b08e9f3023e9ea1ca0926334becac939ca8fdfac)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 0a451b8..69e32ff 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4483,8 +4483,13 @@ void lcl_PaintLeftRightLine( const sal_Bool
_bLeft,
nExtentOE = lcl_GetExtent( pBottomBorder, NULL );
}
-basegfx::B2DPoint aStart( aRect.Left() + aRect.Width() / 2.0,
aRect.Top() + lcl_GetLineWidth( pTopBorder ) / 2.0 );
-basegfx::B2DPoint aEnd( aRect.Left() + aRect.Width() / 2.0,
aRect.Bottom() - lcl_GetLineWidth( pBottomBorder ) / 2.0 );
+double const fStartX( (_bLeft) // fdo#38635: always from outer edge
+? aRect.Left() + (aRect.Width() / 2.0)
+: aRect.Right() - (aRect.Width() / 2.0));
+basegfx::B2DPoint const aStart(fStartX,
+aRect.Top() + lcl_AlignHeight(lcl_GetLineWidth(pTopBorder))/2.0 );
+basegfx::B2DPoint const aEnd(fStartX,
+aRect.Bottom() -
lcl_AlignHeight(lcl_GetLineWidth(pBottomBorder))/2.0 );
double nLeftWidth = !_bLeft ? pLeftRightBorder-GetOutWidth() :
pLeftRightBorder-GetInWidth( );
double nRightWidth = !_bLeft ? pLeftRightBorder-GetInWidth() :
pLeftRightBorder-GetOutWidth( );
@@ -4558,8 +4563,15 @@ void lcl_PaintTopBottomLine( const sal_Bool
_bTop,
nExtentOE = lcl_GetExtent( NULL, pRightBorder );
}
-basegfx::B2DPoint aStart( aRect.Left() + lcl_GetLineWidth( pLeftBorder
) / 2.0, aRect.Top() + aRect.Height() / 2.0 );
-basegfx::B2DPoint aEnd( aRect.Right() - lcl_GetLineWidth( pRightBorder
) / 2.0, aRect.Top() + aRect.Height() / 2.0 );
+double const fStartY( (_bTop) // fdo#38635: always from outer edge
+? aRect.Top()+ (aRect.Height() / 2.0)
+: aRect.Bottom() - (aRect.Height() / 2.0));
+basegfx::B2DPoint const aStart(
+aRect.Left() + lcl_AlignWidth(lcl_GetLineWidth(pLeftBorder))/2.0,
+fStartY );
+basegfx::B2DPoint const aEnd(
+aRect.Right() - lcl_AlignWidth(lcl_GetLineWidth(pRightBorder))/2.0,
+fStartY );
double nLeftWidth = !_bTop ? pTopBottomBorder-GetOutWidth() :
pTopBottomBorder-GetInWidth( );
double nRightWidth = !_bTop ? pTopBottomBorder-GetInWidth() :
pTopBottomBorder-GetOutWidth( );
commit d53367946360483ffbc1bcd5babcfcef795507ce
Author: Michael Stahl mst...@redhat.com
Date: Sun Apr 15 15:28:50 2012 +0200
sw: create horizontal border lines with start left and end right
(cherry picked from commit 1d5e263a129c56e561ce145bad9749027c583a75)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 659606f..0a451b8 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4545,21 +4545,21 @@ void lcl_PaintTopBottomLine( const sal_Bool
_bTop,
if ( lcl_GetLineWidth( pTopBottomBorder ) 0 )
{
-double nExtentIS = lcl_GetExtent( pRightBorder, NULL );
-double nExtentIE = lcl_GetExtent( pLeftBorder, NULL );
-double nExtentOS = lcl_GetExtent( NULL, pRightBorder );
-double nExtentOE = lcl_GetExtent( NULL, pLeftBorder );
+double nExtentIS = lcl_GetExtent( NULL, pLeftBorder );
+double nExtentIE = lcl_GetExtent( NULL, pRightBorder );
+double nExtentOS = lcl_GetExtent( pLeftBorder, NULL );
+double nExtentOE = lcl_GetExtent( pRightBorder, NULL );
if ( !_bTop )
{
-nExtentIS = lcl_GetExtent( NULL, pRightBorder );
-nExtentIE = lcl_GetExtent( NULL, pLeftBorder );
-nExtentOS = lcl_GetExtent( pRightBorder, NULL );
-nExtentOE = lcl_GetExtent( pLeftBorder, NULL );
+nExtentIS = lcl_GetExtent( pLeftBorder, NULL );
+nExtentIE = lcl_GetExtent( pRightBorder, NULL );
+nExtentOS = lcl_GetExtent( NULL, pLeftBorder );
+nExtentOE = lcl_GetExtent( NULL, pRightBorder );
[Libreoffice-commits] .: 2 commits - sysui/desktop
sysui/desktop/menus/base.desktop|5 +
sysui/desktop/menus/calc.desktop|5 +
sysui/desktop/menus/draw.desktop|7 ++-
sysui/desktop/menus/impress.desktop |5 +
sysui/desktop/menus/math.desktop|5 +
sysui/desktop/menus/writer.desktop |5 +
sysui/desktop/share/makefile.mk |4 +++-
sysui/desktop/share/translate.pl| 18 +++---
8 files changed, 49 insertions(+), 5 deletions(-)
New commits:
commit b7423ceee1a6b1c5595fbbef6f0ca4417feeddf6
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Wed Apr 18 12:00:30 2012 +0200
lp#720716: add unity quicklist support
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 56a25a2..8cc8e7c 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Base
GenericName=Database Development
Comment=Manage databases, create queries and reports to track and manage your
information by using Base.
InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Database
+Exec=libreoffice --base %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index f58a164..d1a4147 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Calc
GenericName=Spreadsheet
Comment=Perform calculations, analyze information and manage lists in
spreadsheets by using Calc.
InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Spreadsheet
+Exec=libreoffice --calc %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 7819d81..e558330 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Draw
GenericName=Drawing Program
Comment=Create and edit drawings, flow charts, and logos by using Draw.
InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Drawing
+Exec=libreoffice --draw %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/impress.desktop
b/sysui/desktop/menus/impress.desktop
index 84f16a9..1ea00aa 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Impress
GenericName=Presentation
Comment=Create and edit presentations for slideshows, meeting and Web pages by
using Impress.
InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Presentation
+Exec=libreoffice --impress %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 9b87ef0..70b5695 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -11,3 +11,8 @@ Name=%PRODUCTNAME Math
GenericName=Formula Editor
Comment=Create and edit scientific formulas and equations by using Math.
InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Formula
+Exec=libreoffice --math %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/writer.desktop
b/sysui/desktop/menus/writer.desktop
index 0b6f116..8698e97 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -10,3 +10,8 @@ Name=%PRODUCTNAME Writer
GenericName=Word Processor
Comment=Create and edit text and graphics in letters, reports, documents and
Web pages by using Writer.
InitialPreference=5
+X-Ayatana-Desktop-Shortcuts=New
+[New Shortcut Group]
+UnityQuicklist=New Document
+Exec=libreoffice --writer %U
+TargetEnvironment=Unity
diff --git a/sysui/desktop/share/makefile.mk b/sysui/desktop/share/makefile.mk
index 1d99c84..0a7c549 100644
--- a/sysui/desktop/share/makefile.mk
+++ b/sysui/desktop/share/makefile.mk
@@ -50,6 +50,7 @@ ULFFILES= \
documents.ulf \
launcher_comment.ulf \
launcher_genericname.ulf \
+launcher_unityquicklist.ulf \
launcher_name.ulf
LAUNCHERLIST_APPS = writer calc draw impress math base printeradmin startcenter
@@ -146,7 +147,7 @@ ALLTAR : $(LAUNCHERFLAGFILE) $(SPECFILES)
$(COMMONMISC)$/{$(PRODUCTLIST)}$/build
# merge-in the translations.
#
-$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl
$(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf
$(ULFDIR)/launcher_genericname.ulf
+$(LAUNCHERFLAGFILE) : ../productversion.mk brand.pl translate.pl
$(ULFDIR)$/launcher_name.ulf $(ULFDIR)$/launcher_comment.ulf
$(ULFDIR)/launcher_genericname.ulf $(ULFDIR)/launcher_unityquicklist.ulf
$(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@@-$(MKDIRHIER) $(@:db).$(INPATH).$(@:f)
@echo Creating desktop entries for $(@:f) ..
@@ -155,6 +156,7 @@ $(LAUNCHERFLAGFILE) : $(LAUNCHERDEPN)
@$(PERL) translate.pl -p '$${{PRODUCTNAME}} $${{PRODUCTVERSION}}' -d
$(@:db).$(INPATH).$(@:f)
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/bootstrap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cb5c881a7f179391ee853f76e159254c97d776a3
Author: Michael Meeks michael.me...@suse.com
Date: Wed Apr 18 11:04:08 2012 +0100
avoid using the new rdb reading logic for empty/non-existent directories
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index cc64e07..fad335b 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -333,7 +333,7 @@ Reference registry::XSimpleRegistry readRdbDirectory(
}
nXML++;
}
-if (nXML == aURLs.size())
+if (nXML 0 nXML == aURLs.size())
{
OSL_TRACE (OSL_LOG_PREFIX no legacy rdbs in directory '%s'\n,
rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8
).getStr());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 3d2333d362a7f02eef4c0d826ae17581e84ec479 Author: Rene Engelhard r...@debian.org Date: Tue Apr 17 17:46:03 2012 +0200 add 5.3 into the db check for-loop Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/configure.in b/configure.in index ea9dee1..d01e82f 100644 --- a/configure.in +++ b/configure.in @@ -5110,7 +5110,7 @@ if test $with_system_db = yes; then AC_MSG_RESULT([external]) db_header= -for dbver in 5.1 5.0 5 4.8 4.7 4; do +for dbver in 5.3 5.1 5.0 5 4.8 4.7 4; do for dash in - ''; do AC_CHECK_HEADER([db$dash$dbver/db.h], [ db_header=db$dash$dbver/db.h; break 2 ]) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cppuhelper/source
cppuhelper/source/bootstrap.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 7ed7df6ba854a799e8e9fb92c68650cc5e6e5695
Author: Michael Meeks michael.me...@suse.com
Date: Wed Apr 18 11:04:08 2012 +0100
avoid using the new rdb reading logic for empty/non-existent directories
Signed-off-by: Stephan Bergmann sberg...@redhat.com
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 7ead585..cd0313e 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -322,7 +322,7 @@ Reference registry::XSimpleRegistry readRdbDirectory(
}
nXML++;
}
-if (nXML == aURLs.size())
+if (nXML 0 nXML == aURLs.size())
{
OSL_TRACE (OSL_LOG_PREFIX no legacy rdbs in directory '%s'\n,
rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8
).getStr());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/appoptio.hxx |5 -
sc/inc/scmod.hxx|2 +-
sc/source/core/tool/appoptio.cxx|4
sc/source/ui/vba/vbaapplication.cxx | 10 +-
sc/source/ui/view/tabvwsh4.cxx | 11 +--
5 files changed, 7 insertions(+), 25 deletions(-)
New commits:
commit 27dda3134748cd0a549b75db830496539959eb90
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Tue Apr 17 20:25:53 2012 +0200
Removed duplicate set/get methods for initial tab count
diff --git a/sc/inc/appoptio.hxx b/sc/inc/appoptio.hxx
index b7f5fe8..d4cc424 100644
--- a/sc/inc/appoptio.hxx
+++ b/sc/inc/appoptio.hxx
@@ -46,10 +46,6 @@ public:
voidSetDefaults();
-// Set or get the initial tab count for new spreadsheet, it is used by VBA
API currently.
-voidSetTabCountInNewSpreadsheet( SCTAB nCount ) {
nTabCountInNewSpreadsheet = nCount; }
-SCTAB GetTabCountInNewSpreadsheet() const { return
nTabCountInNewSpreadsheet; }
-
voidSetAppMetric( FieldUnit eUnit ) { eMetric = eUnit; }
FieldUnit GetAppMetric() const{ return eMetric; }
voidSetZoom( sal_uInt16 nNew ) { nZoom = nNew; }
@@ -94,7 +90,6 @@ public:
const ScAppOptions operator= ( const ScAppOptions rOpt );
private:
-SCTAB nTabCountInNewSpreadsheet;
FieldUnit eMetric;
sal_uInt16 nLRUFuncCount;
sal_uInt16* pLRUList;
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 4c36f30..69bc665 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -182,7 +182,7 @@ public:
const ScViewOptionsGetViewOptions ();
SC_DLLPUBLICconst ScDocOptions GetDocOptions ();
SC_DLLPUBLICconst ScAppOptions GetAppOptions ();
-const ScDefaultsOptions GetDefaultsOptions ();
+SC_DLLPUBLICconst ScDefaultsOptions GetDefaultsOptions ();
const ScFormulaOptions GetFormulaOptions ();
const ScInputOptions GetInputOptions ();
SC_DLLPUBLICconst ScPrintOptions GetPrintOptions ();
diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx
index 9b352b8..b864804 100644
--- a/sc/source/core/tool/appoptio.cxx
+++ b/sc/source/core/tool/appoptio.cxx
@@ -78,9 +78,6 @@ ScAppOptions::~ScAppOptions()
void ScAppOptions::SetDefaults()
{
-// Set default tab count for new spreadsheet.
-nTabCountInNewSpreadsheet = 0;
-
if ( ScOptionsUtil::IsMetricSystem() )
eMetric = FUNIT_CM; // default for countries with
metric system
else
@@ -118,7 +115,6 @@ void ScAppOptions::SetDefaults()
const ScAppOptions ScAppOptions::operator=( const ScAppOptions rCpy )
{
-nTabCountInNewSpreadsheet = rCpy.nTabCountInNewSpreadsheet;
eMetric = rCpy.eMetric;
eZoomType = rCpy.eZoomType;
bSynchronizeZoom = rCpy.bSynchronizeZoom;
diff --git a/sc/source/ui/vba/vbaapplication.cxx
b/sc/source/ui/vba/vbaapplication.cxx
index d0201a4..478e8f4 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -79,7 +79,7 @@
#include global.hxx
#include scmod.hxx
#include docoptio.hxx
-#include appoptio.hxx
+#include defaultsoptions.hxx
#include osl/file.hxx
#include rtl/instance.hxx
@@ -939,8 +939,8 @@ ScVbaApplication::setEnableCancelKey(sal_Int32
/*lEnableCancelKey*/) throw (uno:
sal_Int32 SAL_CALL ScVbaApplication::getSheetsInNewWorkbook() throw
(uno::RuntimeException)
{
-const ScAppOptions rAppOpt = SC_MOD()-GetAppOptions();
-return rAppOpt.GetTabCountInNewSpreadsheet();
+const ScDefaultsOptions rOpt = SC_MOD()-GetDefaultsOptions();
+return rOpt.GetInitTabCount();
}
void SAL_CALL ScVbaApplication::setSheetsInNewWorkbook( sal_Int32
SheetsInNewWorkbook ) throw (script::BasicErrorException, uno::RuntimeException)
@@ -952,8 +952,8 @@ void SAL_CALL ScVbaApplication::setSheetsInNewWorkbook(
sal_Int32 SheetsInNewWor
}
else
{
-ScAppOptions rAppOpt = const_cast ScAppOptions
(SC_MOD()-GetAppOptions());
-rAppOpt.SetTabCountInNewSpreadsheet( SheetsInNewWorkbook );
+ScDefaultsOptions rOpt = const_cast ScDefaultsOptions
(SC_MOD()-GetDefaultsOptions());
+rOpt.SetInitTabCount( SheetsInNewWorkbook );
}
}
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 4cf2624..238d124 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1605,19 +1605,10 @@ void ScTabViewShell::Construct( sal_uInt8
nForceDesignMode )
// append additional sheets (not for OLE object)
if ( pDocSh-GetCreateMode() != SFX_CREATE_MODE_EMBEDDED )
{
-// Get the customized initial tab count...
-
-// ... from option dialog.
+// Get the customized initial tab count
const ScDefaultsOptions rOpt = SC_MOD()-GetDefaultsOptions();
[Libreoffice-commits] .: 2 commits - configure.in sysui/desktop
configure.in|4 +++- sysui/desktop/share/launcher_unityquicklist.ulf | 23 +++ 2 files changed, 26 insertions(+), 1 deletion(-) New commits: commit 04ce0e891ecb9c4bb51fd19e9588ecb8613ac788 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Apr 18 13:14:07 2012 +0200 lp#720716: add unity quicklist support (add missed file) diff --git a/sysui/desktop/share/launcher_unityquicklist.ulf b/sysui/desktop/share/launcher_unityquicklist.ulf new file mode 100644 index 000..d1b0c86 --- /dev/null +++ b/sysui/desktop/share/launcher_unityquicklist.ulf @@ -0,0 +1,23 @@ +[writer] +en-US = New Document + +[impress] +en-US = New Presentation + +[calc] +en-US = New Spreadsheet + +[base] +en-US = New Database + +[math] +en-US = New Formula + +[draw] +en-US = New Drawing + +[startcenter] +en-US = + +[javafilter] +en-US = commit 79e185898a577a2f90493f128628e559a481a374 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Apr 18 13:07:51 2012 +0200 update configure help for --enable-debug diff --git a/configure.in b/configure.in index 499cbf0..4f981fc 100644 --- a/configure.in +++ b/configure.in @@ -637,7 +637,9 @@ AC_ARG_ENABLE(debug, [Include debugging symbols from --enable-symbols plus extra debugging code. Extra large build! (enables -g compiler flag and dmake debug=true) If you need even more verbose output, build a module with - build -- debug=true dbglevel=2.])) + build -- debug=true dbglevel=2. You can also use this switch as follows: + --enable-debug=tl svx to enable debug only for the specified + gbuild-build libraries.])) AC_ARG_ENABLE(dbgutil, AS_HELP_STRING([--enable-dbgutil], ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/vml/vmlshape.hxx | 58 +--
1 file changed, 29 insertions(+), 29 deletions(-)
New commits:
commit 8fd03963cdaa0ffd9a5fbe0f56d6e4c2700e7883
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Apr 18 14:01:56 2012 +0200
oox: fix doxygen syntax to avoid misleading output in vml::ClientData
diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx
index d11e34a..82c0f3e 100644
--- a/oox/inc/oox/vml/vmlshape.hxx
+++ b/oox/inc/oox/vml/vmlshape.hxx
@@ -139,35 +139,35 @@ protected:
/** Excel specific shape client data (such as cell anchor). */
struct ClientData
{
-::rtl::OUString maAnchor; /// Cell anchor as comma-separated
string.
-::rtl::OUString maFmlaMacro;/// Link to macro associated to
the control.
-::rtl::OUString maFmlaPict; /// Target cell range of picture
links.
-::rtl::OUString maFmlaLink; /// Link to value cell associated
to the control.
-::rtl::OUString maFmlaRange;/// Link to cell range used as
data source for the control.
-::rtl::OUString maFmlaGroup;/// Link to value cell associated
to a group of option buttons.
-sal_Int32 mnObjType; /// Type of the shape.
-sal_Int32 mnTextHAlign; /// Horizontal text alignment.
-sal_Int32 mnTextVAlign; /// Vertical text alignment.
-sal_Int32 mnCol; /// Column index for spreadsheet
cell note.
-sal_Int32 mnRow; /// Row index for spreadsheet cell
note.
-sal_Int32 mnChecked; /// State for checkboxes and
option buttons.
-sal_Int32 mnDropStyle;/// Drop down box style (read-only
or editable).
-sal_Int32 mnDropLines;/// Number of lines in drop down
box.
-sal_Int32 mnVal; /// Current value of spin buttons
and scroll bars.
-sal_Int32 mnMin; /// Minimum value of spin buttons
and scroll bars.
-sal_Int32 mnMax; /// Maximum value of spin buttons
and scroll bars.
-sal_Int32 mnInc; /// Small increment of spin
buttons and scroll bars.
-sal_Int32 mnPage; /// Large increment of spin
buttons and scroll bars.
-sal_Int32 mnSelType; /// Listbox selection type.
-sal_Int32 mnVTEdit; /// Data type of the textbox.
-boolmbPrintObject; /// True = print the object.
-boolmbVisible; /// True = cell note is visible.
-boolmbDde; /// True = object is linked
through DDE.
-boolmbNo3D; /// True = flat style, false = 3D
style.
-boolmbNo3D2;/// True = flat style, false = 3D
style (listboxes and dropdowns).
-boolmbMultiLine;/// True = textbox allows line
breaks.
-boolmbVScroll; /// True = textbox has a vertical
scrollbar.
-boolmbSecretEdit; /// True = textbox is a password
edit field.
+::rtl::OUString maAnchor; /// Cell anchor as
comma-separated string.
+::rtl::OUString maFmlaMacro;/// Link to macro associated to
the control.
+::rtl::OUString maFmlaPict; /// Target cell range of picture
links.
+::rtl::OUString maFmlaLink; /// Link to value cell associated
to the control.
+::rtl::OUString maFmlaRange;/// Link to cell range used as
data source for the control.
+::rtl::OUString maFmlaGroup;/// Link to value cell associated
to a group of option buttons.
+sal_Int32 mnObjType; /// Type of the shape.
+sal_Int32 mnTextHAlign; /// Horizontal text alignment.
+sal_Int32 mnTextVAlign; /// Vertical text alignment.
+sal_Int32 mnCol; /// Column index for spreadsheet
cell note.
+sal_Int32 mnRow; /// Row index for spreadsheet
cell note.
+sal_Int32 mnChecked; /// State for checkboxes and
option buttons.
+sal_Int32 mnDropStyle;/// Drop down box style
(read-only or editable).
+sal_Int32 mnDropLines;/// Number of lines in drop down
box.
+sal_Int32 mnVal; /// Current value of spin buttons
and scroll bars.
+sal_Int32 mnMin; /// Minimum value of spin buttons
and scroll bars.
+sal_Int32 mnMax; /// Maximum value of spin buttons
and scroll bars.
+sal_Int32 mnInc; /// Small increment of spin
buttons and scroll bars.
+sal_Int32 mnPage; /// Large increment of spin
buttons and scroll bars.
+sal_Int32 mnSelType;
[Libreoffice-commits] .: 11 commits - bin/get-bugzilla-attachments-by-mimetype comphelper/inc comphelper/source cppcanvas/Library_cppcanvas.mk cppcanvas/source sc/source svtools/inc svtools/qa svtools
bin/get-bugzilla-attachments-by-mimetype |6 - comphelper/inc/comphelper/logging.hxx| 13 -- comphelper/source/misc/logging.cxx |6 - cppcanvas/Library_cppcanvas.mk |1 cppcanvas/source/wrapper/basegfxfactory.cxx | 10 + cppcanvas/source/wrapper/impltext.cxx| 96 --- cppcanvas/source/wrapper/impltext.hxx| 73 -- cppcanvas/source/wrapper/vclfactory.cxx |1 sc/source/filter/inc/stylesbuffer.hxx| 13 -- sc/source/filter/oox/addressconverter.cxx| 16 --- sc/source/filter/oox/stylesbuffer.cxx| 91 -- svtools/inc/svtools/svlbitm.hxx |1 svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg |binary svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg |binary svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg |binary svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg |binary svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg |binary svtools/qa/cppunit/filters-test.cxx |4 svtools/source/contnr/svlbitm.cxx|7 - svtools/source/edit/texteng.cxx | 15 -- svtools/source/misc/embedhlp.cxx |2 svtools/source/misc/templatefoldercache.cxx |6 - svtools/source/svrtf/svparser.cxx| 31 -- svtools/source/uno/unoiface.cxx |5 svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx |4 svx/source/sdr/contact/viewcontactofpageobj.cxx |6 - svx/source/svdraw/svdibrow.cxx | 27 ++--- toolkit/source/awt/vclxdevice.cxx|6 - tools/source/fsys/tempfile.cxx |6 - unusedcode.easy |4 30 files changed, 35 insertions(+), 415 deletions(-) New commits: commit 7a799fc6ada8d3e5ea2bd0b2617e3a8e7405997a Author: Caolán McNamara caol...@redhat.com Date: Wed Apr 18 13:01:29 2012 +0100 use stdout for errors like everything else diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype index c719fc3..cf79a79 100755 --- a/bin/get-bugzilla-attachments-by-mimetype +++ b/bin/get-bugzilla-attachments-by-mimetype @@ -162,7 +162,7 @@ def get_through_rss_query_url(url, mimetype, prefix, suffix): try: get_bug_function(entry['id'], mimetype, prefix, suffix) except: -print sys.stderr, entry['id'], failed:, sys.exc_info()[0] +print entry['id'], failed:, sys.exc_info()[0] pass def get_through_rss_query(queryurl, mimetype, prefix, suffix): commit 137e02c0adfacaf8c5fc08dd5cc445be7fdfa6e5 Author: Caolán McNamara caol...@redhat.com Date: Wed Apr 18 10:28:00 2012 +0100 jpg parsing regression test diff --git a/svtools/qa/cppunit/data/jpg/fail/.gitignore b/svtools/qa/cppunit/data/jpg/fail/.gitignore new file mode 100644 index 000..e69de29 diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg new file mode 100644 index 000..3d9481a Binary files /dev/null and b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-1.jpg differ diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg new file mode 100644 index 000..9d26db0 Binary files /dev/null and b/svtools/qa/cppunit/data/jpg/fail/CVE-2004-0200-4.jpg differ diff --git a/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg b/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg new file mode 100644 index 000..33bbe9b Binary files /dev/null and b/svtools/qa/cppunit/data/jpg/fail/CVE-2008-5314-1.jpg differ diff --git a/svtools/qa/cppunit/data/jpg/indeterminate/.gitignore b/svtools/qa/cppunit/data/jpg/indeterminate/.gitignore new file mode 100644 index 000..e69de29 diff --git a/svtools/qa/cppunit/data/jpg/pass/.gitignore b/svtools/qa/cppunit/data/jpg/pass/.gitignore new file mode 100644 index 000..e69de29 diff --git a/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg new file mode 100644 index 000..5eb27ff Binary files /dev/null and b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-2.jpg differ diff --git a/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg new file mode 100644 index 000..4917f20 Binary files /dev/null and b/svtools/qa/cppunit/data/jpg/pass/CVE-2004-0200-3.jpg differ diff --git a/svtools/qa/cppunit/filters-test.cxx b/svtools/qa/cppunit/filters-test.cxx index 296d96e..4168894 100644 --- a/svtools/qa/cppunit/filters-test.cxx +++ b/svtools/qa/cppunit/filters-test.cxx @@ -84,6 +84,10 @@ void SvtoolsFiltersTest::testCVEs()
[Libreoffice-commits] .: xmlreader/source
xmlreader/source/xmlreader.cxx | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit c5c3b6d9513407ce79060c1024759bb538d9a3d9
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Apr 18 14:43:04 2012 +0200
Improved error reporting
diff --git a/xmlreader/source/xmlreader.cxx b/xmlreader/source/xmlreader.cxx
index 0845662..9d197c7 100644
--- a/xmlreader/source/xmlreader.cxx
+++ b/xmlreader/source/xmlreader.cxx
@@ -95,15 +95,15 @@ XmlReader::XmlReader(rtl::OUString const fileUrl)
osl_File_MapFlag_WillNeed);
}
if (e != osl_File_E_None) {
-e = osl_closeFile(fileHandle_);
-if (e != osl_File_E_None) {
+oslFileError e2 = osl_closeFile(fileHandle_);
+if (e2 != osl_File_E_None) {
SAL_WARN(
xmlreader,
-osl_closeFile of \ fileUrl_ \ failed with +e);
+osl_closeFile of \ fileUrl_ \ failed with +e2);
}
throw css::uno::RuntimeException(
-(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(cannot mmap )) +
- fileUrl_),
+(cannot mmap + fileUrl_ + ( +
+ rtl::OUString::valueOf(static_cast sal_Int32 (e)) + )),
css::uno::Reference css::uno::XInterface ());
}
namespaceIris_.push_back(
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/registry/component/dp_compbackenddb.hxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 5553dfe2060cb4a02a827c9774a60e4408d20c33
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Apr 18 14:45:13 2012 +0200
Improved comment
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 2e0e39e..610e952 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -94,9 +94,8 @@ public:
Data(): javaTypeLibrary(false) {};
::std::list ::rtl::OUString implementationNames;
-/* every singleton has a key and a value
- */
::std::vector ::std::pair ::rtl::OUString, ::rtl::OUString
singletons;
+// map from singleton names to implementation names
bool javaTypeLibrary;
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/registry/component/dp_component.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c2c2a056aa49f49236c3260aeda88a6da747240a Author: Stephan Bergmann sberg...@redhat.com Date: Wed Apr 18 14:53:03 2012 +0200 Improved debug output diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 1d4b86a..7a97fbb 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -1408,7 +1408,7 @@ ReferenceXComponentContext raise_uno_process( // jar typelibs ::std::vectorOUString args; -#if OSL_DEBUG_LEVEL = 1 +#if OSL_DEBUG_LEVEL == 0 args.push_back( OUSTR(--quiet) ); #endif args.push_back( OUSTR(--singleaccept) ); ___ 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/core/view/viewsh.cxx | 32 ++--
1 file changed, 18 insertions(+), 14 deletions(-)
New commits:
commit 43b48f05e5aa3359a0227550b9a5c88851a582d2
Author: Caolán McNamara caol...@redhat.com
Date: Sat Apr 14 07:56:45 2012 +0100
optimize: traverse children with WINDOW_FIRSTCHILD/WINDOW_NEXT
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 0413382..f0dd635 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -368,25 +368,29 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
if ( GetWin() )
{
Window rWindow = *(GetWin());
-if(rWindow.IsChildTransparentModeEnabled()
rWindow.GetChildCount())
+if (rWindow.IsChildTransparentModeEnabled())
{
-const Rectangle
aRectanglePixel(rWindow.LogicToPixel(aRect.SVRect()));
-
-for ( sal_uInt16 a(0); a
rWindow.GetChildCount(); a++ )
+Window* pCandidate = rWindow.GetWindow(
WINDOW_FIRSTCHILD );
+if (pCandidate)
{
-Window* pCandidate = rWindow.GetChild(a);
+const Rectangle
aRectanglePixel(rWindow.LogicToPixel(aRect.SVRect()));
-if ( pCandidate
pCandidate-IsPaintTransparent() )
+while (pCandidate)
{
-const Rectangle aCandidatePosSizePixel(
-pCandidate-GetPosPixel(),
-
pCandidate-GetSizePixel());
-
-if (
aCandidatePosSizePixel.IsOver(aRectanglePixel) )
+if ( pCandidate-IsPaintTransparent() )
{
-pCandidate-Invalidate(
INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
-pCandidate-Update();
-}
+const Rectangle aCandidatePosSizePixel(
+
pCandidate-GetPosPixel(),
+
pCandidate-GetSizePixel());
+
+if (
aCandidatePosSizePixel.IsOver(aRectanglePixel) )
+{
+pCandidate-Invalidate(
INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
+pCandidate-Update();
+}
+}
+
+pCandidate = pCandidate-GetWindow(
WINDOW_NEXT );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/deployment/registry/component/dp_component.cxx | 137 +-
1 file changed, 73 insertions(+), 64 deletions(-)
New commits:
commit fcc9611770e55b0c6ff0f23d2345f3e4f0ef7838
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Apr 18 14:58:51 2012 +0200
Do all of componentLiveInsertion/Removal at the root context
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx
b/desktop/source/deployment/registry/component/dp_component.cxx
index 7a97fbb..8bfcbd5 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -354,6 +354,8 @@ class BackendImpl : public
::dp_registry::backend::PackageRegistryBackend
void componentLiveRemoval(ComponentBackendDb::Data const data);
+css::uno::Reference css::uno::XComponentContext getRootContext() const;
+
public:
BackendImpl( SequenceAny const args,
ReferenceXComponentContext const xComponentContext );
@@ -1252,8 +1254,10 @@ void BackendImpl::componentLiveInsertion(
std::vector css::uno::Reference css::uno::XInterface const
factories)
{
+css::uno::Reference css::uno::XComponentContext rootContext(
+getRootContext());
css::uno::Reference css::container::XSet set(
-getComponentContext()-getServiceManager(), css::uno::UNO_QUERY_THROW);
+rootContext-getServiceManager(), css::uno::UNO_QUERY_THROW);
std::vector css::uno::Reference css::uno::XInterface ::const_iterator
factory(factories.begin());
for (t_stringlist::const_iterator i(data.implementationNames.begin());
@@ -1268,54 +1272,49 @@ void BackendImpl::componentLiveInsertion(
}
}
if (!data.singletons.empty()) {
-css::uno::Reference css::container::XNameContainer
-rootContext(
-getComponentContext()-getValueByName(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(_root))),
-css::uno::UNO_QUERY);
-if (rootContext.is()) {
-for (t_stringpairvec::const_iterator i(data.singletons.begin());
- i != data.singletons.end(); ++i)
-{
-rtl::OUString name(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/singletons/))
+
-i-first);
-try {
-rootContext-removeByName(
-name +
-rtl::OUString(
-RTL_CONSTASCII_USTRINGPARAM(/arguments)));
-} catch (const container::NoSuchElementException ) {}
-try {
-rootContext-insertByName(
-(name +
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(/service))),
-css::uno::Any(i-second));
-} catch (const container::ElementExistException ) {
-rootContext-replaceByName(
-(name +
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(/service))),
-css::uno::Any(i-second));
-}
-try {
-rootContext-insertByName(name, css::uno::Any());
-} catch (const container::ElementExistException ) {
-OSL_TRACE(
-singleton %s already registered,
-rtl::OUStringToOString(
-i-first, RTL_TEXTENCODING_UTF8).getStr());
-rootContext-replaceByName(name, css::uno::Any());
-}
+css::uno::Reference css::container::XNameContainer cont(
+rootContext, css::uno::UNO_QUERY_THROW);
+for (t_stringpairvec::const_iterator i(data.singletons.begin());
+ i != data.singletons.end(); ++i)
+{
+rtl::OUString name(
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/singletons/)) +
+i-first);
+//TODO: Update should be atomic:
+try {
+cont-removeByName(
+name +
+rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/arguments)));
+} catch (const container::NoSuchElementException ) {}
+try {
+cont-insertByName(
+(name +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/service))),
+css::uno::Any(i-second));
+} catch (const container::ElementExistException ) {
+cont-replaceByName(
+(name +
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(/service))),
+css::uno::Any(i-second));
+}
+try {
+cont-insertByName(name, css::uno::Any());
+} catch (const container::ElementExistException ) {
+
[Libreoffice-commits] .: 12 commits - sc/source xmloff/source
sc/source/ui/unoobj/chart2uno.cxx| 118 +--
xmloff/source/core/xmlimp.cxx| 26 ++---
xmloff/source/core/xmltkmap.cxx | 13 +-
xmloff/source/style/xmlnumfe.cxx | 24 ++---
xmloff/source/style/xmlnumfi.cxx | 49 +--
xmloff/source/style/xmlnumi.cxx | 14 +--
xmloff/source/style/xmltabi.cxx | 15 +--
xmloff/source/text/XMLTextColumnsContext.cxx | 16 +--
xmloff/source/text/txtparai.cxx | 39
9 files changed, 144 insertions(+), 170 deletions(-)
New commits:
commit e53047ade900f18ad6c6c241ddfdef715c2172fd
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 15:25:33 2012 +0200
loop with erase(begin()) looks sort of inefficient
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 255aa94..77a5b5b 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -72,7 +72,7 @@ struct SvXMLNumFmtEntry
aName(rN), nKey(nK), bRemoveAfterUse(bR) {}
};
-class SvXMLNumFmtEntryArr : public boost::ptr_vectorSvXMLNumFmtEntry {};
+typedef ::boost::ptr_vectorSvXMLNumFmtEntry SvXMLNumFmtEntryArr;
struct SvXMLEmbeddedElement
{
diff --git a/xmloff/source/text/XMLTextColumnsContext.cxx
b/xmloff/source/text/XMLTextColumnsContext.cxx
index e5c0750..8bb2065 100644
--- a/xmloff/source/text/XMLTextColumnsContext.cxx
+++ b/xmloff/source/text/XMLTextColumnsContext.cxx
@@ -342,11 +342,10 @@ XMLTextColumnsContext::~XMLTextColumnsContext()
{
if( pColumns )
{
-while( !pColumns-empty() )
+for (XMLTextColumnsArray_Impl::iterator it = pColumns-begin();
+it != pColumns-end(); ++it)
{
-XMLTextColumnContext_Impl *pColumn = *pColumns-begin();
-pColumns-erase( pColumns-begin() );
-pColumn-ReleaseRef();
+ (*it)-ReleaseRef();
}
}
if( pColumnSep )
commit f36861d4a367672e1ec6fc44e9367996c7cc6405
Author: Noel Grandin n...@peralex.com
Date: Sun Apr 15 00:28:11 2012 +0200
Convert SV_DECL_PTRARR_SORT_DEL to boost::ptr_set
diff --git a/xmloff/source/core/xmltkmap.cxx b/xmloff/source/core/xmltkmap.cxx
index d9f291a..f85ba87 100644
--- a/xmloff/source/core/xmltkmap.cxx
+++ b/xmloff/source/core/xmltkmap.cxx
@@ -30,6 +30,7 @@
#include svl/svarray.hxx
#include xmloff/xmltkmap.hxx
#include xmloff/xmltoken.hxx
+#include boost/ptr_container/ptr_set.hpp
using namespace ::xmloff::token;
@@ -72,9 +73,7 @@ public:
}
};
-typedef SvXMLTokenMapEntry_Impl *SvXMLTokenMapEntry_ImplPtr;
-SV_DECL_PTRARR_SORT_DEL( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr, 5 )
-SV_IMPL_OP_PTRARR_SORT( SvXMLTokenMap_Impl, SvXMLTokenMapEntry_ImplPtr )
+class SvXMLTokenMap_Impl : public boost::ptr_setSvXMLTokenMapEntry_Impl {};
// -
@@ -84,10 +83,10 @@ SvXMLTokenMapEntry_Impl *SvXMLTokenMap::_Find( sal_uInt16
nKeyPrefix,
SvXMLTokenMapEntry_Impl *pRet = 0;
SvXMLTokenMapEntry_Impl aTst( nKeyPrefix, rLName );
-sal_uInt16 nPos;
-if( pImpl-Seek_Entry( aTst, nPos ) )
+SvXMLTokenMap_Impl::iterator it = pImpl-find( aTst );
+if( it != pImpl-end() )
{
-pRet = (*pImpl)[nPos];
+pRet = *it;
}
return pRet;
@@ -98,7 +97,7 @@ SvXMLTokenMap::SvXMLTokenMap( const SvXMLTokenMapEntry *pMap
) :
{
while( pMap-eLocalName != XML_TOKEN_INVALID )
{
-pImpl-Insert( new SvXMLTokenMapEntry_Impl( *pMap ) );
+pImpl-insert( new SvXMLTokenMapEntry_Impl( *pMap ) );
pMap++;
}
}
commit b06d5cc4c234e3495833263192e694c0e9fc0533
Author: Noel Grandin n...@peralex.com
Date: Sun Apr 15 00:16:52 2012 +0200
Convert SV_DECL_PTRARR_SORT_DEL to boost:ptr_set
diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 3bb00d1..255aa94 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -52,6 +52,7 @@
#include xmloff/xmltoken.hxx
#include boost/ptr_container/ptr_vector.hpp
+#include boost/ptr_container/ptr_set.hpp
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
@@ -86,8 +87,7 @@ struct SvXMLEmbeddedElement
sal_Bool operator ( const SvXMLEmbeddedElement r ) const { return
nFormatPos r.nFormatPos; }
};
-typedef SvXMLEmbeddedElement* SvXMLEmbeddedElementPtr;
-SV_DECL_PTRARR_SORT_DEL( SvXMLEmbeddedElementArr, SvXMLEmbeddedElementPtr, 0 )
+typedef boost::ptr_setSvXMLEmbeddedElement SvXMLEmbeddedElementArr;
//-
@@ -380,10 +380,6 @@ static SvXMLDefaultDateFormat aDefaultDateFormats[] =
//-
-SV_IMPL_OP_PTRARR_SORT( SvXMLEmbeddedElementArr, SvXMLEmbeddedElementPtr );
-
-//-
-
[Libreoffice-commits] .: 2 commits - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 8e92501541dfc374803cde0dec90939cde37348a
Author: Radek Doulik r...@novell.com
Date: Wed Apr 18 15:40:05 2012 +0200
added debug message for unsupported cases
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index b5ce688..d4a99ec 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1447,6 +1447,8 @@ namespace cppcanvas
} else {
EMFP_DEBUG (printf (EMF+ DrawImagePoints TODO
(fixme)\n));
}
+} else {
+EMFP_DEBUG (printf (EMF+ DrawImagePoints TODO
(fixme) - possibly unsupported source units for crop rectangle\n));
}
break;
}
commit 695d82b63dc5e332f5fb9574c8e5f089369dfcd8
Author: Radek Doulik r...@novell.com
Date: Wed Apr 18 15:36:33 2012 +0200
SrcRect for SrcUnit = 2 is in pixels, don't Map it
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx
b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 0d8005c..b5ce688 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -1420,8 +1420,8 @@ namespace cppcanvas
ReadPoint (rMF, x3, y3, flags);
BitmapEx aBmp( image.graphic.GetBitmapEx () );
-const Rectangle aCropRect
(::vcl::unotools::pointFromB2DPoint (Map (sx, sy)),
-
::vcl::unotools::sizeFromB2DSize (MapSize(sw, sh)));
+const Rectangle aCropRect
(::vcl::unotools::pointFromB2DPoint (basegfx::B2DPoint (sx, sy)),
+
::vcl::unotools::sizeFromB2DSize (basegfx::B2DSize(sw, sh)));
aBmp.Crop( aCropRect );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/inc editeng/source
editeng/inc/editeng/flditem.hxx | 38 ++
editeng/source/items/flditem.cxx | 15 +++
2 files changed, 37 insertions(+), 16 deletions(-)
New commits:
commit 7746e42006a5732a9e26dd21481391f0419d0a2e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 17 16:54:00 2012 -0400
Non-inlining constructors.
diff --git a/editeng/inc/editeng/flditem.hxx b/editeng/inc/editeng/flditem.hxx
index be874b0..4b85be9 100644
--- a/editeng/inc/editeng/flditem.hxx
+++ b/editeng/inc/editeng/flditem.hxx
@@ -194,8 +194,9 @@ public:
class EDITENG_DLLPUBLIC SvxPageField : public SvxFieldData
{
public:
-SV_DECL_PERSIST1( SvxPageField, SvxFieldData,
SVX_PAGEFIELD )
-SvxPageField() {}
+SV_DECL_PERSIST1( SvxPageField, SvxFieldData, SVX_PAGEFIELD )
+SvxPageField();
+
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
@@ -205,8 +206,9 @@ public:
class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData
{
public:
-SV_DECL_PERSIST1( SvxPagesField, SvxFieldData,
SVX_PAGESFIELD )
-SvxPagesField() {}
+SV_DECL_PERSIST1( SvxPagesField, SvxFieldData, SVX_PAGESFIELD )
+SvxPagesField();
+
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
};
@@ -214,8 +216,9 @@ public:
class EDITENG_DLLPUBLIC SvxTimeField : public SvxFieldData
{
public:
-SV_DECL_PERSIST1( SvxTimeField, SvxFieldData,
SVX_TIMEFIELD )
-SvxTimeField() {}
+SV_DECL_PERSIST1( SvxTimeField, SvxFieldData, SVX_TIMEFIELD )
+SvxTimeField();
+
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
@@ -225,8 +228,9 @@ public:
class EDITENG_DLLPUBLIC SvxFileField : public SvxFieldData
{
public:
-SV_DECL_PERSIST1( SvxFileField, SvxFieldData,
SVX_FILEFIELD )
-SvxFileField() {}
+SV_DECL_PERSIST1( SvxFileField, SvxFieldData, SVX_FILEFIELD )
+SvxFileField();
+
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
};
@@ -234,8 +238,9 @@ public:
class EDITENG_DLLPUBLIC SvxTableField : public SvxFieldData
{
public:
-SV_DECL_PERSIST1( SvxTableField, SvxFieldData,
SVX_TABLEFIELD )
-SvxTableField() {}
+SV_DECL_PERSIST1( SvxTableField, SvxFieldData, SVX_TABLEFIELD )
+SvxTableField();
+
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
};
@@ -382,8 +387,9 @@ public:
class EDITENG_DLLPUBLIC SvxHeaderField : public SvxFieldData
{
public:
-SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData,
SVX_HEADERFIELD )
-SvxHeaderField() {}
+SV_DECL_PERSIST1( SvxHeaderField, SvxFieldData, SVX_HEADERFIELD )
+SvxHeaderField();
+
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
};
@@ -393,8 +399,8 @@ public:
class EDITENG_DLLPUBLIC SvxFooterField : public SvxFieldData
{
public:
-SV_DECL_PERSIST1( SvxFooterField, SvxFieldData,
SVX_FOOTERFIELD )
-SvxFooterField() {}
+SV_DECL_PERSIST1( SvxFooterField, SvxFieldData, SVX_FOOTERFIELD )
+SvxFooterField();
virtual SvxFieldData* Clone() const;
virtual int operator==( const SvxFieldData ) const;
};
@@ -404,8 +410,8 @@ public:
class EDITENG_DLLPUBLIC SvxDateTimeField : public SvxFieldData
{
public:
-SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData,
SVX_DATEFIMEFIELD )
-SvxDateTimeField() {}
+SV_DECL_PERSIST1( SvxDateTimeField, SvxFieldData, SVX_DATEFIMEFIELD )
+SvxDateTimeField();
static rtl::OUStringGetFormatted( Date rDate, Time rTime, int
eFormat, SvNumberFormatter rFormatter, LanguageType eLanguage );
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 46153e6..fb16479 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -436,6 +436,8 @@ MetaAction* SvxURLField::createBeginComment() const
SV_IMPL_PERSIST1( SvxPageField, SvxFieldData );
+SvxPageField::SvxPageField() {}
+
SvxFieldData* SvxPageField::Clone() const
{
return new SvxPageField;// empty
@@ -462,6 +464,8 @@ MetaAction* SvxPageField::createBeginComment() const
SV_IMPL_PERSIST1( SvxPagesField, SvxFieldData );
+SvxPagesField::SvxPagesField() {}
+
SvxFieldData* SvxPagesField::Clone() const
{
return new SvxPagesField; // empty
@@ -482,6 +486,8 @@ void SvxPagesField::Save( SvPersistStream /*rStm*/ )
SV_IMPL_PERSIST1(
[Libreoffice-commits] Changes to 'libreoffice-3-5-3'
New branch 'libreoffice-3-5-3' available with the following commits: commit a80a06d26458f01f3de4d9a8f60af00a7f4a68c2 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 15:59:39 2012 +0200 Branch libreoffice-3-5-3 This is 'libreoffice-3-5-3' - the stable branch for the 3.5.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-3'
New branch 'libreoffice-3-5-3' available with the following commits: commit 7ba13690c46cda44abb2d5e92f48b275d9512597 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 15:59:40 2012 +0200 Branch libreoffice-3-5-3 This is 'libreoffice-3-5-3' - the stable branch for the 3.5.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-3-5-3'
New branch 'libreoffice-3-5-3' available with the following commits: commit 22e3d745c190c792c6a4d332192d4a9099628a72 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 15:59:40 2012 +0200 Branch libreoffice-3-5-3 This is 'libreoffice-3-5-3' - the stable branch for the 3.5.3 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.5.x release, please use the 'libreoffice-3-5' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cppuhelper/source
cppuhelper/source/bootstrap.cxx |2 +-
cppuhelper/source/macro_expander.cxx |8 +++-
cppuhelper/source/macro_expander.hxx |9 +
cppuhelper/source/servicefactory.cxx |8
4 files changed, 17 insertions(+), 10 deletions(-)
New commits:
commit a26c2ee3c9ca783f0281dc0dd87c1747daac63a6
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Apr 18 15:59:58 2012 +0200
Put create_bootstrap_macro_expander_factory properly into a header
...and fix the typo in its name.
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index fad335b..783f647 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -100,7 +100,7 @@ Bootstrap const get_unorc() SAL_THROW(())
{
#ifdef ANDROID
// Wouldn't it be lovely to avoid this fugly hard-coding.
-// The problem is that the 'create_boostrap_macro_expander_factory()'
+// The problem is that the 'create_bootstrap_macro_expander_factory()'
// required for bootstrapping services, calls cppu::get_unorc directly
// instead of re-using the BoostrapHandle from:
// defaultBootstrap_InitialComponentContext
diff --git a/cppuhelper/source/macro_expander.cxx
b/cppuhelper/source/macro_expander.cxx
index eab09c5..030e22f 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -181,11 +181,9 @@ Reference XInterface SAL_CALL service_create(
}
-namespace cppu
-{
+namespace cppuhelper { namespace detail {
-//##
-Reference lang::XSingleComponentFactory
create_boostrap_macro_expander_factory() SAL_THROW(())
+Reference lang::XSingleComponentFactory
create_bootstrap_macro_expander_factory() SAL_THROW(())
{
Reference lang::XSingleComponentFactory
free(::cppu::createSingleComponentFactory(
service_create,
@@ -203,6 +201,6 @@ Reference lang::XSingleComponentFactory
create_boostrap_macro_expander_factor
SAL_NO_ACQUIRE);
}
-}
+} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cppuhelper/source/macro_expander.hxx
b/cppuhelper/source/macro_expander.hxx
index 24e3ffc..84cec59 100644
--- a/cppuhelper/source/macro_expander.hxx
+++ b/cppuhelper/source/macro_expander.hxx
@@ -31,6 +31,12 @@
#include sal/config.h
+#include com/sun/star/uno/Reference.hxx
+#include sal/types.h
+
+namespace com { namespace sun { namespace star { namespace lang {
+class XSingleComponentFactory;
+} } } }
namespace rtl { class OUString; }
namespace cppuhelper {
@@ -54,6 +60,9 @@ namespace detail {
*/
::rtl::OUString expandMacros(rtl::OUString const text);
+com::sun::star::uno::Reference com::sun::star::lang::XSingleComponentFactory
+create_bootstrap_macro_expander_factory() SAL_THROW(());
+
}
}
diff --git a/cppuhelper/source/servicefactory.cxx
b/cppuhelper/source/servicefactory.cxx
index db8835f..6ac95e7 100644
--- a/cppuhelper/source/servicefactory.cxx
+++ b/cppuhelper/source/servicefactory.cxx
@@ -58,6 +58,8 @@
#include stdio.h
#endif
+#include macro_expander.hxx
+
#define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) )
@@ -73,9 +75,6 @@ namespace cppu
Reference security::XAccessController
createDefaultAccessController() SAL_THROW(());
-Reference lang::XSingleComponentFactory
-create_boostrap_macro_expander_factory() SAL_THROW(());
-
OUString const get_this_libpath();
@@ -435,7 +434,8 @@ Reference XComponentContext bootstrapInitialContext(
// macro expander singleton for loader
entry.bLateInitService = true;
entry.name = OUSTR(/singletons/com.sun.star.util.theMacroExpander);
-entry.value = create_boostrap_macro_expander_factory();
+entry.value
+= cppuhelper::detail::create_bootstrap_macro_expander_factory();
context_values.push_back( entry );
// tdmgr singleton
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.1'
Tag 'libreoffice-3.5.3.1' created by Petr Mladek pmla...@suse.cz at 2012-04-18 15:12 -0700 Tag 3.5.3.1 (3.5.3-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPjsvUAAoJEPQ0oe+v7q6jW30P/3bcYpGy94/M6Pn9/Lv33hVI dkjNRHaxLv2e2YbqmbT18HTX1AoKDcRE92Aremp6ruroCDy0IndNw+spbQBUsF28 HVaRcH6uKZpX9VfBaoPrdTk8tgsFSSnMgUwStP5GCH6vW0aT3RPdW4+cVsbKI/1/ 9lqdp262qnlfCBQv4tPQRjCXPiuGOYErYAAnxqaHSRij41s+QQakHCCuNd8PPO+Q ug+jb2M0o6Aw4dXkT9+CCHAR+biySV+szsIZLSvUCaL5JemeaW5nn2drP9YzyXn6 OAaOtg3fLxiDbZ8Z+y3MLUco29KsjH2dc8tAxHP6VbML3suFmwkJ/y80HCba9vwS bA0CNUaMGt9JcAD0j+0nTOJBfT/jjEAfiltMZymTUrz1/Bzg5sRPAx37OSoTe22W sV6AWlDjpJeYYjv9RJyEOttGx01N46ZmHUxFFOpV3rJ3jQX6BVB7kpxPMm4slHJD 58J7D7YGN+2ItKKZJPFzHWZAjyfep+a6oVoZoajWlCgrpXF5AxYvRXgJ7AtTkE0c xPEl32RldFoyJ0v9cinVNdQFo1OsaiP2dq1RhMqd5QsbSPJXnsZjuNMfHQjrDc3v ifqKsKl5ex7XMxUALLA/DVsjDtTVh4pkHQH1nDkf2xZ3sFc43xCHd6VHlyEelxFx 7yn0LJS9ZrDMr/99p2r+ =wFSA -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-1074: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.3.1'
Tag 'libreoffice-3.5.3.1' created by Petr Mladek pmla...@suse.cz at 2012-04-18 15:12 -0700 Tag 3.5.3.1 (3.5.3-rc1) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPjsvUAAoJEPQ0oe+v7q6jnwMP/0B4qc0bCWy7h8/QUZfuDoBa nsSWgr0hpN0eGdRE04h9KKPZ28HtGJliECc6tXsIaNgPYFDybEn/m0PT3IKP4I+s iQNQj73p585LmcYdJ256VDLQQa1AOlzoNI+jGwxGFfh8cQvTEKWWQwKVzAYLBf6E XCtqgnSRhTwIzoRn1ffczlhVwELhlNwziccj1x8AknYgINCdgpfqksc+P6jHxu/q HhcJlI0mNAtfl9JPJS5dxrhh+ae8AjTNqRRN/4HnZbdltZz7f1RQN/nd/XUMBVcX ik01MIa4UXyfDQOPOaQIy6SOM3htdf8mpcv0gfNLQgJ4p4DShpeKQvV1UtzBhApm yjonQT0ZzMG2k2ZzZtiZvOr41jQpNsQBN7gzYwwmp6Z3alCVVno5+8i0A/oABc0O zaoCuo6HIcMgq5RDPc0FdSFto3NFlyVl+x5z8jGhEmk8Fsw8E55G4yYbVxGGKfON +h+9YRK7Ler4hJrH2KdqEA7xbAjavZKwVlwARHjLxiysESoA1RqKHvcuP4+n06Qc MKRarjrJCQPpYm2ns6eJn6aEHOt0KlCgGYxO1AS0+MBBBD87c208S/WQUpA/kTVb pyQ00G3CzriMkI0FDjFx05Osfc6btjtBuRIMv35oZqoH+sHrjIh2gkfMMXbxi3XX R6wtRTrSnhzhx+TW+vb2 =hF5K -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - binfilter/bf_starmath binfilter/bf_svtools binfilter/bf_svx binfilter/bf_sw binfilter/inc
binfilter/bf_starmath/source/starmath_register.cxx|2
binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx |1
binfilter/bf_svtools/source/items/svt_macitem.cxx |1
binfilter/bf_svtools/source/memtools/makefile.mk |1
binfilter/bf_svtools/source/memtools/tl_contnr.cxx| 81
binfilter/bf_svtools/source/memtools/tl_table.cxx | 363 ++
binfilter/bf_svtools/source/misc/svt_imap.cxx |1
binfilter/bf_svtools/source/misc/svt_urihelper.cxx|1
binfilter/bf_svtools/source/misc1/svt_inettype.cxx|2
binfilter/bf_svtools/source/uno/svt_unoevent.cxx |1
binfilter/bf_svtools/source/uno/svt_unoimap.cxx |1
binfilter/bf_svx/source/editeng/editdoc.hxx |1
binfilter/bf_sw/source/core/text/inftxt.hxx |2
binfilter/inc/bf_sc/chgtrack.hxx |2
binfilter/inc/bf_sch/schopt.hxx |2
binfilter/inc/bf_sfx2/objsh.hxx |2
binfilter/inc/bf_svtools/macitem.hxx |2
binfilter/inc/bf_svtools/zforlist.hxx |2
binfilter/inc/bf_svx/forbiddencharacterstable.hxx |2
binfilter/inc/bf_svx/svdmodel.hxx |2
binfilter/inc/bf_svx/xtable.hxx |1
binfilter/inc/bf_sw/hints.hxx |2
binfilter/inc/bf_tools/contnr.hxx |9
binfilter/inc/bf_tools/table.hxx | 153 +++
24 files changed, 617 insertions(+), 20 deletions(-)
New commits:
commit 319d686449ecf259763137d98e7ac2ce16701a28
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 16:23:24 2012 +0200
move tools/table.hxx to binfilter
diff --git a/binfilter/bf_starmath/source/starmath_register.cxx
b/binfilter/bf_starmath/source/starmath_register.cxx
index d2461ed..1f32129 100644
--- a/binfilter/bf_starmath/source/starmath_register.cxx
+++ b/binfilter/bf_starmath/source/starmath_register.cxx
@@ -35,8 +35,6 @@
#include cppuhelper/factory.hxx
-#include tools/table.hxx
-
namespace binfilter {
using namespace ::rtl;
diff --git a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
index 92e47a0..f109375 100644
--- a/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/binfilter/bf_svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -40,7 +40,6 @@
#include sot/object.hxx
#include boost/shared_ptr.hpp
#include tools/debug.hxx
-#include tools/table.hxx
#include vcl/graph.hxx
#include vcl/virdev.hxx
#include tools/poly.hxx
diff --git a/binfilter/bf_svtools/source/items/svt_macitem.cxx
b/binfilter/bf_svtools/source/items/svt_macitem.cxx
index 3b2a7f6..8244278 100644
--- a/binfilter/bf_svtools/source/items/svt_macitem.cxx
+++ b/binfilter/bf_svtools/source/items/svt_macitem.cxx
@@ -27,7 +27,6 @@
/
#include tools/stream.hxx
-#include tools/table.hxx
#include bf_svtools/macitem.hxx
diff --git a/binfilter/bf_svtools/source/memtools/makefile.mk
b/binfilter/bf_svtools/source/memtools/makefile.mk
index 24aaa10..112b16b 100644
--- a/binfilter/bf_svtools/source/memtools/makefile.mk
+++ b/binfilter/bf_svtools/source/memtools/makefile.mk
@@ -40,6 +40,7 @@ INC+= -I$(PRJ)$/inc$/bf_svtools
SLOFILES=\
$(SLO)$/svt_svarray.obj \
$(SLO)$/tl_contnr.obj \
+$(SLO)$/tl_table.obj \
$(SLO)$/tl_unqidx.obj
# --- Targets ---
diff --git a/binfilter/bf_svtools/source/memtools/tl_table.cxx
b/binfilter/bf_svtools/source/memtools/tl_table.cxx
new file mode 100644
index 000..2b9d27f
--- /dev/null
+++ b/binfilter/bf_svtools/source/memtools/tl_table.cxx
@@ -0,0 +1,363 @@
+/* -*- 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
[Libreoffice-commits] .: basctl/source tools/Library_tl.mk tools/Package_inc.mk tools/inc tools/source
basctl/source/basicide/baside2.hxx |2
tools/Library_tl.mk|1
tools/Package_inc.mk |1
tools/inc/tools/table.hxx | 148 ---
tools/source/memtools/table.cxx| 358 -
5 files changed, 510 deletions(-)
New commits:
commit d85b7f1548cbf0091812fcec1f9a37e1220de4a9
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 16:51:56 2012 +0200
move tools/table.hxx to binfilter
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index a274eec..bae4730 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -57,8 +57,6 @@ class SvxSearchItem;
#include objdlg.hxx
#include set
-#include tools/table.hxx
-
DBG_NAMEEX( ModulWindow )
#define MARKER_NOMARKER 0x
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 2571031..975574f 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -88,7 +88,6 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/memtools/contnr \
tools/source/memtools/mempool \
tools/source/memtools/multisel \
-tools/source/memtools/table \
tools/source/memtools/unqidx \
tools/source/misc/appendunixshellword \
tools/source/misc/extendapplicationenvironment \
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index b4765f9..46b829f 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -83,7 +83,6 @@ $(eval $(call
gb_Package_add_file,tools_inc,inc/tools/stream.hxx,tools/stream.hx
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/string.hxx,tools/string.hxx))
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/svborder.hxx,tools/svborder.hxx))
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/svlibrary.hxx,tools/svlibrary.hxx))
-$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/table.hxx,tools/table.hxx))
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/tempfile.hxx,tools/tempfile.hxx))
$(eval $(call
gb_Package_add_file,tools_inc,inc/tools/tenccvt.hxx,tools/tenccvt.hxx))
$(eval $(call gb_Package_add_file,tools_inc,inc/tools/time.hxx,tools/time.hxx))
diff --git a/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx
deleted file mode 100644
index ec6927e..000
--- a/tools/inc/tools/table.hxx
+++ /dev/null
@@ -1,148 +0,0 @@
-/* -*- 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 License.
- *
- /
-#ifndef _TOOLS_TABLE_HXX
-#define _TOOLS_TABLE_HXX
-
-#include tools/toolsdllapi.h
-#include tools/solar.h
-#include tools/contnr.hxx
-
-// -
-// - Table -
-// -
-
-#define TABLE_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
-
-class TOOLS_DLLPUBLIC Table : private Container
-{
-private:
-sal_uIntPtr nCount;
-TOOLS_DLLPRIVATE sal_uIntPtrImplGetIndex( sal_uIntPtr nKey,
sal_uIntPtr* pIndex = NULL ) const;
-public:
-Table( sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 );
-Table( const Table rTable ) : Container( rTable )
-{ nCount = rTable.nCount; }
-
-sal_BoolInsert( sal_uIntPtr nKey, void* p );
-void* Remove( sal_uIntPtr nKey );
-void* Replace( sal_uIntPtr nKey, void* p );
-void* Get( sal_uIntPtr nKey ) const;
-
-voidClear() { Container::Clear(); nCount = 0; }
-sal_uIntPtr Count() const { return( nCount ); }
-
-void* GetCurObject() const;
-sal_uIntPtr GetCurKey() const { return
(sal_uIntPtr)Container::GetCurObject(); }
-sal_uIntPtr GetKey( const void* p ) const;
-sal_BoolIsKeyValid( sal_uIntPtr nKey ) const;
-
-void* GetObject( sal_uIntPtr nPos ) const
-{ return Container::GetObject( (nPos*2)+1 ); }
-sal_uIntPtr GetObjectKey( sal_uIntPtr nPos ) const
-{ return
[Libreoffice-commits] .: svl/source
svl/source/numbers/zforfind.cxx | 47 +++-
svl/source/numbers/zforfind.hxx | 42 ---
svl/source/numbers/zforlist.cxx |2 -
3 files changed, 80 insertions(+), 11 deletions(-)
New commits:
commit 9e1862b21684f650ebc1d8d0e5bbdd877b886945
Author: Eike Rathke er...@redhat.com
Date: Wed Apr 18 19:01:09 2012 +0200
resolved fdo#48875 do not let ISO 8601 detection override locale's date
order
If the locale's date separator was '-' the ISO 8601 detection interfered
with
the locale's date order, e.g. DMY in nl_NL locale.
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 3c5d835..cce08f9 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -148,6 +148,7 @@ void ImpSvNumberInputScan::Reset()
nMayBeMonthDate = 0;
nAcceptedDatePattern = -2;
nDatePatternStart = 0;
+nCanForceToIso8601 = 0;
}
@@ -999,6 +1000,50 @@ bool ImpSvNumberInputScan::MayBeIso8601()
//---
+bool ImpSvNumberInputScan::CanForceToIso8601( DateFormat eDateFormat )
+{
+if (nCanForceToIso8601 == 0)
+{
+nCanForceToIso8601 = 1;
+do
+{
+if (!MayBeIso8601())
+break;
+
+if (nMayBeIso8601 = 3)
+{
+nCanForceToIso8601 = 2; // at least 3 digits in year
+break;
+}
+
+if (pFormatter-GetDateSep() != '-')
+{
+nCanForceToIso8601 = 2; // date separator does not interfere
+break;
+}
+
+sal_Int32 n;
+switch (eDateFormat)
+{
+case DMY: // day value out of range = ISO
8601 year
+if ((n = sStrArray[nNums[0]].ToInt32()) 1 || n 31)
+nCanForceToIso8601 = 2;
+break;
+case MDY: // month value out of range = ISO
8601 year
+if ((n = sStrArray[nNums[0]].ToInt32()) 1 || n 12)
+nCanForceToIso8601 = 2;
+break;
+case YMD: // always possible
+nCanForceToIso8601 = 2;
+break;
+}
+} while (0);
+}
+return nCanForceToIso8601 1;
+}
+
+//---
+
bool ImpSvNumberInputScan::MayBeMonthDate()
{
if (nMayBeMonthDate == 0)
@@ -1596,7 +1641,7 @@ input for the following reasons:
}
}
// ISO 8601 -mm-dd forced recognition
-DateFormat eDF = (MayBeIso8601() ? YMD : DateFmt);
+DateFormat eDF = (CanForceToIso8601( DateFmt) ? YMD :
DateFmt);
switch (eDF)
{
case MDY:
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index e808c30..c57c90a 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.hxx
@@ -71,19 +71,17 @@ public:
/// get threshold of two-digit year input
sal_uInt16 GetYear2000() const { return nYear2000; }
-/** Whether input may be an ISO 8601 date format, -mm-dd...
+/** Whether input can be forced to ISO 8601 format.
-Checks if input has at least 3 numbers for -mm-dd and the separator
-is '-', and 1=mm=12 and 1=dd=31.
+Depends on locale's date separator and a specific date format order.
-@see nMayBeIso8601
- */
-bool MayBeIso8601();
+@param eDateFormat
+Evaluated only on first call during one scan process, subsequent
+calls return state of nCanForceToIso8601!
-/** Whether input may be a dd-month-yy format, with month name, not
-number.
+@see nCanForceToIso8601
*/
-bool MayBeMonthDate();
+bool CanForceToIso8601( DateFormat eDateFormat );
private:
SvNumberFormatter* pFormatter;
@@ -154,6 +152,16 @@ private:
*/
sal_uInt8nMayBeIso8601;
+/** State of ISO 8601 can be forced.
+
+0:= don't know yet
+1:= no
+2:= yes
+
+@see CanForceToIso8601()
+ */
+sal_uInt8 nCanForceToIso8601;
+
/** State of dd-month-yy or yy-month-dd detection, with month name.
0:= don't know yet
@@ -364,6 +372,22 @@ private:
*/
DateFormat GetDateOrder();
+/** Whether input may be an ISO 8601 date format, -mm-dd...
+
+Checks if input has at least 3 numbers for -mm-dd and the separator
+is '-', and 1=mm=12 and 1=dd=31.
+
+@see nMayBeIso8601
+ */
+bool MayBeIso8601();
+
+/** Whether input may be a dd-month-yy format, with month name, not
+
[Libreoffice-commits] .: cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 41c4585504f38a4b0eeb164f317ab71a7a742dd5 Author: Radek Doulik r...@novell.com Date: Wed Apr 18 19:17:11 2012 +0200 tune the guessed position a bit, so that it works better with test documents diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 88d281a..f0c272c 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -1512,7 +1512,7 @@ namespace cppcanvas TextActionFactory::createTextAction( // position is just rough guess for now // we should calculate it exactly from layoutRect or font -::vcl::unotools::pointFromB2DPoint ( Map( lx + 0.35*cellSize, ly + cellSize ) ), +::vcl::unotools::pointFromB2DPoint ( Map( lx + 0.15*cellSize, ly + cellSize ) ), ::Size(), ::Color(), ::Size(), ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/view/output2.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 808dd658a265f565a638556322250a0957e8e535
Author: Noel Power noel.po...@novell.com
Date: Wed Apr 18 18:36:25 2012 +0100
make sure nPos is and nChar are reset for string without placeholder
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 6c616eb..bca73f5 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -520,6 +520,11 @@ sal_Bool ScDrawStringsVars::SetText( ScBaseCell* pCell )
aString.Erase( nPos, 2 );
}
}
+else
+{
+nPos = STRING_NOTFOUND;
+nChar = 0x0;
+}
if (aString.Len() DRAWTEXT_MAX)
aString.Erase(DRAWTEXT_MAX);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-3' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) New commits: commit eb4f812b4bc685bdbda7401aaa5add49fd691736 Author: Petr Mladek pmla...@suse.cz Date: Wed Apr 18 20:20:15 2012 +0200 bump product version to 3.5.3-rc1+, release number to 1 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 8fdbcf3..c5d82f2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -53,13 +53,13 @@ LibreOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.3 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -112,13 +112,13 @@ LibreOffice_wJRE PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.3 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst @@ -170,14 +170,14 @@ LibreOffice_Dev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.3 - ABOUTBOXPRODUCTVERSIONSUFFIX rc0+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -240,7 +240,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.5 LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -275,7 +275,7 @@ LibreOffice_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 @@ -318,7 +318,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -367,7 +367,7 @@ LibreOffice_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 @@ -410,7 +410,7 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc0 +SHORT_PRODUCTEXTENSION rc1 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -458,13 +458,13 @@ OxygenOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc0 + SHORT_PRODUCTEXTENSION rc1 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++---
solenv/inc/minor.mk |2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 314f65c6c879bddbc656b21ce478efaa20453fa8
Author: Petr Mladek pmla...@suse.cz
Date: Wed Apr 18 20:23:27 2012 +0200
bump product version to 3.5.4-rc0+
diff --git a/instsetoo_native/util/openoffice.lst
b/instsetoo_native/util/openoffice.lst
index 8fdbcf3..9b37041 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
{
variables
{
- UREPACKAGEVERSION 3.5.3
+ UREPACKAGEVERSION 3.5.4
URELAYERVERSION 1
REFERENCEOOOMAJORMINOR 3.4
UNIXBASISROOTNAME libreoffice3.5
@@ -58,7 +58,7 @@ LibreOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.3
+ ABOUTBOXPRODUCTVERSION 3.5.4
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
PCPFILENAME libreoffice.pcp
@@ -70,7 +70,7 @@ LibreOffice
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.3
+ PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -117,7 +117,7 @@ LibreOffice_wJRE
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.3
+ ABOUTBOXPRODUCTVERSION 3.5.4
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
UPDATEURL http://update.libreoffice.org/check.php
@@ -128,7 +128,7 @@ LibreOffice_wJRE
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.3
+ PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
WITHJREPRODUCT 1
@@ -176,7 +176,7 @@ LibreOffice_Dev
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
- ABOUTBOXPRODUCTVERSION 3.5.3
+ ABOUTBOXPRODUCTVERSION 3.5.4
ABOUTBOXPRODUCTVERSIONSUFFIX rc0+
BASEPRODUCTVERSION 3.5
DEVELOPMENTPRODUCT 1
@@ -192,7 +192,7 @@ LibreOffice_Dev
FILEFORMATNAME OpenOffice.org
FILEFORMATVERSION 1.0
WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
- PACKAGEVERSION 3.5.3
+ PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
LICENSENAME LGPL
GLOBALFILEGID gid_File_Lib_Vcl
@@ -279,7 +279,7 @@ LibreOffice_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.3
+PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -323,7 +323,7 @@ LibreOffice_Dev_SDK
POSTVERSIONEXTENSION SDK
POSTVERSIONEXTENSIONUNIX sdk
BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.3
+PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -371,7 +371,7 @@ LibreOffice_Test
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.3
+PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
PACK_INSTALLED 1
POOLPRODUCT 0
@@ -415,7 +415,7 @@ LibreOffice_Dev_Test
POSTVERSIONEXTENSION TEST
POSTVERSIONEXTENSIONUNIX test
BRANDPACKAGEVERSION 3.5
-PACKAGEVERSION 3.5.3
+PACKAGEVERSION 3.5.4
PACKAGEREVISION {buildid}
BASISPACKAGEPREFIX lodevbasis
UREPACKAGEPREFIX lodev
@@ -463,7 +463,7 @@ OxygenOffice
POSTVERSIONEXTENSIONUNIX
BRANDPACKAGEVERSION 3.5
USERDIRPRODUCTVERSION 3
-
[Libreoffice-commits] .: 3 commits - editeng/source sc/inc sc/source
editeng/source/editeng/editattr.cxx | 31 ---
editeng/source/editeng/editattr.hxx | 17 ++---
editeng/source/editeng/editdoc.cxx |2 +-
editeng/source/editeng/impedit2.cxx |2 +-
editeng/source/editeng/impedit3.cxx |4 ++--
sc/inc/address.hxx | 18 +-
sc/source/ui/optdlg/tpdefaults.cxx | 11 ---
sc/source/ui/vba/vbaapplication.cxx |5 +++--
8 files changed, 46 insertions(+), 44 deletions(-)
New commits:
commit 8edf5c5ee61b85c17389ceb48f78daa06edf36f4
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Apr 18 14:57:20 2012 -0400
This is no longer relevant. Removing.
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 182fba1..5f104b3 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -108,18 +108,6 @@ const SCROW SCROWS32K = 32000;
const SCCOL SCCOL_REPEAT_NONE = SCCOL_MAX;
const SCROW SCROW_REPEAT_NONE = SCROW_MAX;
-
-// We hope to get rid of the binary file format. If not, these are the places
-// we'd have to investigate because variable types changed. Just place code in
-// #if SC_ROWLIMIT_STREAM_ACCESS for now.
-#define SC_ROWLIMIT_STREAM_ACCESS 0
-// usage:
-//#if SC_ROWLIMIT_STREAM_ACCESS
-//#error address types changed!
-//... code ...
-//#endif // SC_ROWLIMIT_STREAM_ACCESS
-
-
// For future reference, place in code where more than 64k rows would need a
// special handling:
// #if SC_ROWLIMIT_MORE_THAN_64K
commit 670db0daa2ed638ec9df0d5d569d7c43ae1bf786
Author: Albert Thuswaldner albert.thuswald...@gmail.com
Date: Wed Apr 18 00:31:02 2012 +0200
Use global constants for initial tab count bounds checking
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 6c45311..182fba1 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -95,7 +95,11 @@ const SCROW MAXROW = MAXROWCOUNT - 1;
const SCCOL MAXCOL = MAXCOLCOUNT - 1;
const SCTAB MAXTAB = MAXTABCOUNT - 1;
const SCCOLROWMAXCOLROW = MAXROW;
-
+// Limit the initial tab count to prevent users to set the count too high,
+// which could cause the memory usage of blank documents to exceed the
+// available system memory.
+const SCTAB MAXINITTAB = 1024;
+const SCTAB MININITTAB = 1;
// Special values
const SCTAB SC_TAB_APPEND = SCTAB_MAX;
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx
b/sc/source/ui/optdlg/tpdefaults.cxx
index bc5b988..b67e87b 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -36,9 +36,6 @@
#include defaultsoptions.hxx
#include document.hxx
-#define INIT_SHEETS_MIN 1
-#define INIT_SHEETS_MAX 1024
-
using ::rtl::OUString;
ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet
rCoreSet) :
@@ -119,10 +116,10 @@ int ScTpDefaultsOptions::DeactivatePage(SfxItemSet*
/*pSet*/)
void ScTpDefaultsOptions::CheckNumSheets()
{
sal_Int64 nVal = aEdNSheets.GetValue();
-if (nVal INIT_SHEETS_MAX)
-aEdNSheets.SetValue(INIT_SHEETS_MAX);
-if (nVal INIT_SHEETS_MIN)
-aEdNSheets.SetValue(INIT_SHEETS_MIN);
+if (nVal MAXINITTAB)
+aEdNSheets.SetValue(MAXINITTAB);
+if (nVal MININITTAB)
+aEdNSheets.SetValue(MININITTAB);
}
void ScTpDefaultsOptions::CheckPrefix(Edit* pEdit)
diff --git a/sc/source/ui/vba/vbaapplication.cxx
b/sc/source/ui/vba/vbaapplication.cxx
index 478e8f4..4204ba0 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -945,9 +945,10 @@ sal_Int32 SAL_CALL
ScVbaApplication::getSheetsInNewWorkbook() throw (uno::Runtim
void SAL_CALL ScVbaApplication::setSheetsInNewWorkbook( sal_Int32
SheetsInNewWorkbook ) throw (script::BasicErrorException, uno::RuntimeException)
{
-if ( SheetsInNewWorkbook 1 || SheetsInNewWorkbook MAXTAB )
+if ( SheetsInNewWorkbook MININITTAB
+ || SheetsInNewWorkbook MAXINITTAB )
{
-DebugHelper::exception( OUString(RTL_CONSTASCII_USTRINGPARAM(The
number must be between 1 and 255)),
+DebugHelper::exception( OUString(RTL_CONSTASCII_USTRINGPARAM(The
number must be between 1 and 1)),
uno::Exception(), SbERR_METHOD_FAILED, OUString() );
}
else
commit e4784750705b3d2649b461ade363c84bd1b2b10b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Apr 18 11:58:06 2012 -0400
String bool cleanup.
diff --git a/editeng/source/editeng/editattr.cxx
b/editeng/source/editeng/editattr.cxx
index 131f889..d5b640f 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -328,6 +328,23 @@ void EditCharAttribField::SetFont( SvxFont rFont,
OutputDevice* )
rFont.SetColor( *pTxtColor );
}
+const rtl::OUString EditCharAttribField::GetFieldValue() const
+{
+return aFieldValue;
+}
+
+void EditCharAttribField::SetFieldValue(const rtl::OUString rVal)
+{
+aFieldValue = rVal;
+}
+
+void EditCharAttribField::Reset()
+{
+
[Libreoffice-commits] .: 4 commits - bean/native jvmfwk/plugins
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |2 -
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 16 +-
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx |8 ++---
3 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit c6ade7266f5d1d16e4dc9a002ecde6bdf449dbfd
Author: David Tardon dtar...@redhat.com
Date: Wed Apr 18 13:07:03 2012 +0200
WaE: cast from pointer to integer of different size
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 7ad1126..bd8b37e 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -166,7 +166,7 @@ JNIEXPORT jlong JNICALL
Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr );
}
-return ((jlong)hWnd);
+return ((jlong)(LONG)hWnd);
}
commit 2ff039195f817f3c372b4ba3bf59539948ce213d
Author: David Tardon dtar...@redhat.com
Date: Tue Apr 17 07:17:45 2012 +0200
use SAL_N_ELEMENTS
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 1ba0279..1ffa982 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -59,7 +59,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
jre/bin/java
#endif
};
-*size = sizeof (ar) / sizeof (char*);
+*size = SAL_N_ELEMENTS(ar);
return ar;
}
@@ -79,7 +79,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
#endif
};
-*size = sizeof(ar) / sizeof (char*);
+*size = SAL_N_ELEMENTS(ar);
return ar;
}
@@ -94,7 +94,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
/lib/ JFW_PLUGIN_ARCH
};
-*size = sizeof(ar) / sizeof (char*);
+*size = SAL_N_ELEMENTS(ar);
return ar;
#else
*size = 0;
commit ea68b1a8977becd8f827d41b171e89d3b490216e
Author: David Tardon dtar...@redhat.com
Date: Tue Apr 17 07:15:44 2012 +0200
WaE: parameter 'size' set but not used
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 52bd451..1ba0279 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -97,7 +97,7 @@ char const* const* SunInfo::getLibraryPaths(int* size)
*size = sizeof(ar) / sizeof (char*);
return ar;
#else
-size = 0;
+*size = 0;
return NULL;
#endif
}
commit ec4f5494dae3bd9819f07fe3ada6310a8bef468d
Author: David Tardon dtar...@redhat.com
Date: Tue Apr 17 07:11:13 2012 +0200
WaE: declaration of 'errcode' shadows a global declaration
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index a4b9a1d..ffa6b55 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -347,7 +347,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
sal_Int32 nLenList,
JavaInfo ** ppInfo)
{
-javaPluginError errcode = JFW_PLUGIN_E_NONE;
+javaPluginError errorcode = JFW_PLUGIN_E_NONE;
OSL_ASSERT(path);
OSL_ASSERT(sVendor);
@@ -444,7 +444,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
}
*ppInfo = createJavaInfo(aVendorInfo);
-return errcode;
+return errorcode;
}
#if defined(WNT)
@@ -571,9 +571,9 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
// unless guard is volatile the following warning occurs on gcc:
// warning: variable 't' might be clobbered by `longjmp' or `vfork'
volatile osl::MutexGuard guard(PluginMutex::get());
-// unless errcode is volatile the following warning occurs on gcc:
-// warning: variable 'errcode' might be clobbered by `longjmp' or `vfork'
-volatile javaPluginError errcode = JFW_PLUGIN_E_NONE;
+// unless errorcode is volatile the following warning occurs on gcc:
+// warning: variable 'errorcode' might be clobbered by `longjmp' or `vfork'
+volatile javaPluginError errorcode = JFW_PLUGIN_E_NONE;
if ( pInfo == NULL || ppVm == NULL || ppEnv == NULL)
return JFW_PLUGIN_E_INVALID_ARG;
//Check if the Vendor (pInfo-sVendor) is supported by this plugin
@@ -737,13 +737,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
{
fprintf(stderr,[Java framework] sunjavaplugin SAL_DLLEXTENSION
Can not create Java Virtual Machine\n);
-errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
+errorcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
}
else if( err 0)
{
fprintf(stderr,[Java framework] sunjavaplugin SAL_DLLEXTENSION
Can not create JavaVirtualMachine, abort handler was
called.\n);
-
[Libreoffice-commits] .: 2 commits - sd/inc sd/source
sd/inc/strmname.h | 20 ++--
sd/source/core/drawdoc4.cxx|3 +--
sd/source/core/sdpage.cxx | 30 +++---
sd/source/core/sdpage2.cxx |2 +-
sd/source/ui/docshell/docshel4.cxx | 23 ++-
5 files changed, 37 insertions(+), 41 deletions(-)
New commits:
commit 8adec08d56a9ad46d3550e43b115e916c4cf783f
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Wed Apr 18 16:09:02 2012 -0300
More RTL_CONSTASCII conversions
diff --git a/sd/inc/strmname.h b/sd/inc/strmname.h
index 04de560..ca8aae4 100644
--- a/sd/inc/strmname.h
+++ b/sd/inc/strmname.h
@@ -30,24 +30,24 @@
#define _SD_STRMNAME_H
// Alter Name des Dokument-Streams
-static const String pStarDrawDoc( RTL_CONSTASCII_USTRINGPARAM(
StarDrawDocument ));
+static const rtl::OUString pStarDrawDoc(StarDrawDocument);
// Name des Dokument-Streams
-static const String pStarDrawDoc3( RTL_CONSTASCII_USTRINGPARAM(
StarDrawDocument3 ));
+static const rtl::OUString pStarDrawDoc3( StarDrawDocument3 );
// Sonstige
-static const String pSfxStyleSheets( RTL_CONSTASCII_USTRINGPARAM(
SfxStyleSheets ));
-static const String pVCItemPoolName( RTL_CONSTASCII_USTRINGPARAM( VCPool ));
-static const String pPreviewName( RTL_CONSTASCII_USTRINGPARAM(
StarDrawTemplatePreview ));
+static const rtl::OUString pSfxStyleSheets( SfxStyleSheets );
+static const rtl::OUString pVCItemPoolName( VCPool );
+static const rtl::OUString pPreviewName( StarDrawTemplatePreview );
// PowerPoint-Filter
-static const String pFilterPowerPoint97( RTL_CONSTASCII_USTRINGPARAM( MS
PowerPoint 97 ));
-static const String pFilterPowerPoint97Template( RTL_CONSTASCII_USTRINGPARAM(
MS PowerPoint 97 Vorlage ));
-static const String pFilterPowerPoint97AutoPlay( RTL_CONSTASCII_USTRINGPARAM(
MS PowerPoint 97 AutoPlay ));
+static const rtl::OUString pFilterPowerPoint97( MS PowerPoint 97 );
+static const rtl::OUString pFilterPowerPoint97Template( MS PowerPoint 97
Vorlage );
+static const rtl::OUString pFilterPowerPoint97AutoPlay( MS PowerPoint 97
AutoPlay );
// XML content stream
-static const String pStarDrawXMLContent( RTL_CONSTASCII_USTRINGPARAM(
content.xml ));
-static const String pStarDrawOldXMLContent( RTL_CONSTASCII_USTRINGPARAM(
Content.xml ));
+static const rtl::OUString pStarDrawXMLContent( content.xml );
+static const rtl::OUString pStarDrawOldXMLContent( Content.xml );
#endif // _SD_STRMNAME_H
diff --git a/sd/source/ui/docshell/docshel4.cxx
b/sd/source/ui/docshell/docshel4.cxx
index 89d3003..5b0d4c5 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -440,7 +440,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium rMedium )
{
mbNewDocument = sal_False;
-const StringaFilterName( rMedium.GetFilter()-GetFilterName() );
+const rtl::OUStringaFilterName( rMedium.GetFilter()-GetFilterName() );
sal_BoolbRet = sal_False;
boolbStartPresentation = false;
@@ -469,8 +469,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium rMedium )
mpDoc-StopWorkStartupDelay();
bRet = SdPPTFilter( rMedium, *this, sal_True ).Import();
}
-else if (aFilterName.SearchAscii(impress8 ) != STRING_NOTFOUND ||
- aFilterName.SearchAscii(draw8) != STRING_NOTFOUND )
+else if (aFilterName.match(impress8 ) || aFilterName.match(draw8))
{
// TODO/LATER: nobody is interested in the error code?!
mpDoc-CreateFirstPages();
@@ -479,7 +478,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium rMedium )
bRet = SdXMLFilter( rMedium, *this, sal_True ).Import( nError );
}
-else if (aFilterName.SearchAscii(StarOffice XML (Draw) ) !=
STRING_NOTFOUND || aFilterName.SearchAscii(StarOffice XML (Impress)) !=
STRING_NOTFOUND )
+else if (aFilterName.match(StarOffice XML (Draw)) ||
aFilterName.match(StarOffice XML (Impress)))
{
// TODO/LATER: nobody is interested in the error code?!
mpDoc-CreateFirstPages();
@@ -487,7 +486,7 @@ sal_Bool DrawDocShell::ConvertFrom( SfxMedium rMedium )
ErrCode nError = ERRCODE_NONE;
bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal,
SOFFICE_FILEFORMAT_60 ).Import( nError );
}
-else if( aFilterName.EqualsAscii( CGM - Computer Graphics Metafile ) )
+else if( aFilterName.equals( CGM - Computer Graphics Metafile ) )
{
mpDoc-CreateFirstPages();
mpDoc-StopWorkStartupDelay();
@@ -593,30 +592,28 @@ sal_Bool DrawDocShell::ConvertTo( SfxMedium rMedium )
if( mpDoc-GetPageCount() )
{
const SfxFilter*pMediumFilter = rMedium.GetFilter();
-const StringaTypeName( pMediumFilter-GetTypeName() );
+const rtl::OUString aTypeName( pMediumFilter-GetTypeName() );
SdFilter* pFilter = NULL;
-if( aTypeName.SearchAscii( graphic_HTML ) != STRING_NOTFOUND )
+if(
[Libreoffice-commits] .: drawinglayer/source
drawinglayer/source/primitive2d/borderlineprimitive2d.cxx | 22 ++ 1 file changed, 16 insertions(+), 6 deletions(-) New commits: commit 49bd0e4e6bb0ed0671de72d84700ddcc49828f69 Author: Michael Stahl mst...@redhat.com Date: Wed Apr 18 22:15:19 2012 +0200 fdo#48647: drawinglayer: fix double hairline borders: Clipping the border polygon to the region defined by the Extends is sufficient to create a nice looking 1 twip double border in Writer. (regression from 0f0896c26fb260d1bbf31d7a886df3f61837f0f2) diff --git a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx index 1834d36..86f58d6 100644 --- a/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/borderlineprimitive2d.cxx @@ -114,9 +114,14 @@ namespace drawinglayer aLeft.append(aTmpStart); aLeft.append(aTmpEnd); -xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( -aLeft, -getRGBColorLeft())); +basegfx::B2DPolyPolygon const aClipped = +basegfx::tools::clipPolygonOnPolyPolygon( +aLeft, aClipRegion, true, true); + +xRetval[nInsert++] = +new PolyPolygonHairlinePrimitive2D( +aClipped, +getRGBColorLeft()); aGap.append( getStart() - getExtendLeftStart() * aVector ); aGap.append( getEnd() + getExtendLeftEnd() * aVector ); @@ -159,9 +164,14 @@ namespace drawinglayer aRight.append(aTmpStart); aRight.append(aTmpEnd); -xRetval[nInsert++] = Primitive2DReference(new PolygonHairlinePrimitive2D( -aRight, -getRGBColorRight())); +basegfx::B2DPolyPolygon const aClipped = +basegfx::tools::clipPolygonOnPolyPolygon( +aRight, aClipRegion, true, true); + +xRetval[nInsert++] = +new PolyPolygonHairlinePrimitive2D( +aClipped, +getRGBColorRight()); aGap.append( getStart() - getExtendRightStart() * aVector ); aGap.append( getEnd() + getExtendRightEnd() * aVector ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: comphelper/inc filter/source
comphelper/inc/comphelper/documentconstants.hxx | 29 filter/source/config/cache/constant.hxx |4 +++ 2 files changed, 33 insertions(+) New commits: commit 1ab7d31a6842ad680351e804990f7a0493f93b46 Author: Tor Lillqvist tlillqv...@suse.com Date: Wed Apr 18 23:36:33 2012 +0300 Add comment describing the meanings of the filter flag bits diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx index 06653b0..d65ced0 100644 --- a/comphelper/inc/comphelper/documentconstants.hxx +++ b/comphelper/inc/comphelper/documentconstants.hxx @@ -114,6 +114,35 @@ // filter flags // TODO/LATER: The flags should be part of the UNO specification + +// Note that these flag bits have parallel names in +// filter/source/config/cache/constant.hxx. Some of the bits are +// missing from there, and some have different names. But the meaning +// is presumably the same, and the values are the same. + +// http://www.mail-archive.com/dev@openoffice.org/msg05047.html says: + +// I can just sum up what comes into my mind, hope I don't miss one: + +// Import - should be self explaining +// Export - should be self explaining +// Template- deprecated +// TemplatePath- filter for a documenttemplate +// Own - one of the OOo file formats +// Alien - no zip container based format +// Preferred - preferred filter for a particular type +// Asynchron - deprecated, only HTML-filter isn't synchron +// 3rdPartyFilter - implemented as a UNO component +// Default - default filter for this document type +// NotInFileDialog - should be self explaining +// NotInChooser- as above + +// (The 3rdPartyFilter flag is here called StarONE) + +// At some point (4.0?) we should drop the duplicate set of names over +// in filter, and rename the obscure ones to describe their meaning +// using terms that are understandable. + #define SFX_FILTER_IMPORT0x0001L #define SFX_FILTER_EXPORT0x0002L #define SFX_FILTER_TEMPLATE 0x0004L diff --git a/filter/source/config/cache/constant.hxx b/filter/source/config/cache/constant.hxx index 7632068..9161803 100644 --- a/filter/source/config/cache/constant.hxx +++ b/filter/source/config/cache/constant.hxx @@ -115,6 +115,10 @@ extern rtl::OUString pFilterStrings[]; #define CFGDIRECTKEY_FORMATVERSION _FILTER_CONFIG_FROM_ASCII_(/org.openoffice.Setup/Product/ooXMLFileFormatVersion ) #define CFGDIRECTKEY_PRODUCTNAME _FILTER_CONFIG_FROM_ASCII_(/org.openoffice.Setup/Product/ooName ) +// Note that these flag bits have parallel names in +// comphelper/inc/comphelper/documentconstants.hxx . See that file for +// documentation on their meaning. + /** @short names of filter flags, sorted in alphabetical order */ #define FLAGNAME_3RDPARTYFILTER _FILTER_CONFIG_FROM_ASCII_(3RDPARTYFILTER ) #define FLAGNAME_ALIEN _FILTER_CONFIG_FROM_ASCII_(ALIEN ) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: scripting/source
scripting/source/runtimemgr/ScriptNameResolverImpl.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5f93dc708a807a74cb176dd37a484ad8f947b191 Author: Julien Nabet serval2...@yahoo.fr Date: Wed Apr 18 22:51:44 2012 +0200 Fix another extra parenthesis diff --git a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx index 68f6001..6588c2f 100644 --- a/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx +++ b/scripting/source/runtimemgr/ScriptNameResolverImpl.cxx @@ -362,7 +362,7 @@ throw ( lang::IllegalArgumentException, script::CannotConvertException, RuntimeE storage::XScriptInfoAccess ( xScriptStorage, UNO_QUERY_THROW ); Sequence Reference storage::XScriptInfo results = xScriptInfoAccess-getAllImplementations( ); -Reference lang::XEventListener xEL_ScriptStorageMgr(( xScriptStorageMgr ,UNO_QUERY_THROW ); +Reference lang::XEventListener xEL_ScriptStorageMgr( xScriptStorageMgr ,UNO_QUERY_THROW ); lang::EventObject event( results[ 0 ] ); xEL_ScriptStorageMgr-disposing( event ); } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/qa sd/source
sd/qa/unit/filters-test.cxx |9 +---
sd/source/filter/eppt/eppt.cxx|4 -
sd/source/filter/eppt/pptexanimations.cxx | 24 +-
sd/source/filter/eppt/pptx-text.cxx | 67 ++
4 files changed, 51 insertions(+), 53 deletions(-)
New commits:
commit 8a78020b4ead30627a021a0d604c558488565ffe
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Wed Apr 18 18:06:49 2012 -0300
More RTL_CONSTASCII cleanups
diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index 1936280..b6afb39 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -113,7 +113,7 @@ FileFormat aFileFormats[] = {
rtl::OUString(), pFmt-nFormatType, nFormat,
rtl::OUString::createFromAscii( pFmt-pTypeName ),
0, rtl::OUString(), rtl::OUString(), /* userdata */
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(private:factory/sdraw*)) );
+rtl::OUString(private:factory/sdraw*) );
aFilter-SetVersion(SOFFICE_FILEFORMAT_CURRENT);
::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
@@ -176,9 +176,9 @@ bool SdFiltersTest::load(const rtl::OUString rFilter,
const rtl::OUString rURL
void SdFiltersTest::testCVEs()
{
-testDir(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(MS PowerPoint 97)),
+testDir(rtl::OUString(MS PowerPoint 97),
getURLFromSrc(/sd/qa/unit/data/ppt/),
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdfilt)));
+rtl::OUString(sdfilt));
}
SdFiltersTest::SdFiltersTest()
@@ -192,8 +192,7 @@ void SdFiltersTest::setUp()
// This is a bit of a fudge, we do this to ensure that ScGlobals::ensure,
// which is a private symbol to us, gets called
m_xDrawComponent =
-getMultiServiceFactory()-createInstance(rtl::OUString(
-
RTL_CONSTASCII_USTRINGPARAM(com.sun.star.comp.Draw.PresentationDocument)));
+
getMultiServiceFactory()-createInstance(com.sun.star.comp.Draw.PresentationDocument);
CPPUNIT_ASSERT_MESSAGE(no impress component!, m_xDrawComponent.is());
}
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 72bc751..d041683 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -122,7 +122,7 @@ void PPTWriter::exportPPTPre( const std::vector
com::sun::star::beans::Property
if ( !mpPicStrm )
mpPicStrm = mrStg-OpenSotStream( rtl::OUString( Pictures ) );
-const String sBaseURI( RTL_CONSTASCII_USTRINGPARAM( BaseURI ) );
+const rtl::OUString sBaseURI( BaseURI );
std::vector com::sun::star::beans::PropertyValue ::const_iterator aIter(
rMediaData.begin() );
while( aIter != rMediaData.end() )
{
@@ -1310,7 +1310,7 @@ void PPTWriter::ImplWriteOLE( )
aOleExport.ExportOLEObject( xObj, *xTempStorage );
//TODO/MBA: testing
-String aPersistStream( String::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( SVEXT_PERSIST_STREAM ) ) );
+rtl::OUString aPersistStream( SVEXT_PERSIST_STREAM );
SvMemoryStream aStream;
SvStorageRef xCleanStorage( new SvStorage( sal_False,
aStream ) );
xTempStorage-CopyTo( xCleanStorage );
diff --git a/sd/source/filter/eppt/pptexanimations.cxx
b/sd/source/filter/eppt/pptexanimations.cxx
index 9ffc748..a2edb89 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -1414,10 +1414,10 @@ void AnimationExporter::exportAnimEvent( SvStream
rStrm, const Reference XAnim
Any AnimationExporter::convertAnimateValue( const Any rSourceValue, const
rtl::OUString rAttributeName )
{
rtl::OUString aDest;
-if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( X ) )
-|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( Y ) )
-|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
Width ) )
-|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
Height ) )
+if ( rAttributeName == X
+|| rAttributeName == Y
+|| rAttributeName == Width
+|| rAttributeName == Height
)
{
rtl::OUString aStr;
@@ -1427,20 +1427,20 @@ Any AnimationExporter::convertAnimateValue( const Any
rSourceValue, const rtl::
aDest += aStr;
}
}
-else if ( rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
Rotate ) ) // r or style.rotation ?
-|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
SkewX ) )
-|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
Opacity ) )
-|| rAttributeName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
CharHeight ) )
+else if ( rAttributeName == Rotate // r or style.rotation ?
+|| rAttributeName == SkewX
+|| rAttributeName ==
[Libreoffice-commits] .: binfilter/inc
binfilter/inc/bf_tools/table.hxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit baafe1cf57fa101e6308ed9f60cf0be46d3c22d8
Author: Michael Stahl mst...@redhat.com
Date: Wed Apr 18 23:12:58 2012 +0200
table.hxx: oops, forgot TOOLS_DLLPUBLIC in there
diff --git a/binfilter/inc/bf_tools/table.hxx b/binfilter/inc/bf_tools/table.hxx
index e39b334..89d61af 100644
--- a/binfilter/inc/bf_tools/table.hxx
+++ b/binfilter/inc/bf_tools/table.hxx
@@ -28,7 +28,6 @@
#ifndef _TOOLS_TABLE_HXX
#define _TOOLS_TABLE_HXX
-#include tools/toolsdllapi.h
#include tools/solar.h
#include bf_tools/contnr.hxx
@@ -41,11 +40,11 @@ namespace binfilter
#define TABLE_ENTRY_NOTFOUND CONTAINER_ENTRY_NOTFOUND
-class TOOLS_DLLPUBLIC Table : private Container
+class Table : private Container
{
private:
sal_uIntPtr nCount;
-TOOLS_DLLPRIVATE sal_uIntPtrImplGetIndex( sal_uIntPtr nKey,
sal_uIntPtr* pIndex = NULL ) const;
+SAL_DLLPRIVATE sal_uIntPtrImplGetIndex( sal_uIntPtr nKey, sal_uIntPtr*
pIndex = NULL ) const;
public:
Table( sal_uInt16 nInitSize = 16, sal_uInt16 nReSize = 16 );
Table( const Table rTable ) : Container( rTable )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
