lots of .tests output during make hides error messages
Recently, when building a lot of output from typedef.tests, polystruct.tests, methodoverload.tests, published.tests and more is produced. Ufortunately, when there is an error in the code to be compiled, it gets hidden between the test-output. The tests-output continues after a compile error. 'Long ago', there was a build_err.log produced in which errors could be searched, but that is no longer generated. Is there an autorun.sh argument that can switch the test-output off (or switch the build_err.log on)? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - solenv/bin
solenv/bin/modules/installer/windows/property.pm |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 55ede5572e4b242f73caaf557802ff38e6d1af29
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 24 12:52:55 2013 +0100
fdo#59798: MSI installer spurious space in version number
(regression from e024a8d88dbca3a2d178ad88c069721a92156ddf)
Change-Id: I0a94f7265d310f0f5c48c747ffca49a7aeb05a01
(cherry picked from commit 3c0f360995741c16e93f49b1a1e771d0f4e40dc7)
Reviewed-on: https://gerrit.libreoffice.org/1840
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
(cherry picked from commit 72f0e26b6a5f7b3bb32d713227de189e0a7a2b4f)
Reviewed-on: https://gerrit.libreoffice.org/1843
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index 56f4ba5d..fddb6c4 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -167,7 +167,7 @@ sub get_productname_for_property_table($$)
if ( $allvariables-{'PRODUCTEXTENSION'} )
{
$productextension = $allvariables-{'PRODUCTEXTENSION'};
-$productname = $productname . . $productextension;
+$productname = $productname . $productextension;
}
if ( $installer::globals::languagepack )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - solenv/bin
solenv/bin/modules/installer/windows/property.pm | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 67fcef018003a4baa8a758bb79cad459016009bc
Author: Michael Stahl mst...@redhat.com
Date: Thu Jan 24 13:33:13 2013 +0100
fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
... by adding POSTVERSIONEXTENSION after PRODUCTEXTENSION.
(regression from e024a8d88dbca3a2d178ad88c069721a92156ddf)
Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32
(cherry picked from commit e2d60ae0bf885a39bb392729797b0fc6ec3a5fe5)
Reviewed-on: https://gerrit.libreoffice.org/1841
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
(cherry picked from commit c6a1ebfd96e0d05bd6b93d49dd3fdebc518c9328)
Reviewed-on: https://gerrit.libreoffice.org/1844
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index fddb6c4..20e6ad3 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -156,13 +156,6 @@ sub get_productname_for_property_table($$)
my $version = $allvariables-{'PRODUCTVERSION'};
my $productname = $name . . $version;
-my $postversionextension = ;
-if ( $allvariables-{'POSTVERSIONEXTENSION'} )
-{
-$postversionextension = $allvariables-{'POSTVERSIONEXTENSION'};
-$productname = $productname . . $postversionextension;
-}
-
my $productextension = ;
if ( $allvariables-{'PRODUCTEXTENSION'} )
{
@@ -170,6 +163,13 @@ sub get_productname_for_property_table($$)
$productname = $productname . $productextension;
}
+my $postversionextension = ;
+if ( $allvariables-{'POSTVERSIONEXTENSION'} )
+{
+$postversionextension = $allvariables-{'POSTVERSIONEXTENSION'};
+$productname = $productname . . $postversionextension;
+}
+
if ( $installer::globals::languagepack )
{
my $langstring = get_english_language_string(); # Example: (English,
German)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BluetoothServer.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 693217465486667d38c3b7cd6d654136fe1efc85
Author: Michael Meeks michael.me...@suse.com
Date: Sat Jan 26 12:32:17 2013 +1100
sdremote: kill memory corruption / mis-matched alloc/free's.
(cherry picked from commit e99b540d8985b87247519c951e6ef65a01b1f5c9)
Change-Id: I253f28d7c83371282adde86c8eaadd6f25beff5a
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx
b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 41255ba..86a1fa5 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -119,7 +119,7 @@ bool BluetoothServer::isDiscoverable()
return false;
}
-GHashTable* aProperties;
+GHashTable* aProperties = NULL;
aResult = dbus_g_proxy_call( aAdapter, GetProperties, aError,
G_TYPE_INVALID,
DBUS_TYPE_G_STRING_ANY_HASHTABLE, aProperties,
@@ -136,7 +136,7 @@ bool BluetoothServer::isDiscoverable()
gboolean aIsDiscoverable = g_value_get_boolean( (GValue*)
g_hash_table_lookup(
aProperties, Discoverable ) );
-g_free( aProperties );
+g_hash_table_unref( aProperties );
return aIsDiscoverable;
#else // defined(LINUX) defined(ENABLE_DBUS)
return false;
@@ -188,7 +188,7 @@ void BluetoothServer::setDiscoverable( bool aDiscoverable )
gboolean aPowered = g_value_get_boolean( (GValue*) g_hash_table_lookup(
aProperties, Powered ) );
-g_free( aProperties );
+g_hash_table_unref( aProperties );
if ( !aPowered )
{
SAL_INFO( sdremote.bluetooth, Bluetooth adapter not powered,
returning );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [REVIEW 4-0-0] crash for sdremote ...
On Sat, Jan 26, 2013 at 10:30:52PM +1100, Michael Meeks michael.me...@suse.com wrote: The symptom is - it crashes the Slideshow-Remote Control menu item 100% of the time unless you have ooenv sourced (ie. export G_SLICE=always-malloc - means the g_free doesn't stamp on the slice allocator as it does for normal users ;-) Heh -- pushed to -4-0, two more needed for 4-0-0. signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - drawinglayer/source
drawinglayer/source/primitive2d/metafileprimitive2d.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 5ca5a5dd124f68c8a5667d86d6a0dbbd49a5f911
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 20 23:20:57 2013 +0100
Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm
(cherry picked from commit 59bce03256c5c00616cf63ace140cb91fdd46aa7)
Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
Reviewed-by: Radek DoulÃk r...@novell.com
Tested-by: Radek DoulÃk r...@novell.com
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index d168bef..7631601 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -524,8 +524,9 @@ namespace
TargetHolder Current()
{
+static TargetHolder aDummy;
OSL_ENSURE(maTargetHolders.size(), TargetHolders: CURRENT with no
property holders (!));
-return *maTargetHolders.back();
+return maTargetHolders.empty() ? aDummy : *maTargetHolders.back();
}
~TargetHolders()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: build/win32
build/win32/libmspub.dsp | 16 -- build/win32/libmspub.vcproj | 250 --- build/win32/libmspub.vcxproj | 185 +-- 3 files changed, 58 insertions(+), 393 deletions(-) New commits: commit e0e306d4f5c7384c7495f340360fefa1808cb6b9 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 28 09:52:29 2013 +0100 Cleanup the project files diff --git a/build/win32/libmspub.dsp b/build/win32/libmspub.dsp index fb47251..4421e1b 100644 --- a/build/win32/libmspub.dsp +++ b/build/win32/libmspub.dsp @@ -139,18 +139,10 @@ SOURCE=..\..\src\lib\Shadow.cpp # End Source File # Begin Source File -SOURCE=..\..\src\lib\ShapeGroup.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\lib\ShapeGroupElement.cpp # End Source File # Begin Source File -SOURCE=..\..\src\lib\ShapeGroupPainter.cpp -# End Source File -# Begin Source File - SOURCE=..\..\src\lib\VectorTransformation2D.cpp # End Source File # End Group @@ -287,18 +279,10 @@ SOURCE=..\..\src\lib\ShapeFlags.h # End Source File # Begin Source File -SOURCE=..\..\src\lib\ShapeGroup.h -# End Source File -# Begin Source File - SOURCE=..\..\src\lib\ShapeGroupElement.h # End Source File # Begin Source File -SOURCE=..\..\src\lib\ShapeGroupPainter.h -# End Source File -# Begin Source File - SOURCE=..\..\src\lib\ShapeInfo.h # End Source File # Begin Source File diff --git a/build/win32/libmspub.vcproj b/build/win32/libmspub.vcproj index a93d318..1f2e9cc 100644 --- a/build/win32/libmspub.vcproj +++ b/build/win32/libmspub.vcproj @@ -175,24 +175,6 @@ File RelativePath=..\..\src\lib\ColorReference.cpp - FileConfiguration - Name=Release|Win32 - - Tool - Name=VCCLCompilerTool - AdditionalIncludeDirectories= - PreprocessorDefinitions= - / - /FileConfiguration - FileConfiguration - Name=Debug|Win32 - - Tool - Name=VCCLCompilerTool - AdditionalIncludeDirectories= - PreprocessorDefinitions= - / - /FileConfiguration /File File RelativePath=..\..\src\lib\Dash.cpp @@ -201,134 +183,26 @@ File RelativePath=..\..\src\lib\Fill.cpp - FileConfiguration - Name=Release|Win32 - - Tool - Name=VCCLCompilerTool - AdditionalIncludeDirectories= - PreprocessorDefinitions= - / - /FileConfiguration - FileConfiguration - Name=Debug|Win32 - - Tool - Name=VCCLCompilerTool - AdditionalIncludeDirectories= - PreprocessorDefinitions= - / - /FileConfiguration /File File RelativePath=..\..\src\lib\libmspub_utils.cpp - FileConfiguration - Name=Release|Win32 - - Tool - Name=VCCLCompilerTool - AdditionalIncludeDirectories= - PreprocessorDefinitions= - / - /FileConfiguration - FileConfiguration - Name=Debug|Win32 - - Tool -
Change in core[master]: configure: accept building without themes
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1879 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/1879/1 configure: accept building without themes If --with-theme=no is specified disallow any check for valid themes which would otherwise give an error. Change-Id: I45d2872145f3bd15e17beac4f69f8b4b1855d9a3 --- M configure.ac 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index dc13c15..7a29b48 100644 --- a/configure.ac +++ b/configure.ac @@ -10824,14 +10824,16 @@ fi WITH_THEMES= -for theme in $with_theme; do -case $theme in - crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; -*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; -esac -WITH_THEMES=$WITH_THEMES $theme -SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'` -done +if test x$with_theme != xno; then +for theme in $with_theme; do +case $theme in + crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; +*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; +esac +WITH_THEMES=$WITH_THEMES $theme +SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'` +done +fi AC_MSG_RESULT([$WITH_THEMES]) AC_SUBST([WITH_THEMES]) -- To view, visit https://gerrit.libreoffice.org/1879 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I45d2872145f3bd15e17beac4f69f8b4b1855d9a3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: sfx2/source/control/templateview.src is localizable
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1882 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/1882/1 sfx2/source/control/templateview.src is localizable Change-Id: Ic21abffa3a889b96e2ce03c9ad997b3924133e66 --- M sfx2/AllLangResTarget_sfx2.mk 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index 63a2d3a..10c0639 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -48,6 +48,7 @@ sfx2/source/appl/sfx.src \ sfx2/source/bastyp/bastyp.src \ sfx2/source/bastyp/fltfnc.src \ +sfx2/source/control/templateview.src \ sfx2/source/dialog/alienwarn.src \ sfx2/source/dialog/dialog.src \ sfx2/source/dialog/dinfdlg.src \ @@ -75,10 +76,6 @@ sfx2/source/doc/templatedlg.src \ sfx2/source/menu/menu.src \ sfx2/source/view/view.src \ -)) - -$(eval $(call gb_SrsTarget_add_nonlocalized_files,sfx/res,\ -sfx2/source/control/templateview.src \ )) # vim: set noet sw=4 ts=4: -- To view, visit https://gerrit.libreoffice.org/1882 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic21abffa3a889b96e2ce03c9ad997b3924133e66 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: sfx2/source/control/templateview.src is localizable
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1883 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/1883/1 sfx2/source/control/templateview.src is localizable Change-Id: Ic21abffa3a889b96e2ce03c9ad997b3924133e66 --- M sfx2/AllLangResTarget_sfx2.mk 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index 63a2d3a..10c0639 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -48,6 +48,7 @@ sfx2/source/appl/sfx.src \ sfx2/source/bastyp/bastyp.src \ sfx2/source/bastyp/fltfnc.src \ +sfx2/source/control/templateview.src \ sfx2/source/dialog/alienwarn.src \ sfx2/source/dialog/dialog.src \ sfx2/source/dialog/dinfdlg.src \ @@ -75,10 +76,6 @@ sfx2/source/doc/templatedlg.src \ sfx2/source/menu/menu.src \ sfx2/source/view/view.src \ -)) - -$(eval $(call gb_SrsTarget_add_nonlocalized_files,sfx/res,\ -sfx2/source/control/templateview.src \ )) # vim: set noet sw=4 ts=4: -- To view, visit https://gerrit.libreoffice.org/1883 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic21abffa3a889b96e2ce03c9ad997b3924133e66 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: fdo#57180 add calc function NUMBERVALUE as defined in ODFF1....
Eike Rathke has posted comments on this change.
Change subject: fdo#57180 add calc function NUMBERVALUE as defined in ODFF1.2
..
Patch Set 3: (10 inline comments)
We're nearing the goal :-)
Please see my inline comments.
If you want me to take over just tell me, otherwise please submit a new patch
set for this change.
File sc/source/core/tool/interpr1.cxx
Line 3392: sal_Unicode cDecimalSeparator;
cDecimalSeparator needs to be initialized with 0 here, so comparison
if(cDecimalSeparator...) below works.
Line 3423: {
Why only do these checks if there was nGlobalError?
Line 3434: }
Better would be to have
if (nGlobalError)
{
PushError( nGlobalError);
return;
}
if (aInputString.isEmpty())
{
if (GetGlobalConfig().mbEmptyStringAsZero)
PushDouble(0);
else
PushNoValue();
return;
}
Line 3442: }
Performance wise it is better to search for group separators in the string
because usually there's only one separator. Instead of replaceAt() use
replaceAll() that replaces all occurrences, for this just copy the string to a
temporary not including the decimal separator and the fractional part and
operate on the temporary copy, and when done concatenate the result with the
decimal separator plus fractional part again. Also,
aGroupSeparator.iterateCodePoints() should be used to obtain one separator at a
time and create the string to be searched, to allow for full UTF-16 characters,
like this:
sal_Int32 nDecSep = aInputString.indexOf( cDecimalSeparator);
if (nDecSep != 0)
{
OUString aTemporary( nDecSep = 0 ? aInputString.copy( 0, nDecSep) :
aInputString);
sal_Int32 nIndex = 0;
do
{
sal_uInt32 nChar = aGroupSeparator.iterateCodePoints( nIndex);
aTemporary = aTemporary.replaceAll( OUString( nChar, 1), );
} while (nIndex aGroupSeparator.getLength());
if (nDecSep = 0)
aInputString = aTemporary + aInputString.copy( nDecSep);
else
aInputString = aTemporary;
}
All unchecked, may contain errors ;-)
Line 3451: for ( i = aInputString.getLength() - 1; aInputString[ i ] ==
0x0025 i = 0; i-- )
The condition needs to be swapped so it doesn't access [-1] memory
i = 0 aInputString[ i ] == 0x0025
Line 3453: if ( aInputString[ i ] == 0x0025 )
There is no need to check this again, the condition of the for loop already did
this.
Line 3462: double fVal = ::rtl::math::stringToDouble( aInputString,
cDecimalSeparator, 0, eStatus, nParseEnd );
Yes, correct. Sorry, my bad, I was confusing with the underlying
rtl_math_stringToDouble() function that takes the sal_int32**
File sc/source/filter/excel/xlformula.cxx
Line 405: EXC_FUNCENTRY_ODF( ocNoName,2, 2, 0, IFNA ),
Oops, this IFNA should not be here, probably due to your rebase.
Line 445
Do not remove this, please check your rebase.
File sc/source/filter/oox/formulabase.cxx
Line 727: { NUMBERVALUE,0, NOID, NOID,
1, 3, V, { VR }, FUNCFLAG_MACROCALLODF }
Should be FUNCFLAG_MACROCALL instead of FUNCFLAG_MACROCALLODF and have the
NUMBERVALUE name instead of 0
However, with my latest change in commit
1162738c6fbd8505ffa27b28118318cc522a5368 that now should be
FUNCFLAG_MACROCALL_NEW instead.
--
To view, visit https://gerrit.libreoffice.org/1477
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I6ee01764ae9fc27854fd3bd8a630b9d3560192e5
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl
Gerrit-Reviewer: Eike Rathke er...@redhat.com
Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: resolved fdo#59819 write correct OOXML function name mapping
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1884
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/84/1884/1
resolved fdo#59819 write correct OOXML function name mapping
OOXML export so far used the internal English PODF symbols that worked
only by accident. As soon as function names or operators differed it was
plain wrong. Use the existing OOXML mapping instead that also the import
uses.
For example, in OOXML the IFNA function is stored as _xlfn.IFNA, Excel
2013 could not read the IFNA that we wrote.
Also, do not write a definedName element in OOXML for new functions
that in the binary format are written as macro calls and need a defined
name entry.
(cherry picked from commit 1162738c6fbd8505ffa27b28118318cc522a5368)
non-dbgutil build [-Werror=unused-parameter]
(cherry picked from commit 0adb958c451660ec0eea012480b6327dd2aefeb4)
Change-Id: I094990f1e5179045bfba559fea10bc0a3fe17731
Reviewed-on: https://gerrit.libreoffice.org/1854
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
(cherry picked from commit fd96008b90c024c6e4c3a251440a7878629bbc17)
---
M sc/source/filter/excel/xecontent.cxx
M sc/source/filter/excel/xeextlst.cxx
M sc/source/filter/excel/xeformula.cxx
M sc/source/filter/excel/xeroot.cxx
M sc/source/filter/excel/xestream.cxx
M sc/source/filter/excel/xetable.cxx
M sc/source/filter/inc/formulabase.hxx
M sc/source/filter/inc/xeroot.hxx
M sc/source/filter/inc/xestream.hxx
M sc/source/filter/oox/formulabase.cxx
M sc/source/filter/xcl97/XclExpChangeTrack.cxx
11 files changed, 136 insertions(+), 26 deletions(-)
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index a58f1b0..5a46ad5 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -931,12 +931,14 @@
if(!IsTextRule(eOperation) !IsTopBottomRule(eOperation))
{
rWorksheet-startElement( XML_formula, FSEND );
-rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 0 ) ));
+rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
+mrFormatEntry.CreateTokenArry( 0 ),
GetRoot().GetOpCodeMap() ));
rWorksheet-endElement( XML_formula );
if (bFmla2)
{
rWorksheet-startElement( XML_formula, FSEND );
-rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(), mrFormatEntry.CreateTokenArry( 1 ) ));
+rWorksheet-write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
+mrFormatEntry.CreateTokenArry( 1 ),
GetRoot().GetOpCodeMap() ));
rWorksheet-endElement( XML_formula );
}
}
@@ -1076,7 +1078,8 @@
rtl::OString aValue;
if(mrEntry.GetType() == COLORSCALE_FORMULA)
{
-rtl::OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(),
maSrcPos, mrEntry.GetFormula()-Clone() );
+rtl::OUString aFormula = XclXmlUtils::ToOUString( GetRoot().GetDoc(),
maSrcPos,
+mrEntry.GetFormula()-Clone(), GetRoot().GetOpCodeMap() );
aValue = rtl::OUStringToOString(aFormula, RTL_TEXTENCODING_UTF8 );
}
else
@@ -1582,14 +1585,16 @@
Formula compiler supports this by offering two
different functions
CreateDataValFormula() and CreateListValFormula(). */
mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_LISTVAL,
*xScTokArr );
-msFormula1 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(), xScTokArr.get() );
+msFormula1 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(),
+xScTokArr.get(), GetRoot().GetOpCodeMap() );
}
}
else
{
// no list validation - convert the formula
mxTokArr1 = rFmlaComp.CreateFormula( EXC_FMLATYPE_DATAVAL,
*xScTokArr );
-msFormula1 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(), xScTokArr.get() );
+msFormula1 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(),
+xScTokArr.get(), GetRoot().GetOpCodeMap() );
}
}
@@ -1598,7 +1603,8 @@
if( xScTokArr.get() )
{
mxTokArr2 = rFmlaComp.CreateFormula( EXC_FMLATYPE_DATAVAL,
*xScTokArr );
-msFormula2 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(), xScTokArr.get() );
+msFormula2 = XclXmlUtils::ToOUString( GetDoc(),
pValData-GetSrcPos(),
+xScTokArr.get(), GetRoot().GetOpCodeMap() );
}
}
else
diff --git a/sc/source/filter/excel/xeextlst.cxx
b/sc/source/filter/excel/xeextlst.cxx
index
Change in core[libreoffice-4-0-0]: don't use ScDrawLayer::GetObjDataTab to get Anchor fix for f...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1837 Approvals: Kohei Yoshida: Looks good to me, but someone else must approve Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1837 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d240f80a9974f6e4032875ed00350c94621bde7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Noel Power noel.po...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#58562: Ensure internal data is always used when pasting ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1846 Approvals: Markus Mohrhard: Looks good to me, but someone else must approve Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1846 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1dbc854c5faae62f06ece155fad470b229ca0c7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com Gerrit-Reviewer: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Markus Mohrhard markus.mohrh...@googlemail.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: sfx2/source/control/templateview.src is localizable
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1883 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1883 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic21abffa3a889b96e2ce03c9ad997b3924133e66 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: update LICENSE document
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1880 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1880 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c9957c63e3bb2d9dbd8fefc9e5ccb5dc0ea6006 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#57061: Use a new MIGRATION4 flag file for profile migrat...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1867 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1867 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8dd50a36450c167d47411834cc06a754affadf6d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: fdo#59056: Re-calculate cell anchor position of a pasted dra...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1869 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1869 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I52d11eb9953ee7539c9d5da41edd7dd28604587c Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Kohei Yoshida kohei.yosh...@gmail.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Removing useless SwTableBox_Impl from Writter
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1885
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/85/1885/1
Removing useless SwTableBox_Impl from Writter
Change-Id: I2cb471e9b0784673deb75beb7d403b136fbce500
---
M sw/inc/swtable.hxx
M sw/source/core/table/swtable.cxx
2 files changed, 31 insertions(+), 87 deletions(-)
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 81f2696..1074aae 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -53,7 +53,6 @@
class SwUndoTblMerge;
class SwUndo;
class SwPaM;
-class SwTableBox_Impl;
class SwUndoTblCpyTbl;
class SwBoxSelection;
struct SwSaveRowSpan;
@@ -391,7 +390,10 @@
SwTableLines aLines;
const SwStartNode * pSttNd;
SwTableLine *pUpper;
-SwTableBox_Impl* pImpl;
+
+Color *pSaveUserColor, *pSaveNumFmtColor;
+long nRowSpan;
+bool bDummyFlag;
// In case Format contains formulas/values already,
// a new one must be created for the new box.
@@ -400,7 +402,7 @@
public:
TYPEINFO();
-SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {}
+SwTableBox() : pSttNd(0), pUpper(0), pSaveUserColor(0),
pSaveNumFmtColor(0), nRowSpan(1), bDummyFlag(false) {}
SwTableBox( SwTableBoxFmt*, sal_uInt16 nLines, SwTableLine *pUp = 0 );
SwTableBox( SwTableBoxFmt*, const SwStartNode, SwTableLine *pUp = 0 );
@@ -457,15 +459,15 @@
DECL_FIXEDMEMPOOL_NEWDEL(SwTableBox)
// Access on internal data - currently used for the NumFormatter.
-inline const Color* GetSaveUserColor() const;
-inline const Color* GetSaveNumFmtColor() const;
+inline const Color* GetSaveUserColor() const { return pSaveUserColor; }
+inline const Color* GetSaveNumFmtColor() const { return pSaveNumFmtColor; }
inline void SetSaveUserColor(const Color* p );
inline void SetSaveNumFmtColor( const Color* p );
-long getRowSpan() const;
-void setRowSpan( long nNewRowSpan );
-bool getDummyFlag() const;
-void setDummyFlag( bool bDummy );
+long getRowSpan() const {return nRowSpan;}
+void setRowSpan( long nNewRowSpan ) { nRowSpan = nNewRowSpan;}
+bool getDummyFlag() const { return bDummyFlag;}
+void setDummyFlag( bool bDummy ) { bDummyFlag = bDummy;}
SwTableBox FindStartOfRowSpan( const SwTable, sal_uInt16 nMaxStep =
USHRT_MAX );
const SwTableBox FindStartOfRowSpan( const SwTable rTable,
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 466ed90..3b7d192 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -81,86 +81,18 @@
sal_Bool bChgAlign,sal_uLong nNdPos );
//--
-class SwTableBox_Impl
-{
-Color *mpUserColor, *mpNumFmtColor;
-long mnRowSpan;
-bool mbDummyFlag;
-
-void SetNewCol( Color** ppCol, const Color* pNewCol );
-public:
-SwTableBox_Impl() : mpUserColor(0), mpNumFmtColor(0), mnRowSpan(1),
-mbDummyFlag( false ) {}
-~SwTableBox_Impl() { delete mpUserColor; delete mpNumFmtColor; }
-
-const Color* GetSaveUserColor() const { return mpUserColor; }
-const Color* GetSaveNumFmtColor() const { return mpNumFmtColor; }
-void SetSaveUserColor(const Color* p ) { SetNewCol( mpUserColor, p
); }
-void SetSaveNumFmtColor( const Color* p ) { SetNewCol( mpNumFmtColor, p
); }
-long getRowSpan() const { return mnRowSpan; }
-void setRowSpan( long nNewRowSpan ) { mnRowSpan = nNewRowSpan; }
-bool getDummyFlag() const { return mbDummyFlag; }
-void setDummyFlag( bool bDummy ) { mbDummyFlag = bDummy; }
-};
+static void lcl_SetNewColor(Color** ppCol, const Color* pNewCol);
// --- Inlines -
-inline const Color* SwTableBox::GetSaveUserColor() const
+inline void SwTableBox::SetSaveUserColor(const Color* pNewColor )
{
-return pImpl ? pImpl-GetSaveUserColor() : 0;
+lcl_SetNewColor(pSaveUserColor, pNewColor);
}
-inline const Color* SwTableBox::GetSaveNumFmtColor() const
+inline void SwTableBox::SetSaveNumFmtColor( const Color* pNewColor )
{
-return pImpl ? pImpl-GetSaveNumFmtColor() : 0;
-}
-
-inline void SwTableBox::SetSaveUserColor(const Color* p )
-{
-if( pImpl )
-pImpl-SetSaveUserColor( p );
-else if( p )
-( pImpl = new SwTableBox_Impl ) -SetSaveUserColor( p );
-}
-
-inline void SwTableBox::SetSaveNumFmtColor( const Color* p )
-{
-if( pImpl )
-pImpl-SetSaveNumFmtColor( p );
-else if( p )
-( pImpl = new SwTableBox_Impl )-SetSaveNumFmtColor( p );
-}
-
-long SwTableBox::getRowSpan() const
-{
-return pImpl ? pImpl-getRowSpan() : 1;
-}
-
-void SwTableBox::setRowSpan( long nNewRowSpan )
-{
-if( !pImpl )
-{
-if( nNewRowSpan == 1 )
-return;
-pImpl = new SwTableBox_Impl();
-}
-pImpl-setRowSpan( nNewRowSpan );
-}
-
-bool SwTableBox::getDummyFlag() const
-{
-return
Change in core[master]: Remove more STRINGPARAM macros form dbaccess
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1878 Approvals: Olivier Hallot: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1878 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I283ccd03dc811dda2f10963f400cd517f42ea7b3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza marcos.souza@gmail.com Gerrit-Reviewer: Olivier Hallot olivier.hal...@alta.org.br ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: fdo#56886 EMF: Fixes some scaling problems of clipped region...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1886
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/1886/1
fdo#56886 EMF: Fixes some scaling problems of clipped regions, Twips
If a Metafile's scaling is incompletely defined, there are some arbitrary
values used.
Why was this bug not there in aoo 3.3? Maybe because they didn't use the EMF
Part of that WMF?
This Patch also adds an (untested) TWIPS scaling, which was missing
Change-Id: I7c0139853961eb338476a9e3a5e08d3f87225f2e
Signed-off-by: Lennard Wasserthal wassert...@nefkom.net
---
M svtools/source/filter/wmf/enhwmf.cxx
M svtools/source/filter/wmf/winmtf.cxx
M svtools/source/filter/wmf/winmtf.hxx
3 files changed, 107 insertions(+), 15 deletions(-)
diff --git a/svtools/source/filter/wmf/enhwmf.cxx
b/svtools/source/filter/wmf/enhwmf.cxx
index f8b9884..541d68d 100644
--- a/svtools/source/filter/wmf/enhwmf.cxx
+++ b/svtools/source/filter/wmf/enhwmf.cxx
@@ -485,8 +485,8 @@
EMFP_DEBUG(printf (\t\tunknown id: 0x%x\n,(unsigned int)
id));
}
}
-} else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF )
-
+}
+else if( !bEMFPlus || bHaveDC || nRecType == EMR_EOF )
switch( nRecType )
{
case EMR_POLYBEZIERTO :
@@ -518,14 +518,14 @@
case EMR_SETWINDOWEXTEX :
{ // #75383#
*pWMF nW nH;
-pOut-SetWinExt( Size( nW, nH ) );
+pOut-SetWinExt( Size( nW, nH ), true);
}
break;
case EMR_SETWINDOWORGEX :
{
*pWMF nX32 nY32;
-pOut-SetWinOrg( Point( nX32, nY32 ) );
+pOut-SetWinOrg( Point( nX32, nY32 ), true);
}
break;
@@ -917,7 +917,7 @@
PolyPolygon aPolyPoly;
if ( cbRgnData )
ImplReadRegion( aPolyPoly, *pWMF, nRecSize );
-pOut-SetClipPath( aPolyPoly, iMode, sal_False );
+pOut-SetClipPath( aPolyPoly, iMode, sal_True );
}
break;
@@ -1352,7 +1352,7 @@
return sal_False;
// bound size
-Rectangle rclBounds;// rectangle in logical units 1/100th mm
+Rectangle rclBounds;// rectangle in logical units
*pWMF nLeft nTop nRight nBottom;
rclBounds.Left() = nLeft;
rclBounds.Top() = nTop;
@@ -1360,7 +1360,7 @@
rclBounds.Bottom() = nBottom;
// picture frame size
-Rectangle rclFrame; // rectangle in device units
+Rectangle rclFrame; // rectangle in device units 1/100th mm
*pWMF nLeft nTop nRight nBottom;
rclFrame.Left() = nLeft;
rclFrame.Top() = nTop;
diff --git a/svtools/source/filter/wmf/winmtf.cxx
b/svtools/source/filter/wmf/winmtf.cxx
index 63b0996..59b1636 100644
--- a/svtools/source/filter/wmf/winmtf.cxx
+++ b/svtools/source/filter/wmf/winmtf.cxx
@@ -352,6 +352,20 @@
//---
//---
+Point WinMtfOutput::ImplScale( const Point rPt)//Hack to set varying defaults
for incompletely defined files.
+{
+if (mbIsMapDevSet mbIsMapWinSet)
+{
+return
Point((rPt.X())*mnWinExtX/mnDevWidth-mrclFrame.Left(),(rPt.Y())*mnWinExtY/mnDevHeight-mrclFrame.Top());
+}
+else
+{
+return
Point((rPt.X())*32-mrclFrame.Left(),(rPt.Y())*32-mrclFrame.Top());
+}
+}
+
+//---
+
Point WinMtfOutput::ImplMap( const Point rPt )
{
if ( mnWinExtX mnWinExtY )
@@ -395,6 +409,16 @@
fY2 = mnWinOrgY-fY2;
fX2 *= 2.540;
fY2 *= 2.540;
+fX2 += mnDevOrgX;
+fY2 += mnDevOrgY;
+}
+break;
+case MM_TWIPS:
+{
+fX2 -= mnWinOrgX;
+fY2 = mnWinOrgY-fY2;
+fX2 *= 1.7639;
+fY2 *= 1.7639;
fX2 += mnDevOrgX;
fY2 += mnDevOrgY;
}
@@ -486,6 +510,12 @@
fHeight *= -1;
}
break;
+case MM_TWIPS:
+{
+fWidth *= 1.7639;
+fHeight*=-1.7639;
+}
+break;
default :
{
fWidth /= mnWinExtX;
@@ -539,6 +569,27 @@
rPolygon[ i ] = ImplMap( rPolygon[ i ] );
}
return rPolygon;
+}
+
+//---
+
+Polygon
Change in core[master]: Removed empty autocorr.src file
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1887 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/1887/1 Removed empty autocorr.src file Change-Id: Ic19ffbe0b629482a3cadaaf15a77ba2443312957 --- M sw/AllLangResTarget_sw.mk D sw/source/ui/misc/autocorr.src 2 files changed, 0 insertions(+), 19 deletions(-) diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 9fbfa31..a388fc1 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -136,7 +136,6 @@ sw/source/ui/index/idxmrk.src \ sw/source/ui/index/multmrk.src \ sw/source/ui/lingu/olmenu.src \ -sw/source/ui/misc/autocorr.src \ sw/source/ui/misc/docfnote.src \ sw/source/ui/misc/glossary.src \ sw/source/ui/misc/numberingtypelistbox.src \ diff --git a/sw/source/ui/misc/autocorr.src b/sw/source/ui/misc/autocorr.src deleted file mode 100644 index 14bebe3..000 --- a/sw/source/ui/misc/autocorr.src +++ /dev/null @@ -1,18 +0,0 @@ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the License); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -/* StarView resource file */ -- To view, visit https://gerrit.libreoffice.org/1887 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic19ffbe0b629482a3cadaaf15a77ba2443312957 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth robert.roth@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Show meaningful title for search key not found infobox, fdo#...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1888
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/1888/1
Show meaningful title for search key not found infobox, fdo#59865
Change-Id: I5c99fc98552be705ddcb163320521620bdcbf7ef
---
M sw/source/ui/uiview/viewsrch.cxx
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 9cad97b..8e1f9c3 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -37,6 +37,8 @@
#include sal/macros.h
#include sfx2/request.hxx
#include svx/srchdlg.hxx
+#include svx/dialmgr.hxx
+#include svx/dialogs.hrc
#include vcl/msgbox.hxx
#include vcl/wrkwin.hxx
#include editeng/unolingu.hxx
@@ -85,6 +87,21 @@
else
pWin = 0;
return pWin;
+}
+
+inline void ShowNotFoundInfoBox( SvxSearchDialog* pSrchDlg )
+{
+Window* pParentWindow = GetParentWindow( pSrchDlg );
+InfoBox aBox( pParentWindow, SW_RES(MSG_NOT_FOUND));
+if (pParentWindow)
+{
+aBox.SetText(pParentWindow-GetText());
+}
+else
+{
+aBox.SetText(SVX_RESSTR(RID_SVXSTR_FINDBAR_FIND));
+}
+aBox.Execute();
}
void SwView::ExecSearch(SfxRequest rReq, sal_Bool bNoMessage)
@@ -211,8 +228,7 @@
{
if( !bApi )
{
-Window* pParentWindow = GetParentWindow( pSrchDlg );
-InfoBox( pParentWindow,
SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
bFound = sal_False;
}
@@ -311,8 +327,7 @@
{
if( !bApi )
{
-Window* pParentWindow = GetParentWindow( pSrchDlg
);
-InfoBox( pParentWindow,
SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
bFound = sal_False;
return;
@@ -483,8 +498,7 @@
pWrtShell-EndAllAction();
if( !bApi )
{
-Window* pParentWindow = GetParentWindow( pSrchDlg );
-InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
bFound = sal_False;
pWrtShell-Pop();
@@ -528,8 +542,7 @@
return bFound;
if(!bApi)
{
-Window* pParentWindow = GetParentWindow( pSrchDlg );
-InfoBox( pParentWindow, SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
return bFound = sal_False;
}
--
To view, visit https://gerrit.libreoffice.org/1888
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c99fc98552be705ddcb163320521620bdcbf7ef
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Robert Roth robert.roth@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#59798: MSI installer spurious space in version number
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1843 Approvals: Andras Timar: Verified; Looks good to me, but someone else must approve Eike Rathke: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1843 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a94f7265d310f0f5c48c747ffca49a7aeb05a01 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#59798: fix SDK MSI version LOdev 4.1 SDK.0.0.alpha0
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1844 Approvals: Andras Timar: Verified; Looks good to me, but someone else must approve Eike Rathke: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1844 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Partially Revert New Save, Save As and Reload File icons fo...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1889 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/1889/1 Partially Revert New Save, Save As and Reload File icons for the Tango theme Use diskette icon for saving-related actions again. http://user-prompt.com/about-antiquated-metaphors-in-icons/ This partially reverts commit f76c017cf4f216e72da362e4d5466a2e5cc7281e. Change-Id: Iec9f0f5d6b62556e922f42247d058df817147da6 --- A icon-themes/tango/cmd/lc_reload.xcf.bz2 M icon-themes/tango/cmd/lc_save.png D icon-themes/tango/cmd/lc_save.svg A icon-themes/tango/cmd/lc_save.xcf.bz2 M icon-themes/tango/cmd/lc_saveas.png A icon-themes/tango/cmd/lc_saveas.xcf.bz2 M icon-themes/tango/cmd/lc_savebasicas.png A icon-themes/tango/cmd/sc_reload.xcf.bz2 M icon-themes/tango/cmd/sc_save.png A icon-themes/tango/cmd/sc_save.xcf.bz2 M icon-themes/tango/cmd/sc_saveas.png A icon-themes/tango/cmd/sc_saveas.xcf.bz2 M icon-themes/tango/cmd/sc_savebasicas.png M icon-themes/tango/res/lc05502.png M icon-themes/tango/res/lc05505.png A icon-themes/tango/res/lc05508.png M icon-themes/tango/res/sc05502.png M icon-themes/tango/res/sc05505.png 18 files changed, 0 insertions(+), 1,663 deletions(-) -- To view, visit https://gerrit.libreoffice.org/1889 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec9f0f5d6b62556e922f42247d058df817147da6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stefan Knorr heinzless...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: New 4.0 splash screen, start centre, About screen by Maxim D...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1890 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/90/1890/1 New 4.0 splash screen, start centre, About screen by Maxim Darak Change-Id: I7be0eab728f4bc5780d06ce8c5b451b77ce13043 --- M configure.ac M icon-themes/galaxy/brand/flat_logo.svg M icon-themes/galaxy/brand/intro.png M icon-themes/galaxy/brand/shell/backing_left.png M icon-themes/galaxy/brand/shell/backing_right.png M icon-themes/galaxy/brand/shell/backing_rtl_left.png M icon-themes/galaxy/brand/shell/backing_rtl_right.png M icon-themes/galaxy/brand/shell/backing_space.png M icon-themes/galaxy/brand_dev/intro.png 9 files changed, 148 insertions(+), 71 deletions(-) diff --git a/configure.ac b/configure.ac index dc13c15..6d2580f 100644 --- a/configure.ac +++ b/configure.ac @@ -11840,7 +11840,7 @@ AC_MSG_CHECKING([for custom 'intro' progress bar color]) PROGRESSBARCOLOR= if test -z $with_intro_progressbar_color; then - PROGRESSBARCOLOR=255,255,255 + PROGRESSBARCOLOR=128,128,128 AC_MSG_RESULT([none]) else PROGRESSBARCOLOR=$with_intro_progressbar_color @@ -11851,7 +11851,7 @@ AC_MSG_CHECKING([for custom 'intro' progress bar size]) PROGRESSSIZE= if test -z $with_intro_progressbar_size; then - PROGRESSSIZE=407,6 + PROGRESSSIZE=409,8 AC_MSG_RESULT([none]) else PROGRESSSIZE=$with_intro_progressbar_size @@ -11862,7 +11862,7 @@ AC_MSG_CHECKING([for custom 'intro' progress bar position]) PROGRESSPOSITION= if test -z $with_intro_progressbar_position; then - PROGRESSPOSITION=61,317 + PROGRESSPOSITION=72,189 AC_MSG_RESULT([none]) else PROGRESSPOSITION=$with_intro_progressbar_position @@ -11873,7 +11873,7 @@ AC_MSG_CHECKING([for custom 'intro' progress bar frame color]) PROGRESSFRAMECOLOR= if test -z $with_intro_progressbar_frame_color; then - PROGRESSFRAMECOLOR=20,136,3 + PROGRESSFRAMECOLOR=245,245,245 AC_MSG_RESULT([none]) else PROGRESSFRAMECOLOR=$with_intro_progressbar_frame_color @@ -11884,7 +11884,7 @@ AC_MSG_CHECKING([for custom 'intro' progress text color]) PROGRESSTEXTCOLOR= if test -z $with_intro_progressbar_text_color; then - PROGRESSTEXTCOLOR=255,255,255 + PROGRESSTEXTCOLOR=128,128,128 AC_MSG_RESULT([none]) else PROGRESSTEXTCOLOR=$with_intro_progressbar_text_color @@ -11895,7 +11895,7 @@ AC_MSG_CHECKING([for custom 'intro' progress text baseline]) PROGRESSTEXTBASELINE= if test -z $with_intro_progressbar_text_baseline; then - PROGRESSTEXTBASELINE=287 + PROGRESSTEXTBASELINE=173 AC_MSG_RESULT([none]) else PROGRESSTEXTBASELINE=$with_intro_progressbar_text_baseline diff --git a/icon-themes/galaxy/brand/flat_logo.svg b/icon-themes/galaxy/brand/flat_logo.svg index 1559033..f06f5ca 100644 --- a/icon-themes/galaxy/brand/flat_logo.svg +++ b/icon-themes/galaxy/brand/flat_logo.svg @@ -8,10 +8,34 @@ xmlns:svg=http://www.w3.org/2000/svg; xmlns=http://www.w3.org/2000/svg; xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; version=1.1 width=486 height=80 - id=svg1205 + id=svg1205 + inkscape:version=0.48.3.1 r9886 + sodipodi:docname=flat_logo.svg + sodipodi:namedview + pagecolor=#ff + bordercolor=#66 + borderopacity=1 + objecttolerance=10 + gridtolerance=10 + guidetolerance=10 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:window-width=1366 + inkscape:window-height=709 + id=namedview36 + showgrid=false + inkscape:zoom=1 + inkscape:cx=72.58568 + inkscape:cy=21.028827 + inkscape:window-x=0 + inkscape:window-y=27 + inkscape:window-maximized=1 + inkscape:current-layer=svg1205 / defs id=defs1207 clipPath @@ -45,6 +69,16 @@ style=stop-color:#18a303;stop-opacity:1 offset=1 / /linearGradient +radialGradient + cx=520.80676 + cy=183.92038 + r=265 + fx=520.80676 + fy=183.92038 + id=radialGradient10424 + xlink:href=#linearGradient13473 + gradientUnits=userSpaceOnUse + gradientTransform=matrix(-0.92370346,0,0,-0.81991269,1087.8944,75.325519) / linearGradient id=linearGradient13473 stop @@ -66,6 +100,16 @@ xlink:href=#linearGradient13473 gradientUnits=userSpaceOnUse gradientTransform=matrix(-0.92370346,0,0,-0.81991269,1087.8944,75.325519) / +clipPath + id=clipPath11479-0 + rect + width=530 + height=87.272736 + x=6.6086682e-06 + y=-18.11 + id=rect11481-5 + style=opacity:0.6;fill:#530260;fill-opacity:1;stroke:none / +/clipPath /defs metadata id=metadata1210 @@ -75,90 +119,123 @@ dc:formatimage/svg+xml/dc:format dc:type
Change in core[libreoffice-4-0]: Resolves: fdo#49784 CRASH when FILEOPEN particular doc conta...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1850 -- To view, visit https://gerrit.libreoffice.org/1850 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: 4.0 splash screen, start centre, About screen by Maxim Darak
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1891 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/91/1891/1 4.0 splash screen, start centre, About screen by Maxim Darak Change-Id: Ibb27c4e44e8dae1851dee49d223f2b1fa6ce7641 --- M configure.ac M icon-themes/galaxy/brand/flat_logo.svg M icon-themes/galaxy/brand/intro.png M icon-themes/galaxy/brand/shell/backing_left.png M icon-themes/galaxy/brand/shell/backing_right.png M icon-themes/galaxy/brand/shell/backing_rtl_left.png M icon-themes/galaxy/brand/shell/backing_rtl_right.png M icon-themes/galaxy/brand/shell/backing_space.png M icon-themes/galaxy/brand_dev/intro.png 9 files changed, 148 insertions(+), 71 deletions(-) diff --git a/configure.ac b/configure.ac index dc13c15..6d2580f 100644 --- a/configure.ac +++ b/configure.ac @@ -11840,7 +11840,7 @@ AC_MSG_CHECKING([for custom 'intro' progress bar color]) PROGRESSBARCOLOR= if test -z $with_intro_progressbar_color; then - PROGRESSBARCOLOR=255,255,255 + PROGRESSBARCOLOR=128,128,128 AC_MSG_RESULT([none]) else PROGRESSBARCOLOR=$with_intro_progressbar_color @@ -11851,7 +11851,7 @@ AC_MSG_CHECKING([for custom 'intro' progress bar size]) PROGRESSSIZE= if test -z $with_intro_progressbar_size; then - PROGRESSSIZE=407,6 + PROGRESSSIZE=409,8 AC_MSG_RESULT([none]) else PROGRESSSIZE=$with_intro_progressbar_size @@ -11862,7 +11862,7 @@ AC_MSG_CHECKING([for custom 'intro' progress bar position]) PROGRESSPOSITION= if test -z $with_intro_progressbar_position; then - PROGRESSPOSITION=61,317 + PROGRESSPOSITION=72,189 AC_MSG_RESULT([none]) else PROGRESSPOSITION=$with_intro_progressbar_position @@ -11873,7 +11873,7 @@ AC_MSG_CHECKING([for custom 'intro' progress bar frame color]) PROGRESSFRAMECOLOR= if test -z $with_intro_progressbar_frame_color; then - PROGRESSFRAMECOLOR=20,136,3 + PROGRESSFRAMECOLOR=245,245,245 AC_MSG_RESULT([none]) else PROGRESSFRAMECOLOR=$with_intro_progressbar_frame_color @@ -11884,7 +11884,7 @@ AC_MSG_CHECKING([for custom 'intro' progress text color]) PROGRESSTEXTCOLOR= if test -z $with_intro_progressbar_text_color; then - PROGRESSTEXTCOLOR=255,255,255 + PROGRESSTEXTCOLOR=128,128,128 AC_MSG_RESULT([none]) else PROGRESSTEXTCOLOR=$with_intro_progressbar_text_color @@ -11895,7 +11895,7 @@ AC_MSG_CHECKING([for custom 'intro' progress text baseline]) PROGRESSTEXTBASELINE= if test -z $with_intro_progressbar_text_baseline; then - PROGRESSTEXTBASELINE=287 + PROGRESSTEXTBASELINE=173 AC_MSG_RESULT([none]) else PROGRESSTEXTBASELINE=$with_intro_progressbar_text_baseline diff --git a/icon-themes/galaxy/brand/flat_logo.svg b/icon-themes/galaxy/brand/flat_logo.svg index 1559033..f06f5ca 100644 --- a/icon-themes/galaxy/brand/flat_logo.svg +++ b/icon-themes/galaxy/brand/flat_logo.svg @@ -8,10 +8,34 @@ xmlns:svg=http://www.w3.org/2000/svg; xmlns=http://www.w3.org/2000/svg; xmlns:xlink=http://www.w3.org/1999/xlink; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; version=1.1 width=486 height=80 - id=svg1205 + id=svg1205 + inkscape:version=0.48.3.1 r9886 + sodipodi:docname=flat_logo.svg + sodipodi:namedview + pagecolor=#ff + bordercolor=#66 + borderopacity=1 + objecttolerance=10 + gridtolerance=10 + guidetolerance=10 + inkscape:pageopacity=0 + inkscape:pageshadow=2 + inkscape:window-width=1366 + inkscape:window-height=709 + id=namedview36 + showgrid=false + inkscape:zoom=1 + inkscape:cx=72.58568 + inkscape:cy=21.028827 + inkscape:window-x=0 + inkscape:window-y=27 + inkscape:window-maximized=1 + inkscape:current-layer=svg1205 / defs id=defs1207 clipPath @@ -45,6 +69,16 @@ style=stop-color:#18a303;stop-opacity:1 offset=1 / /linearGradient +radialGradient + cx=520.80676 + cy=183.92038 + r=265 + fx=520.80676 + fy=183.92038 + id=radialGradient10424 + xlink:href=#linearGradient13473 + gradientUnits=userSpaceOnUse + gradientTransform=matrix(-0.92370346,0,0,-0.81991269,1087.8944,75.325519) / linearGradient id=linearGradient13473 stop @@ -66,6 +100,16 @@ xlink:href=#linearGradient13473 gradientUnits=userSpaceOnUse gradientTransform=matrix(-0.92370346,0,0,-0.81991269,1087.8944,75.325519) / +clipPath + id=clipPath11479-0 + rect + width=530 + height=87.272736 + x=6.6086682e-06 + y=-18.11 + id=rect11481-5 + style=opacity:0.6;fill:#530260;fill-opacity:1;stroke:none / +/clipPath /defs metadata id=metadata1210 @@ -75,90 +119,123 @@ dc:formatimage/svg+xml/dc:format dc:type
[Review 4-0, 4-0-0] Use diskette icons for saving again
Hello there, please consider cherry-picking this last minute revert to our 3.5-and-before diskette icons for saving-related actions. https://gerrit.libreoffice.org/#/c/1889/ Find the rationale for the change from the cabinet icons back to the diskettes here: http://user-prompt.com/about-antiquated-metaphors-in-icons/ Thanks in advance, Astron. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Review 4-0, 4-0-0] New artwork for LibreOffice 4.0
Hello all, please consider https://gerrit.libreoffice.org/#/c/1891/ for inclusion in 4.0.0. It contains the new splash screen, About dialogue banner Start Centre banner (Community edition without TDF byline in the logo). Note that it does not include matching Windows installer background images, though. It should be possible to fix that in the 4.0.1 timeframe at least. Thanks, Astron. PS: all splash screens under discussion were posted here: https://wiki.documentfoundation.org/Design/Whiteboards/4.0_Branding ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libmspub-0.0.4'
Tag 'libmspub-0.0.4' created by Fridrich Å trba fridrich.st...@bluewin.ch at 2013-01-28 09:15 -0800 Tagging 0.0.4 release Changes since libmspub-0.0.3-25: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5e6440b844ded05dc75535a2198bc0d664fcb116 Author: Andras Timar ati...@suse.com Date: Mon Jan 28 10:23:51 2013 +0100 Updated core Project: translations a9e6547e0c1690c44a39fad8e5f8fe4890760fa4 diff --git a/translations b/translations index fc67068..a9e6547 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit fc67068258cdaa8f6e4c461fcb0b79262161e181 +Subproject commit a9e6547e0c1690c44a39fad8e5f8fe4890760fa4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d8e76b17f10296d0fa05f2f06a706b7449040903 Author: Andras Timar ati...@suse.com Date: Mon Jan 28 10:23:51 2013 +0100 Updated core Project: translations ecea5b4988b3fa5c89537fed198b0fb8879e1d85 diff --git a/translations b/translations index d8ebcba..ecea5b4 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit d8ebcbaf0cf34f2c8ffbc9337e08089e6bbd12f1 +Subproject commit ecea5b4988b3fa5c89537fed198b0fb8879e1d85 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - drawinglayer/source
drawinglayer/source/primitive2d/metafileprimitive2d.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 35cd3d0d6dd6d5d6fc3e406cb452c07cfa7b1a7f
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Jan 20 23:20:57 2013 +0100
Resolves: fdo#49784 CRASH when FILEOPEN particular doc containing .svm
Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7
Reviewed-on: https://gerrit.libreoffice.org/1788
Reviewed-by: Radek DoulÃk r...@novell.com
Tested-by: Radek DoulÃk r...@novell.com
Reviewed-on: https://gerrit.libreoffice.org/1851
diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
index fa5b1ae..6da553b 100644
--- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
+++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx
@@ -534,8 +534,9 @@ namespace
TargetHolder Current()
{
+static TargetHolder aDummy;
OSL_ENSURE(maTargetHolders.size(), TargetHolders: CURRENT with no
property holders (!));
-return *maTargetHolders.back();
+return maTargetHolders.empty() ? aDummy : *maTargetHolders.back();
}
~TargetHolders()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: how to add a new font in installer package
yes, I did it , but dosnt work! 2013/1/28 Andras Timar tima...@gmail.com Hi, On Mon, Jan 28, 2013 at 8:38 AM, huqitu du huq...@gmail.com wrote: I need to add a new font in installer In order to support traditional mongolia, and 1. I copy font file to solver\wntmsci12.pro\bin and then 2. modify the scp2\source\ooo\file_font_ooo.scp as DejaVuSans font did, //mongolian fonts #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_MenkQagan, MQG8F01.ttf, Menk Qagan Tig) #endif but when rebuild the scp2 and instsetoo_native, reinstall the libreoffice, but my font not copyed to windows\fonts dir, what I need to do another thing? You need to add gid_File_Fnt_MenkQagan to scp2/source/ooo/module_hidden_ooo.scp. Best regards, Andras -- 内蒙古蒙科立公司 胡其图 email:huq...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [ANNOUNCE] : Gerrit Patch Verification Buildbot
Hello Norbert, Il 26/01/2013 08:48, Norbert Thiebaud ha scritto: Dear All, _david_ and I have been working for some time to integrate tinderboxing with gerrit. == What is it ? == The goal being to test build gerrit patch on Linux, Mac and Windows, to verify them before they get integrated. Cool! seen it in action and it's always nice to know you didn't break anything before pushing :) I'm wondering if you can save some cpu cycles by creating a blacklist of file patterns that does not trigger rebuild on some platforms, for example a patch i posted touched only configure.ac which probably don't need a windows rebuild. Was reading through https://wiki.documentfoundation.org/Development/tb and found TB_MATADATA_DIR , should this be TB_METADATA_DIR instead? thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: uui/source
uui/source/newerverwarn.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ff6ad8900b30b50eca4a1bd5d051eac216d76f96
Author: Noel Grandin n...@peralex.com
Date: Mon Jan 28 11:37:00 2013 +0200
fdo#46808, make MacOS tinderbox happy
Change-Id: I17a2a1861f35beedc8c9ec23738fbd042b1a1f63
diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index 21f5393..bbf192d 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -88,12 +88,12 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
uno::Reference uno::XComponentContext xContext =
::comphelper::getProcessComponentContext();
if ( !sNotifyURL.isEmpty()!m_sVersion.isEmpty() )
{
-uno::Reference system::XSystemShellExecute xSystemShell(
system::SystemShellExecute::create(xContext) );
+uno::Reference com::sun::star::system::XSystemShellExecute
xSystemShell( com::sun::star::system::SystemShellExecute::create(xContext) );
sNotifyURL += m_sVersion;
if ( !sNotifyURL.isEmpty() )
{
xSystemShell-execute(
-sNotifyURL, ::rtl::OUString(),
system::SystemShellExecuteFlags::URIS_ONLY );
+sNotifyURL, ::rtl::OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
}
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [ANNOUNCE] : Gerrit Patch Verification Buildbot
On Mon, Jan 28, 2013 at 3:32 AM, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: Cool! seen it in action and it's always nice to know you didn't break anything before pushing :) I'm wondering if you can save some cpu cycles by creating a blacklist of file patterns that does not trigger rebuild on some platforms, for example a patch i posted touched only configure.ac which probably don't need a windows rebuild. It is _always_ the patch that can't possibly break the build that do Was reading through https://wiki.documentfoundation.org/Development/tb and found TB_MATADATA_DIR , should this be TB_METADATA_DIR instead? yes indeed :-) thankfully that is only a typo in the documentation, not the code :-) since it is a Wiki, by all mean fell free to fix obvious typo like that :-) Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: Show meaningful title for search key not found infobox, fdo#...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1888 -- To view, visit https://gerrit.libreoffice.org/1888 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c99fc98552be705ddcb163320521620bdcbf7ef Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth robert.roth@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - sw/AllLangResTarget_sw.mk sw/source vcl/inc vcl/source
sw/AllLangResTarget_sw.mk|1 -
sw/source/ui/misc/autocorr.src | 18 --
sw/source/ui/uiview/viewsrch.cxx | 29 +
vcl/inc/svids.hrc| 21 +++--
vcl/source/src/btntext.src |5 +
vcl/source/window/builder.cxx|2 ++
6 files changed, 39 insertions(+), 37 deletions(-)
New commits:
commit 0c5225b871b6b1a1121c3f803d946392a4676e97
Author: Caolán McNamara caol...@redhat.com
Date: Mon Jan 28 09:28:44 2013 +
add SV_BUTTONTEXT_SAVE and map to gtk-save
Change-Id: Ib51e7c95a807c988da87068d8d2e49773a41282e
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 064cd53..32d24e4 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -156,18 +156,19 @@
#define SV_BUTTONTEXT_NEW 10115
#define SV_BUTTONTEXT_EDIT 10116
#define SV_BUTTONTEXT_APPLY 10117
-#define SV_BUTTONTEXT_OK_NOMNEMONIC 10118
-#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC 10119
+#define SV_BUTTONTEXT_SAVE 10118
+#define SV_BUTTONTEXT_OK_NOMNEMONIC 10119
+#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC 10120
#define SV_STDTEXT_FIRSTSV_STDTEXT_SERVICENOTAVAILABLE
-#define SV_STDTEXT_SERVICENOTAVAILABLE 10200
-
-#define SV_STDTEXT_DONTASKAGAIN 10202
-#define SV_STDTEXT_DONTWARNAGAIN10203
-#define SV_STDTEXT_ABOUT10204
-#define SV_STDTEXT_PREFERENCES 10205
-#define SV_MAC_SCREENNNAME 10206
-#define SV_STDTEXT_ALLFILETYPES 10207
+#define SV_STDTEXT_SERVICENOTAVAILABLE 10210
+
+#define SV_STDTEXT_DONTASKAGAIN 10212
+#define SV_STDTEXT_DONTWARNAGAIN10213
+#define SV_STDTEXT_ABOUT10214
+#define SV_STDTEXT_PREFERENCES 10215
+#define SV_MAC_SCREENNNAME 10216
+#define SV_STDTEXT_ALLFILETYPES 10217
#define STR_FPICKER_AUTO_EXTENSION10300
#define STR_FPICKER_PASSWORD 10301
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index a16fc70..75379f7 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -119,3 +119,8 @@ String SV_BUTTONTEXT_APPLY
{
Text [ en-US ] = ~Apply;
};
+
+String SV_BUTTONTEXT_SAVE
+{
+Text [ en-US ] = ~Save;
+};
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index e62e4dc..510a4ce 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -556,6 +556,8 @@ namespace
return (VclResId(SV_BUTTONTEXT_EDIT).toString());
else if (rType == gtk-apply)
return (VclResId(SV_BUTTONTEXT_APPLY).toString());
+else if (rType == gtk-save)
+return (VclResId(SV_BUTTONTEXT_SAVE).toString());
SAL_WARN(vcl.layout, unknown stock type: rType.getStr());
return OUString();
}
commit a29032c951c53ac889de2a7644ae4ac9beef28dc
Author: Robert Roth robert.roth@gmail.com
Date: Mon Jan 28 03:53:55 2013 +0200
Show meaningful title for search key not found infobox, fdo#59865
Change-Id: I5c99fc98552be705ddcb163320521620bdcbf7ef
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 9cad97b..8e1f9c3 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -37,6 +37,8 @@
#include sal/macros.h
#include sfx2/request.hxx
#include svx/srchdlg.hxx
+#include svx/dialmgr.hxx
+#include svx/dialogs.hrc
#include vcl/msgbox.hxx
#include vcl/wrkwin.hxx
#include editeng/unolingu.hxx
@@ -87,6 +89,21 @@ inline Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
return pWin;
}
+inline void ShowNotFoundInfoBox( SvxSearchDialog* pSrchDlg )
+{
+Window* pParentWindow = GetParentWindow( pSrchDlg );
+InfoBox aBox( pParentWindow, SW_RES(MSG_NOT_FOUND));
+if (pParentWindow)
+{
+aBox.SetText(pParentWindow-GetText());
+}
+else
+{
+aBox.SetText(SVX_RESSTR(RID_SVXSTR_FINDBAR_FIND));
+}
+aBox.Execute();
+}
+
void SwView::ExecSearch(SfxRequest rReq, sal_Bool bNoMessage)
{
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -211,8 +228,7 @@ void SwView::ExecSearch(SfxRequest rReq, sal_Bool
bNoMessage)
{
if( !bApi )
{
-Window* pParentWindow = GetParentWindow( pSrchDlg );
-InfoBox( pParentWindow,
SW_RES(MSG_NOT_FOUND)).Execute();
+ShowNotFoundInfoBox( pSrchDlg );
}
bFound = sal_False;
}
@@ -311,8 +327,7 @@ void SwView::ExecSearch(SfxRequest rReq, sal_Bool
bNoMessage)
{
if( !bApi )
{
-Window* pParentWindow = GetParentWindow( pSrchDlg
);
-
Change in core[master]: Removed empty autocorr.src file
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1887 -- To view, visit https://gerrit.libreoffice.org/1887 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic19ffbe0b629482a3cadaaf15a77ba2443312957 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth robert.roth@gmail.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: download.lst libmspub/ExternalPackage_libmspub.mk libmspub/ExternalProject_libmspub.mk libmspub/libmspub-0.0.3.patch libmspub/Module_libmspub.mk libmspub/prj libmspub/StaticLi
RepositoryExternal.mk|7 ++- download.lst |4 - libmspub/ExternalPackage_libmspub.mk | 13 + libmspub/ExternalProject_libmspub.mk | 76 +++ libmspub/Module_libmspub.mk |2 libmspub/StaticLibrary_mspub.mk | 45 libmspub/UnpackedTarball_mspub.mk|4 - libmspub/libmspub-0.0.3.patch| 44 libmspub/prj/build.lst |2 9 files changed, 96 insertions(+), 101 deletions(-) New commits: commit 093a5c95a3724eb4795713c5cb4472611ca22324 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 28 10:13:50 2013 +0100 Upload libmspub 0.0.4 Change-Id: Icb47740815fabff2338196ec194a51a23f7adadd diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index aa73937..5bd9442 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1142,12 +1142,15 @@ endef else # !SYSTEM_LIBMSPUB $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - mspublib \ + mspub-0.0 \ )) define gb_LinkTarget__use_mspub +$(call gb_LinkTarget_use_package,$(1),\ + libmspub \ +) $(call gb_LinkTarget_use_static_libraries,$(1),\ - mspublib \ + mspub-0.0 \ ) endef diff --git a/download.lst b/download.lst index 407365a..663d727 100644 --- a/download.lst +++ b/download.lst @@ -1,7 +1,7 @@ CDR_MD5SUM := bfc46d536c39b03563ab2a0e3beaf51b export CDR_TARBALL := libcdr-0.0.10.tar.bz2 -MSPUB_MD5SUM := b2db54b6e96287ac995d7ed654ace4fc -export MSPUB_TARBALL := libmspub-0.0.3.tar.bz2 +MSPUB_MD5SUM := aafd3687297bfc3967847d2213d08071 +export MSPUB_TARBALL := libmspub-0.0.4.tar.bz2 VISIO_MD5SUM := 1962a4183bac8a247989af17ef8882ea export VISIO_TARBALL := libvisio-0.0.24.tar.bz2 diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk index 89aecd8..83a0c87 100644 --- a/libmspub/ExternalPackage_libmspub.mk +++ b/libmspub/ExternalPackage_libmspub.mk @@ -7,12 +7,21 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub_inc,mspub)) +$(eval $(call gb_ExternalPackage_ExternalPackage,libmspub,mspub)) -$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub_inc,inc/external/libmspub,\ +$(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmspub,\ src/lib/libmspub.h \ src/lib/MSPUBDocument.h \ src/lib/MSPUBStringVector.h \ )) +$(eval $(call gb_ExternalPackage_use_external_project,libmspub,libmspub)) + +ifeq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,build/win32/Release/lib/libmspub-0.0.lib)) +else +$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/libmspub-0.0.a,src/lib/.libs/libmspub-0.0.a)) +endif + + # vim: set noet sw=4 ts=4: diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk new file mode 100644 index 000..a971b75 --- /dev/null +++ b/libmspub/ExternalProject_libmspub.mk @@ -0,0 +1,76 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_ExternalProject_ExternalProject,libmspub)) + +$(eval $(call gb_ExternalProject_use_unpacked,libmspub,mspub)) + +$(eval $(call gb_ExternalProject_register_targets,libmspub,\ + build \ +)) + +$(eval $(call gb_ExternalProject_use_externals,libmspub,\ + icu \ + wpd \ + wpg \ +)) + +ifeq ($(OS)$(COM),WNTMSC) + +ifeq ($(VCVER),90) +$(call gb_ExternalProject_get_state_target,libmspub,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ +export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ +export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ +export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ +$(COMPATH)/vcpackages/vcbuild.exe libmspub.vcproj Release|Win32 \ +touch $@ +else ifeq ($(VCVER),100) +$(call gb_ExternalProject_get_state_target,libmspub,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ +export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ +export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ +export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ +msbuild.exe libmspub.vcxproj /p:Configuration=Release \ +touch $@ +else +$(call gb_ExternalProject_get_state_target,libmspub,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ +export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ +export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ +export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ +
Re: [ANNOUNCE] : Gerrit Patch Verification Buildbot
Il 28/01/2013 10:39, Norbert Thiebaud ha scritto: On Mon, Jan 28, 2013 at 3:32 AM, Riccardo Magliocchetti riccardo.magliocche...@gmail.com wrote: Cool! seen it in action and it's always nice to know you didn't break anything before pushing :) I'm wondering if you can save some cpu cycles by creating a blacklist of file patterns that does not trigger rebuild on some platforms, for example a patch i posted touched only configure.ac which probably don't need a windows rebuild. It is _always_ the patch that can't possibly break the build that do I trust you on that :) Was reading through https://wiki.documentfoundation.org/Development/tb and found TB_MATADATA_DIR , should this be TB_METADATA_DIR instead? yes indeed :-) thankfully that is only a typo in the documentation, not the code :-) since it is a Wiki, by all mean fell free to fix obvious typo like that :-) Done thanks, riccardo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac src/conv src/lib
configure.ac |9 - src/conv/raw/Makefile.am |6 +++--- src/conv/svg/Makefile.am |6 +++--- src/lib/Makefile.am |4 ++-- 4 files changed, 16 insertions(+), 9 deletions(-) New commits: commit 9ae7b703255feb022ebf4e9a8360d26ab43474e5 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 28 10:51:23 2013 +0100 A bit of cleanup of build system diff --git a/configure.ac b/configure.ac index 23d5e93..d0279b7 100644 --- a/configure.ac +++ b/configure.ac @@ -37,11 +37,18 @@ PKG_PROG_PKG_CONFIG([0.20]) # # Find additional apps # -PKG_CHECK_MODULES([LIBMSPUB],[ +PKG_CHECK_MODULES([WPD],[ libwpd-0.9 libwpd-stream-0.9 +]) +AC_SUBST(WPD_CFLAGS) +AC_SUBST(WPD_LIBS) + +PKG_CHECK_MODULES([WPG],[ libwpg-0.2 ]) +AC_SUBST(WPG_CFLAGS) +AC_SUBST(WPG_LIBS) # = # Find zlib diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am index 08ec6f3..26a41b5 100644 --- a/src/conv/raw/Makefile.am +++ b/src/conv/raw/Makefile.am @@ -1,14 +1,14 @@ bin_PROGRAMS = pub2raw -AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBMSPUB_CXXFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPG_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS) pub2raw_DEPENDENCIES = @PUB2RAW_WIN32_RESOURCE@ if STATIC_TOOLS -pub2raw_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.a $(LIBMSPUB_LIBS) @PUB2RAW_WIN32_RESOURCE@ +pub2raw_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.a $(WPD_LIBS) @PUB2RAW_WIN32_RESOURCE@ pub2raw_LDFLAGS = -all-static else -pub2raw_LDADD = ../../lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la $(LIBMSPUB_LIBS) @PUB2RAW_WIN32_RESOURCE@ +pub2raw_LDADD = ../../lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la $(WPD_LIBS) @PUB2RAW_WIN32_RESOURCE@ endif pub2raw_SOURCES = \ diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am index a19f2ca..52fa201 100644 --- a/src/conv/svg/Makefile.am +++ b/src/conv/svg/Makefile.am @@ -1,14 +1,14 @@ bin_PROGRAMS = pub2xhtml -AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(LIBMSPUB_CXXFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPG_CFLAGS) $(WPD_CFLAGS) $(DEBUG_CXXFLAGS) pub2xhtml_DEPENDENCIES = @PUB2XHTML_WIN32_RESOURCE@ if STATIC_TOOLS -pub2xhtml_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.a $(LIBMSPUB_LIBS) @PUB2XHTML_WIN32_RESOURCE@ +pub2xhtml_LDADD = ../../lib/@MSPUB_OBJDIR@/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.a $(WPD_LIBS) @PUB2XHTML_WIN32_RESOURCE@ pub2xhtml_LDFLAGS = -all-static else -pub2xhtml_LDADD = ../../lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la $(LIBMSPUB_LIBS) @PUB2XHTML_WIN32_RESOURCE@ +pub2xhtml_LDADD = ../../lib/libmspub-@MSPUB_MAJOR_VERSION@.@MSPUB_MINOR_VERSION@.la $(WPD_LIBS) @PUB2XHTML_WIN32_RESOURCE@ endif pub2xhtml_SOURCES = \ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 463116d..b932314 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -11,9 +11,9 @@ libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_include_HEADERS = \ MSPUBDocument.h \ MSPUBStringVector.h -AM_CXXFLAGS = $(LIBMSPUB_CXXFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) +AM_CXXFLAGS = $(WPD_CFLAGS) $(WPG_CFLAGS) $(ZLIB_CFLAGS) $(ICU_CFLAGS) $(DEBUG_CXXFLAGS) -libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD = $(LIBMSPUB_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@ +libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LIBADD = $(WPD_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBMSPUB_WIN32_RESOURCE@ libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_DEPENDENCIES = @LIBMSPUB_WIN32_RESOURCE@ libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no_undefined libmspub_@MSPUB_MAJOR_VERSION@_@MSPUB_MINOR_VERSION@_la_SOURCES = \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Change in core[master]: use OUString(Buffer) in class Edit
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1892
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/1892/1
use OUString(Buffer) in class Edit
replaced Len() with isEmpty() where appropriate
Change-Id: I5a5847d6055f376fd5f86079aa1736541d790fff
---
M dbaccess/source/ui/control/FieldDescControl.cxx
M dbaccess/source/ui/querydesign/QueryTextView.cxx
M dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
M dbaccess/source/ui/tabledesign/TEditControl.cxx
M dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
M vcl/inc/vcl/edit.hxx
M vcl/inc/vcl/vclmedit.hxx
M vcl/source/control/edit.cxx
M vcl/source/edit/vclmedit.cxx
9 files changed, 146 insertions(+), 146 deletions(-)
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx
b/dbaccess/source/ui/control/FieldDescControl.cxx
index aa4627b..0bf88fe 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -1710,7 +1710,7 @@
m_pActFocusWindow == pTextLen || m_pActFocusWindow ==
pLength ||
m_pActFocusWindow == pScale || m_pActFocusWindow ==
m_pColumnName ||
m_pActFocusWindow == m_pAutoIncrementValue)
-
static_castEdit*(m_pActFocusWindow)-GetSelected().Len() != 0;
+
!static_castEdit*(m_pActFocusWindow)-GetSelected().isEmpty();
return bAllowed;
}
@@ -1722,7 +1722,7 @@
m_pActFocusWindow == pTextLen || m_pActFocusWindow ==
pLength ||
m_pActFocusWindow == pScale || m_pActFocusWindow ==
m_pColumnName ||
m_pActFocusWindow == m_pAutoIncrementValue)
-
static_castEdit*(m_pActFocusWindow)-GetSelected().Len() != 0;
+
!static_castEdit*(m_pActFocusWindow)-GetSelected().isEmpty();
return bAllowed;
}
//
-
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx
b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index f508f76..be9833d 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -111,7 +111,7 @@
//
-
sal_Bool OQueryTextView::isCutAllowed()
{
-return m_pEdit-GetSelected().Len() != 0;
+return !m_pEdit-GetSelected().isEmpty();
}
//
-
sal_Bool OQueryTextView::isPasteAllowed()
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 342a341..2bfcc1f 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -2501,10 +2501,10 @@
case BROW_FUNCTION_ROW:
break;
case BROW_FIELD_ROW:
-bCutAllowed = m_pFieldCell-GetSelected().Len() != 0;
+bCutAllowed = !m_pFieldCell-GetSelected().isEmpty();
break;
default:
-bCutAllowed = m_pTextCell-GetSelected().Len() != 0;
+bCutAllowed = !m_pTextCell-GetSelected().isEmpty();
break;
}
return bCutAllowed;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx
b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 2785fe7..27cfa5f 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1299,13 +1299,13 @@
switch(m_eChildFocus)
{
case DESCRIPTION:
-bIsCutAllowed = pDescrCell-GetSelected().Len() != 0;
+bIsCutAllowed = !pDescrCell-GetSelected().isEmpty();
break;
case HELPTEXT:
-bIsCutAllowed = pHelpTextCell-GetSelected().Len() != 0;
+bIsCutAllowed = !pHelpTextCell-GetSelected().isEmpty();
break;
case NAME:
-bIsCutAllowed = pNameCell-GetSelected().Len() != 0;
+bIsCutAllowed = !pNameCell-GetSelected().isEmpty();
break;
case ROW:
bIsCutAllowed = IsCopyAllowed(nRow);
@@ -1325,15 +1325,15 @@
DBG_CHKTHIS(OTableEditorCtrl,NULL);
sal_Bool bIsCopyAllowed = sal_False;
if(m_eChildFocus == DESCRIPTION )
-bIsCopyAllowed = pDescrCell-GetSelected().Len() != 0;
+bIsCopyAllowed = !pDescrCell-GetSelected().isEmpty();
else if(HELPTEXT == m_eChildFocus )
-bIsCopyAllowed = pHelpTextCell-GetSelected().Len() != 0;
+bIsCopyAllowed = !pHelpTextCell-GetSelected().isEmpty();
else if(m_eChildFocus == NAME)
-bIsCopyAllowed = pNameCell-GetSelected().Len() != 0;
+bIsCopyAllowed =
Change in core[libreoffice-3-6]: Resolves: fdo#49784 CRASH when FILEOPEN particular doc conta...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1851 Approvals: Radek Doulík: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1851 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia86ec2f32259180a29857eee53d6d5c082e05bf7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Julien Nabet serval2...@yahoo.fr Gerrit-Reviewer: Radek Doulík r...@novell.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
REMINDER: Release 4.0.0.3 from libreoffice-4-0-0 branch
Hi, please note that the commit deadline for 4.0.0.3, aka rc3, is today, January 28, 2013. It will be used as LO-4.0.0 final if no blocker is reported. See also http://wiki.documentfoundation.org/ReleasePlan#4.0_release http://wiki.documentfoundation.org/Release_Criteria http://wiki.documentfoundation.org/Development/Branches Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: unify the spelling of 'Kazakh' language name
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1876 Approvals: Eike Rathke: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1876 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ief83eb05e92af16cb5b795f2bbb1e3d6f7c9659a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Andras Timar ati...@suse.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - filter/source i18npool/inc i18npool/source shell/source svtools/source
filter/source/msfilter/countryid.cxx |2 +-
i18npool/inc/i18npool/lang.h |2 +-
i18npool/source/isolang/isolang.cxx|2 +-
i18npool/source/isolang/mslangid.cxx |2 +-
shell/source/win32/shlxthandler/util/utilities.cxx |2 +-
svtools/source/misc/langtab.src|2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 72669485b00fd76c4de6f8613a8c2fcc7dfc63f3
Author: Andras Timar ati...@suse.com
Date: Sat Jan 26 11:17:10 2013 +0100
unify the spelling of 'Kazakh' language name
While 'Kazakh' can be written as 'Kazak' or 'Qazaq', the 'Kazakh' form
is the most widespread according to online sources (Wikipedia,
LCID list from Microsoft). Also the 'Kazakh' form is preferred by a
Kazakh contributor, see
http://listarchives.libreoffice.org/global/l10n/msg05444.html
In LibreOffice both 'Kazak' and 'Kazakh' was used at different places.
Change-Id: Ief83eb05e92af16cb5b795f2bbb1e3d6f7c9659a
Reviewed-on: https://gerrit.libreoffice.org/1876
Tested-by: Eike Rathke er...@redhat.com
Reviewed-by: Eike Rathke er...@redhat.com
diff --git a/filter/source/msfilter/countryid.cxx
b/filter/source/msfilter/countryid.cxx
index 31915d3..eac02e5 100644
--- a/filter/source/msfilter/countryid.cxx
+++ b/filter/source/msfilter/countryid.cxx
@@ -84,7 +84,7 @@ static const CountryEntry pTable[] =
{ COUNTRY_CANADA, LANGUAGE_ENGLISH_CAN,
true},
{ COUNTRY_CANADA, LANGUAGE_FRENCH_CANADIAN,
true},
{ COUNTRY_RUSSIA, LANGUAGE_RUSSIAN,
false },
-{ COUNTRY_KAZAKHSTAN, LANGUAGE_KAZAK,
false },
+{ COUNTRY_KAZAKHSTAN, LANGUAGE_KAZAKH,
false },
{ COUNTRY_TATARSTAN,LANGUAGE_TATAR,
false },
{ COUNTRY_EGYPT,LANGUAGE_ARABIC_EGYPT,
true},
{ COUNTRY_SOUTH_AFRICA, LANGUAGE_AFRIKAANS,
false },
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 932f92b..dc55f3f 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -234,7 +234,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_KANURI_NIGERIA 0x0471
#define LANGUAGE_KASHMIRI 0x0460
#define LANGUAGE_KASHMIRI_INDIA 0x0860
-#define LANGUAGE_KAZAK 0x043F
+#define LANGUAGE_KAZAKH 0x043F
#define LANGUAGE_KHMER 0x0453
#define LANGUAGE_KICHE_GUATEMALA0x0486 /* AKA K'iche', West
Central Quiche, */
#define LANGUAGE_KINYARWANDA_RWANDA 0x0487 /* obsoletes
LANGUAGE_USER_KINYARWANDA 0x0621 */
diff --git a/i18npool/source/isolang/isolang.cxx
b/i18npool/source/isolang/isolang.cxx
index bbe3e0f..1ae850d 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -248,7 +248,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_BENGALI_BANGLADESH, bn, BD },
{ LANGUAGE_BENGALI, bn, IN },
{ LANGUAGE_BURMESE, my, MM },
-{ LANGUAGE_KAZAK, kk, KZ },
+{ LANGUAGE_KAZAKH, kk, KZ },
{ LANGUAGE_ENGLISH_INDIA, en, IN },
{ LANGUAGE_URDU,ur,},
{ LANGUAGE_URDU_INDIA, ur, IN },
diff --git a/i18npool/source/isolang/mslangid.cxx
b/i18npool/source/isolang/mslangid.cxx
index 2395d35..b3319aa 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.cxx
@@ -389,7 +389,7 @@ sal_Int16 MsLangId::getScriptType( LanguageType nLang )
/*
#define LANGUAGE_ARMENIAN 0x042B
#define LANGUAGE_INDONESIAN 0x0421
-#define LANGUAGE_KAZAK 0x043F
+#define LANGUAGE_KAZAKH 0x043F
#define LANGUAGE_KONKANI0x0457
#define LANGUAGE_MACEDONIAN 0x042F
#define LANGUAGE_TATAR 0x0444
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx
b/shell/source/win32/shlxthandler/util/utilities.cxx
index c62ec83..6fc7800 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -519,7 +519,7 @@ LCID LocaleSetToLCID( const LocaleSet_t Locale )
usSubLang = SUBLANG_DEFAULT; //default sub
language
}
else if ( wsLanguage == Lkk )
-usPrimaryLang = LANG_KAZAK; //Kazak
+usPrimaryLang = LANG_KAZAK; //Kazakh
else if ( wsLanguage == Lky )
usPrimaryLang = LANG_KYRGYZ; //Kyrgyz
else if
[Libreoffice-commits] .: configure.ac src/conv src/lib
configure.ac | 10 ++
src/conv/raw/Makefile.am | 10 +-
src/conv/svg/Makefile.am | 10 +-
src/lib/Makefile.am |4 ++--
4 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit 76e810ab718354fe9f246761876faff04951fc54
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Mon Jan 28 11:06:42 2013 +0100
Build cleanup
diff --git a/configure.ac b/configure.ac
index cf5d9bb..0c98560 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,14 +41,20 @@ PKG_CHECK_MODULES([WPD],[
libwpd-0.9
libwpd-stream-0.9
])
+AC_SUBST(WPD_CFLAGS)
+AC_SUBST(WPD_LIBS)
PKG_CHECK_MODULES([WPG],[
libwpg-0.2
])
+AC_SUBST(WPG_CFLAGS)
+AC_SUBST(WPG_LIBS)
PKG_CHECK_MODULES([LCMS2],[
lcms2
])
+AC_SUBST(LCMS2_CFLAGS)
+AC_SUBST(LCMS2_LIBS)
# =
# Find zlib
@@ -226,10 +232,6 @@ AS_IF([test x$enable_debug = xyes], [
], [
DEBUG_CXXFLAGS=-DNDEBUG
])
-LIBCDR_CXXFLAGS=${WPD_CFLAGS} ${WPG_CFLAGS} ${LCMS2_CFLAGS}
-LIBCDR_LIBS=${WPD_LIBS} ${WPG_LIBS} ${LCMS2_LIBS}
-AC_SUBST(LIBCDR_CXXFLAGS)
-AC_SUBST(LIBCDR_LIBS)
AC_SUBST(DEBUG_CXXFLAGS)
#
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index f67ca45..9a9cffc 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,14 +1,14 @@
bin_PROGRAMS = cdr2raw cmx2raw
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBCDR_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS)
$(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
cdr2raw_DEPENDENCIES = @CDR2RAW_WIN32_RESOURCE@
if STATIC_TOOLS
-cdr2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CDR2RAW_WIN32_RESOURCE@
+cdr2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CDR2RAW_WIN32_RESOURCE@
cdr2raw_LDFLAGS = -all-static
else
-cdr2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CDR2RAW_WIN32_RESOURCE@
+cdr2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CDR2RAW_WIN32_RESOURCE@
endif
cdr2raw_SOURCES = \
@@ -17,10 +17,10 @@ cdr2raw_SOURCES = \
cmx2raw_DEPENDENCIES = @CMX2RAW_WIN32_RESOURCE@
if STATIC_TOOLS
-cmx2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CMX2RAW_WIN32_RESOURCE@
+cmx2raw_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CMX2RAW_WIN32_RESOURCE@
cmx2raw_LDFLAGS = -all-static
else
-cmx2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CMX2RAW_WIN32_RESOURCE@
+cmx2raw_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CMX2RAW_WIN32_RESOURCE@
endif
cmx2raw_SOURCES = \
diff --git a/src/conv/svg/Makefile.am b/src/conv/svg/Makefile.am
index 0e5dfbd..6f0c65e 100644
--- a/src/conv/svg/Makefile.am
+++ b/src/conv/svg/Makefile.am
@@ -1,14 +1,14 @@
bin_PROGRAMS = cdr2xhtml cmx2xhtml
-AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
$(LIBCDR_CXXFLAGS) $(DEBUG_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib $(WPD_CFLAGS)
$(WPG_CFLAGS) $(DEBUG_CXXFLAGS)
cdr2xhtml_DEPENDENCIES = @CDR2XHTML_WIN32_RESOURCE@
if STATIC_TOOLS
-cdr2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CDR2XHTML_WIN32_RESOURCE@
+cdr2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CDR2XHTML_WIN32_RESOURCE@
cdr2xhtml_LDFLAGS = -all-static
else
-cdr2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CDR2XHTML_WIN32_RESOURCE@
+cdr2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CDR2XHTML_WIN32_RESOURCE@
endif
cdr2xhtml_SOURCES = \
@@ -17,10 +17,10 @@ cdr2xhtml_SOURCES = \
cmx2xhtml_DEPENDENCIES = @CMX2XHTML_WIN32_RESOURCE@
if STATIC_TOOLS
-cmx2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(LIBCDR_LIBS) @CMX2XHTML_WIN32_RESOURCE@
+cmx2xhtml_LDADD =
../../lib/@CDR_OBJDIR@/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.a
$(WPD_LIBS) @CMX2XHTML_WIN32_RESOURCE@
cmx2xhtml_LDFLAGS = -all-static
else
-cmx2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(LIBCDR_LIBS) @CMX2XHTML_WIN32_RESOURCE@
+cmx2xhtml_LDADD = ../../lib/libcdr-@CDR_MAJOR_VERSION@.@CDR_MINOR_VERSION@.la
$(WPD_LIBS) @CMX2XHTML_WIN32_RESOURCE@
endif
cmx2xhtml_SOURCES = \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index bff4ce3..69d7497 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -12,9 +12,9 @@
libcdr_@CDR_MAJOR_VERSION@_@CDR_MINOR_VERSION@_include_HEADERS = \
CDRStringVector.h \
CMXDocument.h
-AM_CXXFLAGS = $(LIBCDR_CXXFLAGS) $(ZLIB_CFLAGS)
[Libreoffice-commits] .: dbaccess/source
dbaccess/source/core/dataaccess/ComponentDefinition.hxx |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) New commits: commit 5a8ec562ccdc1c741ebb607e07c96e7182f147a0 Author: Noel Grandin n...@peralex.com Date: Mon Jan 28 11:50:03 2013 +0200 fdo#46808, fix calling convention Change-Id: I72b7945a6a8838e97184a27661520de55ac45e73 diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 2e39196..fa0901d 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -126,7 +126,7 @@ public: // ::com::sun::star::uno::XInterface DECLARE_XINTERFACE( ) -// ::com::sun::star::lang::XServiceInfo +// ::com::sun::star::lang::XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); @@ -136,9 +136,9 @@ public: Create(const ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext ); // XInitialization -void initialize( com::sun::star::uno::Sequence com::sun::star::uno::Any const rArguments) throw (com::sun::star::uno::Exception); +virtual void SAL_CALL initialize( com::sun::star::uno::Sequence com::sun::star::uno::Any const rArguments) throw (com::sun::star::uno::Exception); -// ::com::sun::star::beans::XPropertySet +// ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySetInfo SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // XColumnsSupplier ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/lib
src/lib/Makefile.am |3 -- src/lib/makefile.mk | 64 2 files changed, 1 insertion(+), 66 deletions(-) New commits: commit a1e065eefb22f877b231f19895c41090df4bb3f6 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 28 11:09:14 2013 +0100 no need of makefile.mk anymore diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 69d7497..5c776e2 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -64,8 +64,7 @@ endif EXTRA_DIST = \ - libcdr.rc.in \ - makefile.mk + libcdr.rc.in # These may be in the builddir too BUILD_EXTRA_DIST = \ diff --git a/src/lib/makefile.mk b/src/lib/makefile.mk deleted file mode 100644 index a087c44..000 --- a/src/lib/makefile.mk +++ /dev/null @@ -1,64 +0,0 @@ -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE - -PRJ=..$/..$/..$/..$/..$/.. - -PRJNAME=libcdr -TARGET=cdrlib -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -.INCLUDE : settings.mk - -.IF $(GUI)$(COM)==WNTMSC -CFLAGS+=-GR -.ENDIF -.IF $(COM)==GCC -CFLAGSCXX+=-frtti -.ENDIF - -.IF $(SYSTEM_LIBWPD) == YES -INCPRE+=$(WPD_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd -.ENDIF - -.IF $(SYSTEM_LIBWPG) == YES -INCPRE+=$(WPG_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg -.ENDIF - -.IF $(SYSTEM_LCMS2) == YES -INCPRE+=$(LCMS2_CFLAGS) -.ELSE -INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/lcms2 -.ENDIF - -.IF $(SYSTEM_ZLIB) != YES -INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib -.ENDIF - -SLOFILES= \ -$(SLO)$/CDRCollector.obj \ -$(SLO)$/CDRContentCollector.obj \ -$(SLO)$/CDRDocument.obj \ -$(SLO)$/CDRInternalStream.obj \ -$(SLO)$/CDROutputElementList.obj \ -$(SLO)$/CDRParser.obj \ -$(SLO)$/CDRPath.obj \ -$(SLO)$/CDRStringVector.obj \ -$(SLO)$/CDRStylesCollector.obj \ -$(SLO)$/CDRSVGGenerator.obj \ -$(SLO)$/CDRTransforms.obj \ -$(SLO)$/CDRTypes.obj \ -$(SLO)$/CDRZipStream.obj \ -$(SLO)$/CMXDocument.obj \ -$(SLO)$/CMXParser.obj \ -$(SLO)$/CommonParser.obj \ -$(SLO)$/libcdr_utils.obj - -LIB1ARCHIV=$(LB)$/libcdrlib.a -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1OBJFILES= $(SLOFILES) - -.INCLUDE : target.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b2891c46565fa9e86099bd08c48e1dd1e2e7c48c Author: Caolán McNamara caol...@redhat.com Date: Mon Jan 28 09:46:00 2013 + Updated core Project: help 8c93e652fa9becc9779172593aab5a022e5528ce diff --git a/helpcontent2 b/helpcontent2 index 803567e..8c93e65 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 803567e90d6cc046b9253e6171feebab4a43778f +Subproject commit 8c93e652fa9becc9779172593aab5a022e5528ce ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: helpers/help_hid.lst source/text
helpers/help_hid.lst|3 --- source/text/simpress/guide/table_insert.xhp |5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) New commits: commit 8c93e652fa9becc9779172593aab5a022e5528ce Author: Caolán McNamara caol...@redhat.com Date: Mon Jan 28 09:46:00 2013 + update help ids for impress table dialog .ui conversion diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index cc12fdc..7dadb69 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -8244,7 +8244,6 @@ svx_ModalDialog_RID_SVX_DLG_SHOWGRIDCOLUMNS,1368834048, svx_ModalDialog_RID_SVX_MDLG_EXTRUSION_DEPTH,1237630976, svx_ModalDialog_RID_SVX_MDLG_FONTWORK_CHARSPACING,1237893120, svx_ModalDialog_RID_SVX_MDLG_FONTWORK_GALLERY,1237614592, -svx_ModalDialog_RID_SVX_NEWTABLE_DLG,1238302720, svx_ModalDialog_RID_SVX_SPLITCELLDLG,1238286336, svx_ModelessDialog_RID_SVXDLG_IMAP,2318696448, svx_MoreButton_RID_SVXDLG_SEARCH_BTN_MORE,2311664159, @@ -8300,8 +8299,6 @@ svx_NumericField_RID_SVXPAGE_LINE_DEF_NUM_FLD_2,701569026, svx_NumericField_RID_SVXPAGE_TEXTANIMATION_NUM_FLD_COUNT,703731713, svx_NumericField_RID_SVX_DLG_INPUTRECORDNO_1,1368823809, svx_NumericField_RID_SVX_GRFFILTER_DLG_POSTER_DLG_FILTERPOSTER_NUM_POSTER,1243076610, -svx_NumericField_RID_SVX_NEWTABLE_DLG_NF_COLUMNS,1238308866, -svx_NumericField_RID_SVX_NEWTABLE_DLG_NF_ROWS,1238308868, svx_NumericField_RID_SVX_SPLITCELLDLG_ED_COUNT,1238292482, svx_PatternField_RID_SVXPAGE_INET_PROXY_ED_DNS,703288939, svx_PushButton_DLG_CHINESEDICTIONARY_PB_ADD,1078678017, diff --git a/source/text/simpress/guide/table_insert.xhp b/source/text/simpress/guide/table_insert.xhp index a33b56f..9cd7887 100644 --- a/source/text/simpress/guide/table_insert.xhp +++ b/source/text/simpress/guide/table_insert.xhp @@ -36,15 +36,16 @@ paragraph role=paragraph id=par_id4231086 xml-lang=en-US l10n=NEWYou can apply different methods to insert spreadsheet cells into your Impress slides or Draw pages:/paragraph list type=ordered listitem +bookmark xml-lang=en-US branch=hid/cui/ui/newtabledialog/NewTableDialog id=bm_id0916200804233395 localize=false/ paragraph role=paragraph id=par_id9209875 xml-lang=en-US l10n=NEWInsert a native table - you enter the data into the cells and apply fancy formatting using the Table Design section on the Tasks pane./paragraph /listitem listitem paragraph role=paragraph id=par_id3044526 xml-lang=en-US l10n=NEWInsert a new table as an OLE object or insert an existing file as an OLE object - you can specify the link to a file to be a live link to the latest data saved in a spreadsheet file./paragraph /listitem /listcommentInsert table dialog - Number of columns/comment -bookmark xml-lang=en-US branch=hid/cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS id=bm_id0916200804233391 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/newtabledialog/columns id=bm_id0916200804233391 localize=false/ paragraph role=paragraph id=par_id137333 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenEnter the number of columns for the new table./ahelp/paragraphcommentInsert table dialog - Number of rows/comment -bookmark xml-lang=en-US branch=hid/cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS id=bm_id0916200804240464 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/newtabledialog/rows id=bm_id0916200804240464 localize=false/ paragraph role=paragraph id=par_id8626667 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenEnter the number of rows for the new table./ahelp/paragraphcommentContextmenu of a table in Impress and Draw/commentcommentCell/comment bookmark xml-lang=en-US branch=hid/.uno:CellMenu id=bm_id0916200803192795 localize=false/ paragraph role=paragraph id=par_id0916200803551581 xml-lang=en-US l10n=NEWahelp hid=. visibility=hiddenDefine the vertical alignment of selected or all cell contents. Split or merge cells./ahelp/paragraph ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/lib
src/lib/Makefile.am |3 -- src/lib/makefile.mk | 56 2 files changed, 1 insertion(+), 58 deletions(-) New commits: commit 5b5ec32044798605927ae85da88f9625fcfa5e57 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 28 11:08:42 2013 +0100 no need of makefile.mk anymore diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index b932314..ec25254 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -79,8 +79,7 @@ endif EXTRA_DIST = \ - libmspub.rc.in \ - makefile.mk + libmspub.rc.in # These may be in the builddir too BUILD_EXTRA_DIST = \ diff --git a/src/lib/makefile.mk b/src/lib/makefile.mk deleted file mode 100644 index aa19c3d..000 --- a/src/lib/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -EXTERNAL_WARNINGS_NOT_ERRORS := TRUE - -PRJ=..$/..$/..$/..$/..$/.. - -PRJNAME=libmspub -TARGET=mspublib -ENABLE_EXCEPTIONS=TRUE -LIBTARGET=NO - -.INCLUDE : settings.mk - -.IF $(GUI)$(COM)==WNTMSC -CFLAGS+=-GR -.ENDIF -.IF $(COM)==GCC -CFLAGSCXX+=-frtti -.ENDIF - -.IF $(SYSTEM_LIBWPD) == YES -INCPRE+=$(WPD_CFLAGS) -I.. -.ELSE -INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpd -.ENDIF - -.IF $(SYSTEM_LIBWPG) == YES -INCPRE+=$(WPG_CFLAGS) -I.. -.ELSE -INCPRE+=$(SOLARVER)$/$(INPATH)$/inc$/libwpg -.ENDIF - -.IF $(SYSTEM_ZLIB) != YES -INCPRE+=-I$(SOLARVER)$/$(INPATH)$/inc$/external/zlib -.ENDIF - -SLOFILES= \ -$(SLO)$/ColorReference.obj \ - $(SLO)$/Dash.obj \ -$(SLO)$/Fill.obj \ -$(SLO)$/MSPUBCollector.obj \ -$(SLO)$/MSPUBDocument.obj \ -$(SLO)$/MSPUBParser2k.obj \ - $(SLO)$/MSPUBParser97.obj \ -$(SLO)$/MSPUBParser.obj \ -$(SLO)$/MSPUBStringVector.obj \ -$(SLO)$/MSPUBSVGGenerator.obj \ -$(SLO)$/PolygonUtils.obj \ - $(SLO)$/Shadow.obj \ -$(SLO)$/ShapeGroupElement.obj \ -$(SLO)$/VectorTransformation2D.obj \ -$(SLO)$/libmspub_utils.obj - -LIB1ARCHIV=$(LB)$/libmspublib.a -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1OBJFILES= $(SLOFILES) - -.INCLUDE : target.mk ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UI_cui.mk
cui/AllLangResTarget_cui.mk|1
cui/UI_cui.mk |1
cui/source/dialogs/newtabledlg.cxx | 20 +---
cui/source/dialogs/newtabledlg.hrc | 26 -
cui/source/dialogs/newtabledlg.src | 95 ---
cui/source/inc/cuires.hrc |3
cui/source/inc/newtabledlg.hxx | 11 --
cui/uiconfig/ui/newtabledialog.ui | 176 +
8 files changed, 184 insertions(+), 149 deletions(-)
New commits:
commit f99e540897103b6af3bb6b6c5a36e0a77f35b706
Author: Robert Roth robert.roth@gmail.com
Date: Sat Jan 26 03:12:50 2013 +0200
New table dialog from impress and draw converted to Glade UI
Change-Id: Iedd44ae171a25d9d6599e4f44698d7458c486be6
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index fb9c10a..8e29802 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/hyperdlg.src \
cui/source/dialogs/iconcdlg.src \
cui/source/dialogs/multipat.src \
-cui/source/dialogs/newtabledlg.src \
cui/source/dialogs/passwdomdlg.src \
cui/source/dialogs/postdlg.src \
cui/source/dialogs/scriptdlg.src \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index 9a6e896..fe4bec7 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/macroselectordialog \
cui/uiconfig/ui/messbox \
cui/uiconfig/ui/namedialog \
+ cui/uiconfig/ui/newtabledialog \
cui/uiconfig/ui/numberingformatpage \
cui/uiconfig/ui/numberingoptionspage \
cui/uiconfig/ui/numberingpositionpage \
diff --git a/cui/source/dialogs/newtabledlg.cxx
b/cui/source/dialogs/newtabledlg.cxx
index 63272c6..d9a1844 100644
--- a/cui/source/dialogs/newtabledlg.cxx
+++ b/cui/source/dialogs/newtabledlg.cxx
@@ -20,22 +20,12 @@
#include cuires.hrc
#include dialmgr.hxx
#include newtabledlg.hxx
-#include newtabledlg.hrc
SvxNewTableDialog::SvxNewTableDialog( Window* pParent )
-: ModalDialog( pParent, CUI_RES( RID_SVX_NEWTABLE_DLG ) )
-, maFtColumns( this, CUI_RES( FT_COLUMNS ) )
-, maNumColumns( this, CUI_RES( NF_COLUMNS ) )
-, maFtRows( this, CUI_RES( FT_ROWS ) )
-, maNumRows( this, CUI_RES( NF_ROWS ) )
-, maFlSep( this, CUI_RES( FL_SEP ) )
-, maHelpButton( this, CUI_RES( BTN_HELP ) )
-, maOkButton( this, CUI_RES( BTN_OK ) )
-, maCancelButton( this, CUI_RES( BTN_CANCEL ) )
+: ModalDialog( pParent, NewTableDialog, cui/ui/newtabledialog.ui )
{
-maNumRows.SetValue(2);
-maNumColumns.SetValue(5);
-FreeResource();
+get(mpNumRows, rows);
+get(mpNumColumns, columns);
}
short SvxNewTableDialog::Execute(void)
@@ -49,12 +39,12 @@ void SvxNewTableDialog::Apply(void)
sal_Int32 SvxNewTableDialog::getRows() const
{
-return sal::static_int_cast sal_Int32 ( maNumRows.GetValue() );
+return sal::static_int_cast sal_Int32 ( mpNumRows-GetValue() );
}
sal_Int32 SvxNewTableDialog::getColumns() const
{
-return sal::static_int_cast sal_Int32 ( maNumColumns.GetValue() );
+return sal::static_int_cast sal_Int32 ( mpNumColumns-GetValue() );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/dialogs/newtabledlg.hrc
b/cui/source/dialogs/newtabledlg.hrc
deleted file mode 100644
index 3def9e7..000
--- a/cui/source/dialogs/newtabledlg.hrc
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define FT_COLUMNS 1
-#define NF_COLUMNS 2
-#define FT_ROWS 3
-#define NF_ROWS 4
-#define FL_SEP 5
-#define BTN_HELP 6
-#define BTN_OK 7
-#define BTN_CANCEL 8
diff --git a/cui/source/dialogs/newtabledlg.src
b/cui/source/dialogs/newtabledlg.src
deleted file mode 100644
index 19ae6bd..000
--- a/cui/source/dialogs/newtabledlg.src
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following
[Gerrit Code Review] Email Verification
Welcome to Gerrit Code Review at gerrit.libreoffice.org. To add a verified email address to your user account, please click on the following link while signed in as libreoffice buildbot2 lobuildb...@gmail.com: https://gerrit.libreoffice.org/#/VE/XIX6sEyxjAJsYEfg21MvLKzcZCHQLbyYyEEWoA==$MTAwMDAxODpsaWJyZW9mZmljZUBsaXN0cy5mcmVlZGVza3RvcC5vcmc= If you have received this mail in error, you do not need to take any action to cancel the account. The address will not be activated, and you will not receive any further emails. If clicking the link above does not work, copy and paste the URL in a new browser window instead. This is a send-only email address. Replies to this message will not be read or answered. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source slideshow/source
sd/source/ui/remotecontrol/Communicator.cxx |2 -
sd/source/ui/remotecontrol/ImagePreparer.cxx | 35 +++
sd/source/ui/remotecontrol/ImagePreparer.hxx | 10 +++
sd/source/ui/remotecontrol/Listener.cxx |9 --
sd/source/ui/remotecontrol/Receiver.cxx | 24 +-
sd/source/ui/remotecontrol/Receiver.hxx | 10 ++-
slideshow/source/engine/slideshowimpl.cxx|6 +++-
7 files changed, 62 insertions(+), 34 deletions(-)
New commits:
commit 58b05ce98e72fe47bdca02d2dabea20c36a494bf
Author: Michael Meeks michael.me...@suse.com
Date: Mon Jan 28 20:03:20 2013 +1100
fdo#59881 - sdremote: give up on threaded / UNO usage.
Process incoming commands in the main thread in a Timeout, build
thumbnail / previews there too - to avoid the deadlocks mentioned
in the bug.
Change-Id: I5f5e8d6fbc2e059d4194f72f3e086e1aa87ab2cc
diff --git a/sd/source/ui/remotecontrol/Communicator.cxx
b/sd/source/ui/remotecontrol/Communicator.cxx
index ebe5627..84467da 100644
--- a/sd/source/ui/remotecontrol/Communicator.cxx
+++ b/sd/source/ui/remotecontrol/Communicator.cxx
@@ -79,7 +79,7 @@ void Communicator::execute()
}
else
{
-aReceiver.parseCommand( aCommand );
+aReceiver.pushCommand( aCommand );
aCommand.clear();
}
}
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx
b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 66b2791..b81b3ab 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -50,36 +50,31 @@ ImagePreparer::ImagePreparer(
: xController( rxController ),
pTransmitter( aTransmitter )
{
+SetTimeout( 50 );
+mnSendingSlide = 0;
+Start();
}
ImagePreparer::~ImagePreparer()
{
+Stop();
}
-void SAL_CALL ImagePreparer::run()
+void SAL_CALL ImagePreparer::Timeout()
{
sal_uInt32 aSlides = xController-getSlideCount();
-for ( sal_uInt32 i = 0; i aSlides; i++ )
+//fprintf( stderr, ImagePreparer: %d %d %d\n, xController-isRunning(),
+// (int)mnSendingSlide, (int)aSlides);
+if ( xController-isRunning() // not stopped/disposed of.
+ mnSendingSlide aSlides )
{
-if ( !xController-isRunning() ) // stopped/disposed of.
-{
-break;
-}
-sendPreview( i );
-}
-for ( sal_uInt32 i = 0; i aSlides; i++ )
-{
-if ( !xController-isRunning() ) // stopped/disposed of.
-{
-break;
-}
-sendNotes( i );
+sendPreview( mnSendingSlide );
+sendNotes( mnSendingSlide );
+mnSendingSlide++;
+Start();
}
-}
-
-void SAL_CALL ImagePreparer::onTerminated()
-{
-delete this;
+else
+Stop();
}
void ImagePreparer::sendPreview( sal_uInt32 aSlideNumber )
diff --git a/sd/source/ui/remotecontrol/ImagePreparer.hxx
b/sd/source/ui/remotecontrol/ImagePreparer.hxx
index aa013d7..66b30ae 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.hxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.hxx
@@ -10,7 +10,7 @@
#define _SD_IMPRESSREMOTE_IMAGEPREPARER_HXX
#include osl/thread.hxx
-
+#include vcl/timer.hxx
#include com/sun/star/presentation/XSlideShowController.hpp
#include Transmitter.hxx
@@ -18,9 +18,9 @@
namespace sd
{
-class ImagePreparer:
-public osl::Thread
+class ImagePreparer : Timer
{
+sal_uInt32 mnSendingSlide;
public:
ImagePreparer( const
css::uno::Referencecss::presentation::XSlideShowController
@@ -31,9 +31,7 @@ private:
css::uno::Referencecss::presentation::XSlideShowController xController;
Transmitter *pTransmitter;
-// Thread method
-virtual void SAL_CALL run();
-virtual void SAL_CALL onTerminated();
+virtual void Timeout();
void sendPreview( sal_uInt32 aSlideNumber );
css::uno::Sequencesal_Int8 preparePreview( sal_uInt32 aSlideNumber,
diff --git a/sd/source/ui/remotecontrol/Listener.cxx
b/sd/source/ui/remotecontrol/Listener.cxx
index 30b29a9..2052fbf 100644
--- a/sd/source/ui/remotecontrol/Listener.cxx
+++ b/sd/source/ui/remotecontrol/Listener.cxx
@@ -10,12 +10,13 @@
#include comphelper/processfactory.hxx
#include com/sun/star/presentation/XPresentationSupplier.hpp
#include com/sun/star/presentation/XPresentation2.hpp
-
#include rtl/strbuf.hxx
+#include vcl/svapp.hxx
#include Listener.hxx
#include ImagePreparer.hxx
+
using namespace sd;
using namespace ::com::sun::star::presentation;
using namespace ::com::sun::star::frame;
@@ -53,8 +54,10 @@ void Listener::init( const css::uno::Reference
css::presentation::XSlideShowCon
pTransmitter-addMessage( aBuffer.makeStringAndClear(),
Transmitter::PRIORITY_HIGH );
-ImagePreparer* pPreparer = new ImagePreparer( aController,
pTransmitter );
-pPreparer-create();
+{
+SolarMutexGuard aGuard;
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - sfx2/AllLangResTarget_sfx2.mk
sfx2/AllLangResTarget_sfx2.mk |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit acfe89c5a5b9d5d322b86df3858b6ca920ab52e7 Author: Andras Timar ati...@suse.com Date: Sat Jan 26 21:46:28 2013 +0100 sfx2/source/control/templateview.src is localizable Change-Id: Ic21abffa3a889b96e2ce03c9ad997b3924133e66 Reviewed-on: https://gerrit.libreoffice.org/1882 Reviewed-by: Eike Rathke er...@redhat.com Tested-by: Eike Rathke er...@redhat.com Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk index 63a2d3a..10c0639 100644 --- a/sfx2/AllLangResTarget_sfx2.mk +++ b/sfx2/AllLangResTarget_sfx2.mk @@ -48,6 +48,7 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/appl/sfx.src \ sfx2/source/bastyp/bastyp.src \ sfx2/source/bastyp/fltfnc.src \ +sfx2/source/control/templateview.src \ sfx2/source/dialog/alienwarn.src \ sfx2/source/dialog/dialog.src \ sfx2/source/dialog/dinfdlg.src \ @@ -77,8 +78,4 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\ sfx2/source/view/view.src \ )) -$(eval $(call gb_SrsTarget_add_nonlocalized_files,sfx/res,\ -sfx2/source/control/templateview.src \ -)) - # vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-ux-advise] LATE FEATURE: Personas in LibreOffice
Hi Astron, Stefan Knorr (Astron) píše v Čt 24. 01. 2013 v 17:28 +0100: So, this leads me to believe that we're best of just removing the background images feature from 4.0. I believe I've removed this already for RC1: http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=d8e1fed0f6f83d03a5075cfe3c0c6b10a7d4e167 It is still there in master though, so that I can continue on that there at some stage; are you seeing it in the 4.0 RC1 or later builds, please? Again, this is now a feature for after 4.0. Yes - might be good to create a Whiteboard for that, maybe? All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source desktop/unx desktop/win32
desktop/source/app/officeipcthread.cxx | 40 +-
desktop/source/app/officeipcthread.hxx |2
desktop/unx/source/start.c | 17 -
desktop/win32/source/officeloader/officeloader.cxx | 60 -
4 files changed, 88 insertions(+), 31 deletions(-)
New commits:
commit 92e762d0fa56b1c10472f75eec499eabc3ae6ed9
Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com
Date: Tue Nov 20 11:03:03 2012 +0100
startup: more reliable startup of multiple instances
Until now, when a new soffice instance (S2) started and tried to
connect to an existing soffice process (S1), S2 may have failed to
boostrap due to race condition in communication over the shared pipe.
S1 can be shutdown after S2 connected to it but _before_ S1 handled its
arguments (code run after 'accept' method in OfficeIPCThread).
This patch introduces a new message, sent by the main soffice after it
has called accept if and only if it's not shutting down (see mbDowning
member).
The other soffice waits for this message before enabling going in
PIPE_CONNECTED mode. If soffice fails to receive this message, pipe mode is
left unchanged and after a quick pause, it will try again.
Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62
Signed-off-by: Stephan Bergmann sberg...@redhat.com
(cherry picked from commit 0dce7eae55bf90d2a7171a1fb8663d66ba4ac6d3)
(cherry picked from commit 8376da60d5d272cf6b3ebee91934bbcd970c7658)
Reviewed-on: https://gerrit.libreoffice.org/1733
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index b9ede23..452a3b5 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -66,6 +66,8 @@ const char *OfficeIPCThread::sc_aShowSequence = -tofront;
const int OfficeIPCThread::sc_nShSeqLength = 5;
const char *OfficeIPCThread::sc_aConfirmationSequence =
InternalIPC::ProcessingDone;
const int OfficeIPCThread::sc_nCSeqLength = 27;
+const char *OfficeIPCThread::sc_aSendArgumentsSequence =
InternalIPC::SendArguments;
+const int OfficeIPCThread::sc_nCSASeqLength = 26;
namespace { static char const ARGUMENT_PREFIX[] = InternalIPC::Arguments; }
@@ -506,8 +508,31 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
}
else if( pThread-maPipe.create( pThread-maPipeIdent.getStr(),
osl_Pipe_OPEN, rSecurity )) // Creation not successfull, now we try to connect
{
-// Pipe connected to first office
-nPipeMode = PIPEMODE_CONNECTED;
+osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
+char pReceiveBuffer[sc_nCSASeqLength + 1];
+int nResult = 0;
+int nBytes = 0;
+int nBufSz = sc_nCSASeqLength + 1;
+// read byte per byte
+while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
nBufSz-nBytes))0) {
+nBytes += nResult;
+if (pReceiveBuffer[nBytes-1]=='\0') {
+break;
+}
+}
+if (rtl::OString(sc_aSendArgumentsSequence).equals(pReceiveBuffer))
+{
+// Pipe connected to first office
+nPipeMode = PIPEMODE_CONNECTED;
+}
+else
+{
+// Pipe connection failed (other office exited or crashed)
+TimeValue tval;
+tval.Seconds = 0;
+tval.Nanosec = 5;
+salhelper::Thread::wait( tval );
+}
}
else
{
@@ -661,6 +686,17 @@ void OfficeIPCThread::execute()
// down during wait
osl::ClearableMutexGuard aGuard( GetMutex() );
+if (!mbDowning)
+{
+// notify client we're ready to process its args
+int nBytes = 0;
+int nResult = 0;
+while (
+(nResult =
maStreamPipe.send(sc_aSendArgumentsSequence+nBytes, sc_nCSASeqLength-nBytes))0
+((nBytes += nResult) sc_nCSASeqLength) ) ;
+}
+maStreamPipe.write(\0, 1);
+
// test byte by byte
const int nBufSz = 2048;
char pBuf[nBufSz];
diff --git a/desktop/source/app/officeipcthread.hxx
b/desktop/source/app/officeipcthread.hxx
index f60a134..ba40b57 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -103,6 +103,8 @@ class OfficeIPCThread : public salhelper::Thread
static const int sc_nShSeqLength;
static const char *sc_aConfirmationSequence;
static const int sc_nCSeqLength;
+static const char *sc_aSendArgumentsSequence;
+static const int
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - desktop/source
desktop/source/app/officeipcthread.cxx | 54 ++---
desktop/source/app/officeipcthread.hxx |1
2 files changed, 23 insertions(+), 32 deletions(-)
New commits:
commit c99b59c842167a3151d760bf424b4df7491aa101
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Dec 13 15:41:10 2012 +0100
Related fdo#33484: Terminate OfficeIPCThread by closing the accepting pipe
... (and setting mbDowning to indicate an error returned from accept() is
due to
termination) instead of setting up an extra pipe connection to send an
InternalIPC::TerminateThread message (which allegedly caused deadlocks,
see
https://gerrit.libreoffice.org/#/c/1311/ Change Idf933915: office ipc:
use
timeout pipe feature when connecting to self).
(cherry picked from commit 4ce2602befd59e69264d8e4ced8730b40c2b947c)
Conflicts:
desktop/source/app/officeipcthread.cxx
desktop/source/app/officeipcthread.hxx
(cherry picked from commit 6527b8a135c20e223a6fcf7c49835205a99ff02a)
Change-Id: Id302ca13112fc409685e7665b38f1030704a0ccf
Reviewed-on: https://gerrit.libreoffice.org/1734
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx
index 452a3b5..1d37ee0 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -60,8 +60,6 @@ using ::rtl::OString;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
-const char *OfficeIPCThread::sc_aTerminationSequence =
InternalIPC::TerminateThread;
-const int OfficeIPCThread::sc_nTSeqLength = 28;
const char *OfficeIPCThread::sc_aShowSequence = -tofront;
const int OfficeIPCThread::sc_nShSeqLength = 5;
const char *OfficeIPCThread::sc_aConfirmationSequence =
InternalIPC::ProcessingDone;
@@ -436,8 +434,6 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
rtl::Reference OfficeIPCThread pThread(new OfficeIPCThread);
-pThread-maPipeIdent = OUString( SingleOfficeIPC_ );
-
// The name of the named pipe is created with the hashcode of the user
installation directory (without /user). We have to retrieve
// this information from a unotools implementation.
::utl::Bootstrap::PathStatus aLocateResult =
::utl::Bootstrap::locateUserInstallation( aUserInstallPath );
@@ -494,19 +490,19 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread()
if ( aUserInstallPathHashCode.isEmpty() )
return IPC_STATUS_BOOTSTRAP_ERROR; // Something completely broken, we
cannot create a valid hash code!
-pThread-maPipeIdent = pThread-maPipeIdent + aUserInstallPathHashCode;
+OUString aPipeIdent( SingleOfficeIPC_ + aUserInstallPathHashCode );
PipeMode nPipeMode = PIPEMODE_DONTKNOW;
do
{
osl::Security rSecurity = Security::get();
// Try to create pipe
-if ( pThread-maPipe.create( pThread-maPipeIdent.getStr(),
osl_Pipe_CREATE, rSecurity ))
+if ( pThread-maPipe.create( aPipeIdent.getStr(), osl_Pipe_CREATE,
rSecurity ))
{
// Pipe created
nPipeMode = PIPEMODE_CREATED;
}
-else if( pThread-maPipe.create( pThread-maPipeIdent.getStr(),
osl_Pipe_OPEN, rSecurity )) // Creation not successfull, now we try to connect
+else if( pThread-maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN,
rSecurity )) // Creation not successfull, now we try to connect
{
osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
char pReceiveBuffer[sc_nCSASeqLength + 1];
@@ -610,18 +606,8 @@ void OfficeIPCThread::DisableOfficeIPCThread()
pGlobalOfficeIPCThread);
pGlobalOfficeIPCThread.clear();
-// send thread a termination message
-// this is done so the subsequent join will not hang
-// because the thread hangs in accept of pipe
-osl::StreamPipe aPipe ( pOfficeIPCThread-maPipeIdent, osl_Pipe_OPEN,
Security::get() );
-if (aPipe.is())
-{
-aPipe.send( sc_aTerminationSequence, sc_nTSeqLength+1 ); // also
send 0-byte
-
-// close the pipe so that the streampipe on the other
-// side produces EOF
-aPipe.close();
-}
+pOfficeIPCThread-mbDowning = true;
+pOfficeIPCThread-maPipe.close();
// release mutex to avoid deadlocks
aMutex.clear();
@@ -686,22 +672,23 @@ void OfficeIPCThread::execute()
// down during wait
osl::ClearableMutexGuard aGuard( GetMutex() );
-if (!mbDowning)
+if ( mbDowning )
{
-// notify client we're ready to process its args
-int nBytes = 0;
-int nResult = 0;
-while (
-(nResult =
maStreamPipe.send(sc_aSendArgumentsSequence+nBytes,
Re: Issues building LibreOffice 4.0.0.1
On 01/25/2013 07:26 PM, Henrik /KaarPoSoft wrote:
However, it is still strange that I got the salhelper problem
in the first place, and apparently nobody else does.
And why are nobody else seeing the abovementioned multiple definition
problem?
I certainly will not rule out problems in my build environment as
KaarPux http://kaarpux.kaarposoft.dk/ is my own creation.
However, I have build some 500 packages in this environment, and
things like linux kernel, gnome3, and firefox work like a charm,
as does LO 3.6.2.1
Yeah, there must be something hidden in your platform that would explain
the linker problems and the odd truncation of pathnames seen with
strace. However, nothing springs to the eye when comparing your gcc
configurations with what I have here on Fedora 18, see below. I'm
afraid you're on your own tracking down what makes your platform behave
so oddly when building LO.
$ gcc -v
Using built-in specs.
COLLECT_GCC=/usr/bin/gcc
COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.7.2/lto-wrapper
Target: x86_64-redhat-linux
Configured with: ../configure --prefix=/usr --mandir=/usr/share/man
--infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla
--enable-bootstrap --enable-shared --enable-threads=posix
--enable-checking=release --disable-build-with-cxx
--disable-build-poststage1-with-cxx --with-system-zlib --enable-__cxa_atexit
--disable-libunwind-exceptions --enable-gnu-unique-object
--enable-linker-build-id --with-linker-hash-style=gnu
--enable-languages=c,c++,objc,obj-c++,java,fortran,ada,go,lto --enable-plugin
--enable-initfini-array --enable-java-awt=gtk --disable-dssi
--with-java-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre
--enable-libgcj-multifile --enable-java-maintainer-mode
--with-ecj-jar=/usr/share/java/eclipse-ecj.jar --disable-libjava-multilib
--with-ppl --with-cloog --with-tune=generic --with-arch_32=i686
--build=x86_64-redhat-linux
Thread model: posix
gcc version 4.7.2 20121109 (Red Hat 4.7.2-8) (GCC)
$ diff -u gcc_dumpspecs.txt (gcc -dumpspecs)
--- gcc_dumpspecs.txt 2013-01-28 11:29:09.115663835 +0100
+++ /dev/fd/63 2013-01-28 11:35:06.640228079 +0100
@@ -1,4 +1,3 @@
-gcc -dumpspecs
*asm:
%{m32:--32} %{m32|mx32:;:--64} %{mx32:--x32}
%{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}
@@ -49,7 +48,7 @@
%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s}
%{mpc32:crtprec32.o%s}%{mpc64:crtprec64.o%s}%{mpc80:crtprec80.o%s}
%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s
*link:
-%{!static:--eh-frame-hdr} %{m32|mx32:;:-m elf_x86_64}
%{m32:-m elf_i386}%{mx32:-m elf32_x86_64}
%{shared:-shared} %{!shared: %{!static: %{rdynamic:-export-dynamic}
%{m32:-dynamic-linker
%{muclibc:/lib/ld-uClibc.so.0;:%{mbionic:/system/bin/linker;:/lib/ld-linux.so.2}}}
%{m32|mx32:;:-dynamic-linker
%{muclibc:/lib/ld64-uClibc.so.0;:%{mbionic:/system/bin/linker64;:/lib64/ld-linux-x86-64.so.2}}}
%{mx32:-dynamic-linker
%{muclibc:/lib/ldx32-uClibc.so.0;:%{mbionic:/system/bin/linkerx32;:/libx32/ld-linux-x32.so.2
%{static:-static}}
+%{!r:--build-id} --no-add-needed %{!static:--eh-frame-hdr} --hash-style=gnu
%{m32|mx32:;:-m elf_x86_64}%{m32:-m elf_i386}
%{mx32:-m elf32_x86_64} %{shared:-shared} %{!shared: %{!static:
%{rdynamic:-export-dynamic} %{m32:-dynamic-linker
%{muclibc:/lib/ld-uClibc.so.0;:%{mbionic:/system/bin/linker;:/lib/ld-linux.so.2}}}
%{m32|mx32:;:-dynamic-linker
%{muclibc:/lib/ld64-uClibc.so.0;:%{mbionic:/system/bin/linker64;:/lib64/ld-linux-x86-64.so.2}}}
%{mx32:-dynamic-linker
%{muclibc:/lib/ldx32-uClibc.so.0;:%{mbionic:/system/bin/linkerx32;:/libx32/ld-linux-x32.so.2
%{static:-static}}
*lib:
%{pthread:-lpthread}%{shared:-lc}%{!shared:%{mieee-fp:-lieee}
%{profile:-lc_p}%{!profile:-lc}}
@@ -76,7 +75,7 @@
4.7.2
*multilib:
-. !m64 !m32;.:../lib64 m64 !m32;.:../lib !m64 m32;
+. !m64 !m32;64:../lib64 m64 !m32;32:../lib !m64 m32;
*multilib_defaults:
m64
@@ -138,4 +137,3 @@
*link_command:
%{!fsyntax-only:%{!c:%{!M:%{!MM:%{!E:%{!S:%(linker)
%{!fno-use-linker-plugin:%{flto|flto=*|fuse-linker-plugin: -plugin
%(linker_plugin_file) -plugin-opt=%(lto_wrapper)
-plugin-opt=-fresolution=%u.res
%{!nostdlib:%{!nodefaultlibs:%:pass-through-libs(%(link_gcc_c_sequence))}}
}}%{flto|flto=*:%fcompare-debug*} %{flto} %{flto=*} %l %{pie:-pie} %X
%{o*} %{e*} %{N} %{n} %{r}%{s} %{t} %{u*} %{z} %{Z}
%{!nostdlib:%{!nostartfiles:%S}}%{static:} %{L*} %(mfwrap) %(link_libgcc) %o
%{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}
%{fgnu-tm:%:include(libitm.spec)%(link_itm)}%(mflib) %{fsplit-stack:
--wrap=pthread_create}%{fprofile-arcs|fprofile-generate*|coverage:-lgcov}
%{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}
[REVIEW 4-0, 4-0-0] ... sdremote foo ...
Hi guys, I hate to do this at this stage, but - what is there makes the horrible naive assumption (in two different ways) that UNO + threading has a change of working ;- [ and of course, it does as long as we only use it really lightly and do just one thing at a time ;-]. Anyhow this: http://cgit.freedesktop.org/libreoffice/core/commit/?id=58b05ce98e72fe47bdca02d2dabea20c36a494bf Turns some of the problematic threading: that I've seen wedge your impress as you're presenting - into timeout methods: of course, no doubt these can hurt interactivity, but it won't be worse than deadlocking / threading (I suspect). I'd love to see it in -4-0 and -4-0-0 if possible; ideally tested on Windows too ... Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-6]: startup: more reliable startup of multiple instances
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1733 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1733 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e099a5804e1e8dd535cfd31ef454cffa44efa62 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-6]: Related fdo#33484: Terminate OfficeIPCThread by closing the ...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1734 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1734 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id302ca13112fc409685e7665b38f1030704a0ccf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Noel Power noel.po...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Review 4-0, 4-0-0] New artwork for LibreOffice 4.0
Hello, Le lundi 28 janvier 2013 à 11:10 +0100, Stefan Knorr a écrit : Hello all, please consider https://gerrit.libreoffice.org/#/c/1891/ for inclusion in 4.0.0. It contains the new splash screen, About dialogue banner Start Centre banner (Community edition without TDF byline in the logo). Note that it does not include matching Windows installer background images, though. It should be possible to fix that in the 4.0.1 timeframe at least. Thanks, Astron. PS: all splash screens under discussion were posted here: https://wiki.documentfoundation.org/Design/Whiteboards/4.0_Branding Please DON'T INCLUDE THIS JUST YET. Check the Board mailing list (email coming up). Thanks, -- Charles-H. Schulz Co-Founder Director, The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a7240be2701c411e027f5cd2ed75c7adcefe32d9 Author: Andras Timar ati...@suse.com Date: Mon Jan 28 11:56:26 2013 +0100 Updated core Project: translations e2c9c9c88965c932ff72912d2489249e3a61e37c diff --git a/translations b/translations index a9e6547..e2c9c9c 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit a9e6547e0c1690c44a39fad8e5f8fe4890760fa4 +Subproject commit e2c9c9c88965c932ff72912d2489249e3a61e37c ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - source/af source/am source/an source/ar source/as source/ast source/be source/bg source/bn source/bn-IN source/bo source/br source/brx source/bs sou
source/af/svtools/source/misc.po|4 ++-- source/am/svtools/source/misc.po|4 ++-- source/an/svtools/source/misc.po|4 ++-- source/ar/svtools/source/misc.po|4 ++-- source/as/svtools/source/misc.po|4 ++-- source/ast/svtools/source/misc.po |4 ++-- source/be/svtools/source/misc.po|4 ++-- source/bg/svtools/source/misc.po|4 ++-- source/bn-IN/svtools/source/misc.po |4 ++-- source/bn/svtools/source/misc.po|4 ++-- source/bo/svtools/source/misc.po|4 ++-- source/br/svtools/source/misc.po|4 ++-- source/brx/svtools/source/misc.po |4 ++-- source/bs/svtools/source/misc.po|4 ++-- source/ca-XV/svtools/source/misc.po |4 ++-- source/ca/svtools/source/misc.po|4 ++-- source/cs/svtools/source/misc.po|4 ++-- source/cy/svtools/source/misc.po|4 ++-- source/da/svtools/source/misc.po|4 ++-- source/de/svtools/source/misc.po|4 ++-- source/dgo/svtools/source/misc.po |4 ++-- source/dz/svtools/source/misc.po|4 ++-- source/el/svtools/source/misc.po|4 ++-- source/en-GB/svtools/source/misc.po |4 ++-- source/en-ZA/svtools/source/misc.po |4 ++-- source/eo/svtools/source/misc.po|4 ++-- source/es/svtools/source/misc.po|4 ++-- source/et/svtools/source/misc.po|4 ++-- source/eu/svtools/source/misc.po|4 ++-- source/fa/svtools/source/misc.po|4 ++-- source/fi/svtools/source/misc.po|4 ++-- source/fr/svtools/source/misc.po|4 ++-- source/ga/svtools/source/misc.po|4 ++-- source/gd/svtools/source/misc.po|4 ++-- source/gl/svtools/source/misc.po|4 ++-- source/gu/svtools/source/misc.po|4 ++-- source/he/svtools/source/misc.po|4 ++-- source/hi/svtools/source/misc.po|4 ++-- source/hr/svtools/source/misc.po|4 ++-- source/hu/svtools/source/misc.po|4 ++-- source/id/svtools/source/misc.po|4 ++-- source/is/svtools/source/misc.po|4 ++-- source/it/svtools/source/misc.po|4 ++-- source/ja/svtools/source/misc.po|4 ++-- source/ka/svtools/source/misc.po|4 ++-- source/kk/svtools/source/misc.po|4 ++-- source/kl/svtools/source/misc.po|4 ++-- source/km/svtools/source/misc.po|4 ++-- source/kn/svtools/source/misc.po|4 ++-- source/ko/svtools/source/misc.po|4 ++-- source/kok/svtools/source/misc.po |4 ++-- source/ks/svtools/source/misc.po|4 ++-- source/ku/svtools/source/misc.po|4 ++-- source/ky/svtools/source/misc.po|4 ++-- source/lb/svtools/source/misc.po|4 ++-- source/lo/svtools/source/misc.po|4 ++-- source/lt/svtools/source/misc.po|4 ++-- source/lv/svtools/source/misc.po|4 ++-- source/mai/svtools/source/misc.po |4 ++-- source/mk/svtools/source/misc.po|4 ++-- source/ml/svtools/source/misc.po|4 ++-- source/mn/svtools/source/misc.po|4 ++-- source/mni/svtools/source/misc.po |4 ++-- source/mr/svtools/source/misc.po|4 ++-- source/my/svtools/source/misc.po|4 ++-- source/nb/svtools/source/misc.po|4 ++-- source/ne/svtools/source/misc.po|4 ++-- source/nl/svtools/source/misc.po|4 ++-- source/nn/svtools/source/misc.po|4 ++-- source/nr/svtools/source/misc.po|4 ++-- source/nso/svtools/source/misc.po |4 ++-- source/oc/svtools/source/misc.po|4 ++-- source/om/svtools/source/misc.po|4 ++-- source/or/svtools/source/misc.po|4 ++-- source/pa-IN/svtools/source/misc.po |4 ++-- source/pl/svtools/source/misc.po|4 ++-- source/pt-BR/svtools/source/misc.po |4 ++-- source/pt/svtools/source/misc.po|4 ++-- source/ro/svtools/source/misc.po|4 ++-- source/ru/svtools/source/misc.po|4 ++-- source/rw/svtools/source/misc.po|4 ++-- source/sa-IN/svtools/source/misc.po |4 ++-- source/sat/svtools/source/misc.po |4 ++-- source/sd/svtools/source/misc.po|4 ++-- source/sh/svtools/source/misc.po|4 ++-- source/si/svtools/source/misc.po|4 ++-- source/sid/svtools/source/misc.po |4 ++-- source/sk/svtools/source/misc.po|4 ++-- source/sl/svtools/source/misc.po|4 ++-- source/sq/svtools/source/misc.po|4 ++-- source/sr/svtools/source/misc.po|4 ++-- source/ss/svtools/source/misc.po|4 ++-- source/st/svtools/source/misc.po|4 ++-- source/sv/svtools/source/misc.po|4 ++-- source/sw-TZ/svtools/source/misc.po |4 ++-- source/ta/svtools/source/misc.po|4 ++-- source/te/svtools/source/misc.po|4 ++-- source/tg/svtools/source/misc.po|4 ++-- source/th/svtools/source/misc.po|4 ++-- source/tn/svtools/source/misc.po|4 ++-- source/tr/svtools/source/misc.po|4 ++-- source/ts/svtools/source/misc.po|4 ++--
[Libreoffice-commits] .: svx/source
svx/source/dialog/docrecovery.cxx |2 +- svx/source/inc/docrecovery.hxx|2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit ffce5ac51518bbd43ac0ae14dbb0967ae2c50bb4 Author: Caolán McNamara caol...@redhat.com Date: Mon Jan 28 10:55:10 2013 + Resolves: fdo#59965 crash dialog title area text is missing Change-Id: I19adc5047d744acee243c94ff4e31531ae8c458a diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 277d9ec..dfe9aee 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -727,8 +727,8 @@ void SAL_CALL PluginProgress::reset() SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent, SVX_RES( RID_SVXPAGE_DOCRECOVERY_SAVE ) ) -, m_aTitleWin( this , SVX_RES ( WIN_SAVE_TITLE ) ) , m_aTitleFT ( this , SVX_RES ( FT_SAVE_TITLE ) ) +, m_aTitleWin( this , SVX_RES ( WIN_SAVE_TITLE ) ) , m_aTitleFL ( this , SVX_RES ( FL_SAVE_TITLE ) ) , m_aDescrFT ( this , SVX_RES ( FT_SAVE_DESCR ) ) , m_aFileListFT ( this , SVX_RES ( FT_SAVE_FILELIST) ) diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 5140d55..af39887 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -440,8 +440,8 @@ class SaveDialog : public IExtendedTabPage // member private: -Window m_aTitleWin; FixedText m_aTitleFT; +Window m_aTitleWin; FixedLine m_aTitleFL; FixedText m_aDescrFT; FixedText m_aFileListFT; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - desktop/source
desktop/source/migration/migration.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4615ff90bd09ea02aff7a4952f1eb5cf9307375e
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Jan 25 18:30:23 2013 +0100
fdo#57061: Use a new MIGRATION4 flag file for profile migration LO 3 - 4
...to avoid missing migrations on Windows and Mac OS X, where existing 3
user
profiles got the MIGRATED flag file erroneously added when running LO 3
already, presumably due to 6b522673373797bbf53d795d53e0ec45175a5d67 default
config location has changed, look in old config dir when migrating.
(cherry picked from commit 67d23e3a99bbaaa5a4dff1f8f3a10bd8abd198fb)
Conflicts:
desktop/source/migration/migration.cxx
Change-Id: I8dd50a36450c167d47411834cc06a754affadf6d
Reviewed-on: https://gerrit.libreoffice.org/1868
Reviewed-by: Eike Rathke er...@redhat.com
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/desktop/source/migration/migration.cxx
b/desktop/source/migration/migration.cxx
index 1b4115a..f56fd24 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -169,7 +169,7 @@ static const char ITEM_DESCRIPTOR_LABEL[] = Label;
bool MigrationImpl::alreadyMigrated()
{
-rtl::OUString
MIGRATION_STAMP_NAME(RTL_CONSTASCII_USTRINGPARAM(/MIGRATED));
+rtl::OUString
MIGRATION_STAMP_NAME(RTL_CONSTASCII_USTRINGPARAM(/MIGRATED4));
rtl::OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME;
File aFile(aStr);
// create migration stamp, and/or check its existence
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libmspub/ExternalProject_libmspub.mk
libmspub/ExternalProject_libmspub.mk |5 + 1 file changed, 5 insertions(+) New commits: commit 61ab813abf4d2b1d02987535c5920d0328422203 Author: Caolán McNamara caol...@redhat.com Date: Mon Jan 28 11:08:27 2013 + add boost dependency and header-finding hackery to libmspub Change-Id: I5206cb1719164c6adc0dee46db40a8a63a45c19b diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index a971b75..ecd4610 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,libmspub,\ )) $(eval $(call gb_ExternalProject_use_externals,libmspub,\ + boost_headers \ icu \ wpd \ wpg \ @@ -26,6 +27,7 @@ ifeq ($(OS)$(COM),WNTMSC) ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libmspub,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ +export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ @@ -35,6 +37,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : else ifeq ($(VCVER),100) $(call gb_ExternalProject_get_state_target,libmspub,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ +export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ @@ -44,6 +47,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : else $(call gb_ExternalProject_get_state_target,libmspub,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ +export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \ export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ @@ -67,6 +71,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --without-docs \ --disable-debug \ --disable-werror \ +$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ touch $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libmspub/ExternalProject_libmspub.mk libmspub/libmspub-0.0.4-boost.patch libmspub/UnpackedTarball_mspub.mk
libmspub/ExternalProject_libmspub.mk |2 - libmspub/UnpackedTarball_mspub.mk|6 + libmspub/libmspub-0.0.4-boost.patch | 42 +++ 3 files changed, 49 insertions(+), 1 deletion(-) New commits: commit a8fd6b51e96999bea19904f183ccb2bf847c5e4f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 28 12:21:57 2013 +0100 Use the BOOST_INCLUDE_DIR variable in Windows build Change-Id: I2f86aea9177f2f3d24aea40c47d530fd7d96d21c diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index ecd4610..27349af 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -71,7 +71,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --without-docs \ --disable-debug \ --disable-werror \ -$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ touch $@ diff --git a/libmspub/UnpackedTarball_mspub.mk b/libmspub/UnpackedTarball_mspub.mk index 5193169..92552bd 100644 --- a/libmspub/UnpackedTarball_mspub.mk +++ b/libmspub/UnpackedTarball_mspub.mk @@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mspub)) $(eval $(call gb_UnpackedTarball_set_tarball,mspub,$(MSPUB_TARBALL))) +$(eval $(call gb_UnpackedTarball_set_patchlevel,mspub,1)) + +$(eval $(call gb_UnpackedTarball_add_patches,mspub,\ + libmspub/libmspub-0.0.4-boost.patch \ +)) + # vim: set noet sw=4 ts=4: diff --git a/libmspub/libmspub-0.0.4-boost.patch b/libmspub/libmspub-0.0.4-boost.patch new file mode 100644 index 000..16cde8b --- /dev/null +++ b/libmspub/libmspub-0.0.4-boost.patch @@ -0,0 +1,42 @@ +--- a/build/win32/libmspub.vcproj b/build/win32/libmspub.vcproj +@@ -42,7 +42,7 @@ + Name=VCCLCompilerTool + Optimization=2 + InlineFunctionExpansion=1 +- AdditionalIncludeDirectories=$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR) ++ AdditionalIncludeDirectories=$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR) + PreprocessorDefinitions=NDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS + StringPooling=true + RuntimeLibrary=2 +@@ -116,7 +116,7 @@ + Tool + Name=VCCLCompilerTool + Optimization=0 +- AdditionalIncludeDirectories=$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(ICU_INCLUDE_DIR) ++ AdditionalIncludeDirectories=$(LIBWPD_INCLUDE_DIR),$(LIBWPG_INCLUDE_DIR),$(ZLIB_INCLUDE_DIR),$(BOOST_INCLUDE_DIR),$(ICU_INCLUDE_DIR) + PreprocessorDefinitions=_DEBUG;DEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS + BasicRuntimeChecks=3 + RuntimeLibrary=3 +diff --git a/build/win32/libmspub.vcxproj b/build/win32/libmspub.vcxproj +index 1a3bae4..c21 100644 +--- a/build/win32/libmspub.vcxproj b/build/win32/libmspub.vcxproj +@@ -102,7 +102,7 @@ + ClCompile + OptimizationMaxSpeed/Optimization + InlineFunctionExpansionOnlyExplicitInline/InlineFunctionExpansion +- AdditionalIncludeDirectories$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)/AdditionalIncludeDirectories ++ AdditionalIncludeDirectories$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)/AdditionalIncludeDirectories + PreprocessorDefinitionsNDEBUG;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)/PreprocessorDefinitions + StringPoolingtrue/StringPooling + RuntimeLibraryMultiThreadedDLL/RuntimeLibrary +@@ -132,7 +132,7 @@ + ItemDefinitionGroup Condition='$(Configuration)|$(Platform)'=='Debug|Win32' + ClCompile + OptimizationDisabled/Optimization +- AdditionalIncludeDirectories$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)/AdditionalIncludeDirectories ++ AdditionalIncludeDirectories$(LIBWPD_INCLUDE_DIR);$(LIBWPG_INCLUDE_DIR);$(ZLIB_INCLUDE_DIR);$(BOOST_INCLUDE_DIR);$(ICU_INCLUDE_DIR);%(AdditionalIncludeDirectories)/AdditionalIncludeDirectories +
[Libreoffice-commits] .: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d23edc10209bf0c1cddf393e4ff23a67ad35c63 Author: Andras Timar ati...@suse.com Date: Mon Jan 28 11:56:26 2013 +0100 Updated core Project: translations 69838a35694be5b656df1ee0c5e5da0e0cc4373b diff --git a/translations b/translations index 15bb868..69838a3 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 15bb868bbc35ef3de6919317bec0e70883fafeea +Subproject commit 69838a35694be5b656df1ee0c5e5da0e0cc4373b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: libmspub/ExternalProject_libmspub.mk
libmspub/ExternalProject_libmspub.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 6d850419434c5df8cfdcd7682d49bc3d92b8de83 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Mon Jan 28 12:28:19 2013 +0100 Silence some warnings Change-Id: I5a644fbe698b31bded3a5bf0fc96f1bf2be415e2 diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index 27349af..14cc85e 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -71,6 +71,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --without-docs \ --disable-debug \ --disable-werror \ + --disable-weffc \ $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ (cd $(EXTERNAL_WORKDIR)/src/lib $(MAKE)) \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: lots of .tests output during make hides error messages
On 28/01/13 09:23, Winfried Donkers wrote: Recently, when building a lot of output from typedef.tests, polystruct.tests, methodoverload.tests, published.tests and more is produced. Ufortunately, when there is an error in the code to be compiled, it gets hidden between the test-output. The tests-output continues after a compile error. 'Long ago', there was a build_err.log produced in which errors could be searched, but that is no longer generated. that annoying test spew is fixed on master with 7cf3b1ffcb8dc6dbb643e12febe5415972a7c2fa and i have no idea what build_err.log is (or was). ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: solenv/gdb
solenv/gdb/libreoffice/util/string.py |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 179c9c4f78c6cd7d0556cf85b36c586323331c8d Author: Stephan Bergmann sberg...@redhat.com Date: Mon Jan 28 12:38:42 2013 +0100 Only call data()/length() when self is valid() Change-Id: Icd9c12a10d2183a5159a3aa7a70e90494e8a8183 diff --git a/solenv/gdb/libreoffice/util/string.py b/solenv/gdb/libreoffice/util/string.py index 5ad0e8d..34cabde 100644 --- a/solenv/gdb/libreoffice/util/string.py +++ b/solenv/gdb/libreoffice/util/string.py @@ -41,9 +41,9 @@ class StringPrinterHelper(object): self.encoding = encoding def to_string(self): -data = self.data() -len = self.length() if self.valid(): +data = self.data() +len = self.length() return self.make_string(data, self.encoding, len) else: return unintialized %s % self.typename ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: lots of .tests output during make hides error messages
On Monday 28 of January 2013, Michael Stahl wrote: On 28/01/13 09:23, Winfried Donkers wrote: The tests-output continues after a compile error. 'Long ago', there was a build_err.log produced in which errors could be searched, but that is no longer generated. that annoying test spew is fixed on master with 7cf3b1ffcb8dc6dbb643e12febe5415972a7c2fa and i have no idea what build_err.log is (or was). build_error.log used to be a file with build output from the module where build failed. Given that today pretty much everything is built from tail_build, it would be equivalent to 'make 21 | tee build_error.log' . -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: lots of .tests output during make hides error messages
Michael Stahl wrote on maandag 28 januari 2013 12:37 that annoying test spew is fixed on master with 7cf3b1ffcb8dc6dbb643e12febe5415972a7c2fa Great, I'll git pull --rebase inmediately :) Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Minutes - QA Call 01/25/2013
On Sat, 2013-01-26 at 14:27 -0800, Joel Madero wrote: +Assigning Bugs -AGREED: At this time QA team “pushing” bugs to developers isn't working, we will now only do “pull” philosophy (developers choose their own bugs and assign themselves I suggest to add developers into CC for critical bugs. They should see them on the radar. IMHO, there already is this rule. It was not mentioned during the call and it is closely related. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: lots of .tests output during make hides error messages
Lubos Lunak wrote on maandag 28 januari 2013 12:49 build_error.log used to be a file with build output from the module where build failed. Given that today pretty much everything is built from tail_build, it would be equivalent to 'make 21 | tee build_error.log' . Thank you for your help, I think that Michael Stahls reply regarding the output being reduced with a recent commit will do the trick. Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-dev] - libreoffice 4.0 - waiting on multiple sockets
On 01/26/2013 12:01 AM, Rai, Neeraj wrote: I have an extension that is communicating with a a standalone shared lib running via uno exe. I start a background thread in scalc and use osl::socket (client/server) to pass data. In general, I would not recommend to create an own communication protocol there. As both processes are apparently able to speak UNO, you can use that for remote communication. On the uno exe side, you would need to invent some new UNO service that is running there and listening on a specific connection (you run the uno exe as uno -s XXX -u uno:YYY;urp, where XXX is the name of your new service and YYY is the connection details, like socket,host=localhost,port=1234). The service could implement the rather generic com.sun.star.task.XJob interface, or you could even design one or more new UNO interface types that model your communication patterns more acurately. Let me dig for some useful examples if you want to go that route. Q1. I need multiple scalc instances to connect to this uno exe. Is there a way to achieve select or epoll functionality in osl::socket No. The way UNO uses this is to have a dedicated reader thread for each accepted (socket) connection. Q2. I tried to use plain socket in uno shared lib but the scalc extension did not respond. Then I tried compiling scalc extension using plain sockets but had compilation issues. It seems the bind/listen etc are renamed in sal layer. Not sure what you mean with the above. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0]: Resolves: fdo#59965 crash dialog title area text is missing
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1893 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/93/1893/1 Resolves: fdo#59965 crash dialog title area text is missing Change-Id: I19adc5047d744acee243c94ff4e31531ae8c458a (cherry picked from commit ffce5ac51518bbd43ac0ae14dbb0967ae2c50bb4) --- M svx/source/dialog/docrecovery.cxx M svx/source/inc/docrecovery.hxx 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 277d9ec..dfe9aee 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -727,8 +727,8 @@ SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent, SVX_RES( RID_SVXPAGE_DOCRECOVERY_SAVE ) ) -, m_aTitleWin( this , SVX_RES ( WIN_SAVE_TITLE ) ) , m_aTitleFT ( this , SVX_RES ( FT_SAVE_TITLE ) ) +, m_aTitleWin( this , SVX_RES ( WIN_SAVE_TITLE ) ) , m_aTitleFL ( this , SVX_RES ( FL_SAVE_TITLE ) ) , m_aDescrFT ( this , SVX_RES ( FT_SAVE_DESCR ) ) , m_aFileListFT ( this , SVX_RES ( FT_SAVE_FILELIST) ) diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 171c34d..937ff98 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -441,8 +441,8 @@ // member private: -Window m_aTitleWin; FixedText m_aTitleFT; +Window m_aTitleWin; FixedLine m_aTitleFL; FixedText m_aDescrFT; FixedText m_aFileListFT; -- To view, visit https://gerrit.libreoffice.org/1893 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19adc5047d744acee243c94ff4e31531ae8c458a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-3-6]: Resolves: fdo#59965 crash dialog title area text is missing
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1894 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/94/1894/1 Resolves: fdo#59965 crash dialog title area text is missing Change-Id: I19adc5047d744acee243c94ff4e31531ae8c458a (cherry picked from commit ffce5ac51518bbd43ac0ae14dbb0967ae2c50bb4) --- M svx/source/dialog/docrecovery.cxx M svx/source/inc/docrecovery.hxx 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 412c938..006f147 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -736,8 +736,8 @@ SaveDialog::SaveDialog(Window* pParent, RecoveryCore* pCore ) : IExtendedTabPage( pParent, SVX_RES( RID_SVXPAGE_DOCRECOVERY_SAVE ) ) -, m_aTitleWin( this , SVX_RES ( WIN_SAVE_TITLE ) ) , m_aTitleFT ( this , SVX_RES ( FT_SAVE_TITLE ) ) +, m_aTitleWin( this , SVX_RES ( WIN_SAVE_TITLE ) ) , m_aTitleFL ( this , SVX_RES ( FL_SAVE_TITLE ) ) , m_aDescrFT ( this , SVX_RES ( FT_SAVE_DESCR ) ) , m_aFileListFT ( this , SVX_RES ( FT_SAVE_FILELIST) ) diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 9eeb3c3..2b63c8a 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -458,8 +458,8 @@ // member private: -Window m_aTitleWin; FixedText m_aTitleFT; +Window m_aTitleWin; FixedLine m_aTitleFL; FixedText m_aDescrFT; FixedText m_aFileListFT; -- To view, visit https://gerrit.libreoffice.org/1894 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19adc5047d744acee243c94ff4e31531ae8c458a Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#57061: Use a new MIGRATION4 flag file for profile migrat...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1868 Approvals: Caolán McNamara: Verified; Looks good to me, approved Eike Rathke: Looks good to me, but someone else must approve Bosdonnat Cedric: Verified; Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/1868 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8dd50a36450c167d47411834cc06a754affadf6d Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Eike Rathke er...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: comphelper/source
comphelper/source/misc/anytostring.cxx | 59 +++--
comphelper/source/misc/componentcontext.cxx|4 -
comphelper/source/misc/configurationhelper.cxx | 14 ++---
comphelper/source/misc/docpasswordhelper.cxx | 10 ++--
comphelper/source/misc/documentiologring.cxx | 14 ++---
comphelper/source/misc/ihwrapnofilter.cxx | 10 ++--
comphelper/source/misc/instancelocker.cxx | 19 +++-
comphelper/source/misc/logging.cxx | 12 ++---
comphelper/source/misc/mediadescriptor.cxx | 52 +++---
9 files changed, 95 insertions(+), 99 deletions(-)
New commits:
commit 69bb1336bfbbc9fbdc08027490b0174c904eee0f
Author: Chr. Rossmanith chrrossman...@gmx.de
Date: Mon Jan 28 10:16:20 2013 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in comphelper
Change-Id: I36bb19c123c1de54e04ba2e6c30b1cb0f7353047
diff --git a/comphelper/source/misc/anytostring.cxx
b/comphelper/source/misc/anytostring.cxx
index c0513ba..030ca27 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.cxx
@@ -32,18 +32,17 @@ namespace {
void appendTypeError(
rtl::OUStringBuffer buf, typelib_TypeDescriptionReference * typeRef )
{
-buf.appendAscii(
-RTL_CONSTASCII_STRINGPARAM(cannot get type description of type ) );
-buf.append( rtl::OUString::unacquired( typeRef-pTypeName ) );
+buf.append( cannot get type description of type );
+buf.append( OUString::unacquired( typeRef-pTypeName ) );
buf.append( static_cast sal_Unicode ('') );
}
inline void appendChar( rtl::OUStringBuffer buf, sal_Unicode c )
{
if (c ' ' || c '~') {
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(\\X) );
-rtl::OUString const s(
-rtl::OUString::valueOf( static_cast sal_Int32 (c), 16 ) );
+buf.append( \\X );
+OUString const s(
+OUString::valueOf( static_cast sal_Int32 (c), 16 ) );
for ( sal_Int32 f = 4 - s.getLength(); f 0; --f )
buf.append( static_cast sal_Unicode ('0') );
buf.append( s );
@@ -59,7 +58,7 @@ void appendValue( rtl::OUStringBuffer buf,
bool prependType )
{
if (typeRef-eTypeClass == typelib_TypeClass_VOID) {
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(void) );
+buf.append( void );
return;
}
OSL_ASSERT( val != 0 );
@@ -70,8 +69,8 @@ void appendValue( rtl::OUStringBuffer buf,
typeRef-eTypeClass != typelib_TypeClass_BOOLEAN)
{
buf.append( static_cast sal_Unicode ('(') );
-buf.append( rtl::OUString::unacquired( typeRef-pTypeName ) );
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM() ) );
+buf.append( OUString::unacquired( typeRef-pTypeName ) );
+buf.append( ) );
}
switch (typeRef-eTypeClass) {
@@ -83,16 +82,15 @@ void appendValue( rtl::OUStringBuffer buf,
*static_cast uno::XInterface * const * (val),
uno::UNO_QUERY );
if (xServiceInfo.is()) {
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(
- (ImplementationName = \) );
+buf.append( (ImplementationName = \ );
buf.append( xServiceInfo-getImplementationName() );
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(\)) );
+buf.append( \) );
}
break;
}
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION: {
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM({ ) );
+buf.append( { );
typelib_TypeDescription * typeDescr = 0;
typelib_typedescriptionreference_getDescription( typeDescr, typeRef );
if (typeDescr == 0 || !typelib_typedescription_complete( typeDescr ))
{
@@ -110,7 +108,7 @@ void appendValue( rtl::OUStringBuffer buf,
typelib_TypeDescription * (
compType-pBaseTypeDescription)-pWeakRef, false );
if (nDescr 0)
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(, ) );
+buf.append( , );
}
typelib_TypeDescriptionReference ** ppTypeRefs =
@@ -121,7 +119,7 @@ void appendValue( rtl::OUStringBuffer buf,
for ( sal_Int32 nPos = 0; nPos nDescr; ++nPos )
{
buf.append( ppMemberNames[ nPos ] );
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM( = ) );
+buf.append( = );
typelib_TypeDescription * memberType = 0;
TYPELIB_DANGER_GET( memberType, ppTypeRefs[ nPos ] );
if (memberType == 0) {
@@ -135,10 +133,10 @@ void appendValue( rtl::OUStringBuffer buf,
TYPELIB_DANGER_RELEASE( memberType );
}
if (nPos (nDescr - 1))
-buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(, ) );
+buf.append( , );
}
Re: Code pointers for fdo#43650
Hi Samuel, On Sat, 2013-01-26 at 11:21 +0100, Samuel Mehrbrodt wrote: I would like to work on Bug #43650 [1]. The bug is about disabling the tooltip showing Title/Page number when scrolling in Writer. But it should only be disabled when scrolling with the mouse wheel, not when dragging the scroll bar. From this Apache patch [2] I can see where the tool tip is drawn. What I want to do different than Apache does, is that whether the tool tip is shown or not, should not be based on a configuration setting, but on whether one is using the mouse wheel. Can someone please have a look at it and give me a code pointer for that? The ScollbarHdl doesn't tell you how this has been triggered. I think you'll have to have a look at the ScrollBar vcl control to add that information... Some debugging may also help to see the difference between scrolling with the wheel or by dragging the lift. I hope this helps, -- Cedric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[master]: configure: accept building without themes
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1879 Approvals: LibreOffice gerrit bot: Verified Michael Stahl: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1879 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45d2872145f3bd15e17beac4f69f8b4b1855d9a3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: configure.ac
configure.ac | 18 ++ 1 file changed, 10 insertions(+), 8 deletions(-) New commits: commit 9cacd76701360e30cbee2ccee61a3722b19b4531 Author: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Date: Sat Jan 26 16:59:36 2013 +0100 configure: accept building without themes If --with-theme=no is specified disallow any check for valid themes which would otherwise give an error. Change-Id: I45d2872145f3bd15e17beac4f69f8b4b1855d9a3 Reviewed-on: https://gerrit.libreoffice.org/1879 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Michael Stahl mst...@redhat.com diff --git a/configure.ac b/configure.ac index dc13c15..7a29b48 100644 --- a/configure.ac +++ b/configure.ac @@ -10824,14 +10824,16 @@ if test x$with_theme = x -o x$with_theme = xyes; then fi WITH_THEMES= -for theme in $with_theme; do -case $theme in - crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; -*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; -esac -WITH_THEMES=$WITH_THEMES $theme -SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'` -done +if test x$with_theme != xno; then +for theme in $with_theme; do +case $theme in + crystal|default|galaxy|hicontrast|human|industrial|oxygen|tango|tango_testing) : ;; +*) AC_MSG_ERROR([Unknown value for --with-theme: $theme]) ;; +esac +WITH_THEMES=$WITH_THEMES $theme +SCPDEFS=$SCPDEFS -DTHEME_`echo $theme|tr '[[:lower:]]' '[[:upper:]]'` +done +fi AC_MSG_RESULT([$WITH_THEMES]) AC_SUBST([WITH_THEMES]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sc/inc sc/source
sc/inc/compiler.hxx |1
sc/inc/globstr.hrc | 31 +++-
sc/source/core/tool/compiler.cxx | 10 -
sc/source/ui/condformat/condformathelper.cxx | 21 ++
sc/source/ui/src/globstr.src | 52 +++
5 files changed, 95 insertions(+), 20 deletions(-)
New commits:
commit 8877e4aeda044c2d74468b4a37bad9e96d7d6f3a
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Jan 28 03:11:18 2013 +0100
no need for the String version of this function anymore
Change-Id: Ic661a5cb492c25a049dfaf1da0a501ceeae83c2c
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 10af901..c70d184 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -426,7 +426,6 @@ public:
maExternalLinks = rLinks;
}
-voidCreateStringFromXMLTokenArray( String rFormula, String
rFormulaNmsp );
voidCreateStringFromXMLTokenArray( rtl::OUString rFormula,
rtl::OUString rFormulaNmsp );
voidSetExtendedErrorDetection( ExtendedErrorDetection eVal ) {
meExtendedErrorDetection = eVal; }
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index ac0d10b..e19eb19 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -3718,7 +3718,7 @@ bool ScCompiler::NextNewToken( bool bInArray )
return true;
}
-void ScCompiler::CreateStringFromXMLTokenArray( String rFormula, String
rFormulaNmsp )
+void ScCompiler::CreateStringFromXMLTokenArray( rtl::OUString rFormula,
rtl::OUString rFormulaNmsp )
{
bool bExternal = GetGrammar() == FormulaGrammar::GRAM_EXTERNAL;
sal_uInt16 nExpectedCount = bExternal ? 2 : 1;
@@ -3733,14 +3733,6 @@ void ScCompiler::CreateStringFromXMLTokenArray( String
rFormula, String rFormu
}
}
-void ScCompiler::CreateStringFromXMLTokenArray( rtl::OUString rFormula,
rtl::OUString rFormulaNmsp )
-{
-String sFormula, aFormulaNmsp;
-CreateStringFromXMLTokenArray(sFormula, aFormulaNmsp);
-rFormula = sFormula;
-rFormulaNmsp = aFormulaNmsp;
-}
-
namespace {
class ExternalFileInserter : std::unary_functionsal_uInt16, void
commit c842966fa466d5f0be2bf66746da5e663eceb205
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Nov 16 15:08:07 2012 +0100
remaining ui parts for conditional date formats
Conflicts:
sc/inc/globstr.hrc
sc/source/ui/condformat/condformatdlgentry.cxx
Change-Id: Ibc1dc80faa64d97e3d600ce40a97a716804cfac8
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 4b8031d..bf0451cc 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -613,14 +613,27 @@
#define STR_COND_CONTAINS 488
#define STR_COND_NOT_CONTAINS 489
#define STR_COND_DATE 490
-
-#define STR_ERR_CONDFORMAT_PROTECTED 491
-#define STR_EDIT_EXISTING_COND_FORMATS 492
-
-#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 493
-#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 494
-#define STR_ALWAYS_PERFORM_SELECTED 495
-
-#define STR_COUNT 496
+#define STR_COND_TODAY 491
+#define STR_COND_YESTERDAY 492
+#define STR_COND_TOMORROW 493
+#define STR_COND_LAST7DAYS 494
+#define STR_COND_THISWEEK 495
+#define STR_COND_LASTWEEK 496
+#define STR_COND_NEXTWEEK 497
+#define STR_COND_THISMONTH 498
+#define STR_COND_LASTMONTH 499
+#define STR_COND_NEXTMONTH 500
+#define STR_COND_THISYEAR 501
+#define STR_COND_LASTYEAR 502
+#define STR_COND_NEXTYEAR 503
+
+#define STR_ERR_CONDFORMAT_PROTECTED 504
+#define STR_EDIT_EXISTING_COND_FORMATS 505
+
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_ODS 506
+#define STR_QUERY_FORMULA_RECALC_ONLOAD_XLS 507
+#define STR_ALWAYS_PERFORM_SELECTED 508
+
+#define STR_COUNT 509
#endif
diff --git a/sc/source/ui/condformat/condformathelper.cxx
b/sc/source/ui/condformat/condformathelper.cxx
index b594910..0c6b77e 100644
--- a/sc/source/ui/condformat/condformathelper.cxx
+++ b/sc/source/ui/condformat/condformathelper.cxx
@@ -90,6 +90,16 @@ rtl::OUString getExpression(sal_Int32 nIndex)
return rtl::OUString();
}
+rtl::OUString getDateString(sal_Int32 nIndex)
+{
+sal_Int32 nStringIndex = STR_COND_TODAY + nIndex;
+if(nStringIndex = STR_COND_NEXTYEAR)
+return ScGlobal::GetRscString(nStringIndex);
+
+assert(false);
+return rtl::OUString();
+}
+
}
rtl::OUString ScCondFormatHelper::GetExpression(const ScConditionalFormat
rFormat, const ScAddress rPos)
@@ -139,7 +149,12 @@ rtl::OUString ScCondFormatHelper::GetExpression(const
ScConditionalFormat rForm
aBuffer.append(getTextForType(ICONSET));
break;
case condformat::DATE:
-aBuffer.append(getTextForType(DATE));
+{
+
[Libreoffice-commits] .: scp2/InstallModule_javafilter.mk
scp2/InstallModule_javafilter.mk |6 ++ 1 file changed, 6 insertions(+) New commits: commit 7d35334ed4941a230ab804b7505171459ee9000f Author: Andras Timar ati...@suse.com Date: Mon Jan 28 13:42:16 2013 +0100 restore javafilters' registration under Windows Change-Id: I59e4c93bc7868a5ae4e73721b186c6a22f85c752 diff --git a/scp2/InstallModule_javafilter.mk b/scp2/InstallModule_javafilter.mk index c5d8ee0..ce22109 100644 --- a/scp2/InstallModule_javafilter.mk +++ b/scp2/InstallModule_javafilter.mk @@ -27,6 +27,12 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/javafilter)) +$(eval $(call gb_InstallModule_add_defs,scp2/javafilter,\ + $(if $(WINDOWS_SDK_HOME),\ + -DHAVE_WINDOWS_SDK \ + ) \ +)) + $(eval $(call gb_InstallModule_add_scpfiles,scp2/javafilter,\ scp2/source/javafilter/file_javafilter \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Are we using SimpleReferenceObject correctly?
On 01/27/2013 10:55 PM, Henrik /KaarPoSoft wrote: Are we using SimpleReferenceObject correctly? In particular, maybe we should define ~SimpleReferenceObject in all subclasses ? We are using that class correctly. For subclasses that do not explicitly declare a destructor, the compiler implicitly defines one. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Are we using SimpleReferenceObject correctly?
On 27/01/13 22:55, Henrik /KaarPoSoft wrote: Dear all, As described in the mailing-list-thread Issues building LibreOffice 4.0.0.1 http://lists.freedesktop.org/archives/libreoffice/2013-January/044838.html I am trying to build and package LibreOffice 4.0.0.* for KaarPux http://kaarpux.kaarposoft.dk/ I am starting a new mailing-list thread here to try to address one issue at a time. With LibreOffice 4.0.0.2, Stephans patch http://cgit.freedesktop.org/libreoffice/core/commit/?id=d71e8fb17bd008751909ef2fabc6ff4f1e2db187 no other pathes and the configuration attached as config.txt building is now stuck at [build LNK] Library/libmysqllo.so with undefined reference to 'typeinfo for salhelper::SimpleReferenceObject' it seems that typeinfo is hidden in the salhelper library, the lines are explicitly commented out (salhelper/source/gcc3.map): # _ZTIN9salhelper21SimpleReferenceObjectE; # _ZTSN9salhelper21SimpleReferenceObjectE; on the other hand the wildcard at the beginning should match these: _ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions indeed it is exported here: nm --defined-only --extern-only solver/unxlngx6/lib/libuno_salhelpergcc3.so.3 | grep _ZTI | grep SimpleReferenceObject 00208ac0 V _ZTIN9salhelper21SimpleReferenceObjectE but the mysql library does not actually use it here: nm solver/unxlngx6/lib/libmysqllo.so | grep _ZTI | grep SimpleReferenceObject despite some objects from that library including that FValue.hxx: grep -r FValue.hxx workdir/unxlngx6/Dep/LinkTarget/Library/libmysqllo.so.d /master/solver/unxlngx6/inc/connectivity/FValue.hxx \ /master/solver/unxlngx6/inc/connectivity/FValue.hxx : /master/solver/unxlngx6/inc/connectivity/FValue.hxx \ /master/solver/unxlngx6/inc/connectivity/FValue.hxx \ /master/solver/unxlngx6/inc/connectivity/FValue.hxx \ /master/solver/unxlngx6/inc/connectivity/FValue.hxx \ so the difference seems to be that your gcc does generate typeinfo and whatnot for a class that is not actually used. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7c54af2597f9af4914169449b83a59830303ebb7 Author: Andras Timar ati...@suse.com Date: Mon Jan 28 14:33:22 2013 +0100 Updated core Project: help 97ee0b3910f1652911f01443c27e9b77e7582332 diff --git a/helpcontent2 b/helpcontent2 index 8c93e65..97ee0b3 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 8c93e652fa9becc9779172593aab5a022e5528ce +Subproject commit 97ee0b3910f1652911f01443c27e9b77e7582332 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: help-to-wiki.py
help-to-wiki.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 97ee0b3910f1652911f01443c27e9b77e7582332 Author: Andras Timar ati...@suse.com Date: Mon Jan 28 14:33:22 2013 +0100 add Turkish to WikiHelp, it is fully translated Change-Id: If89ffb1950f9e9a8d99140e1f37d65f4d4506a89 diff --git a/help-to-wiki.py b/help-to-wiki.py index 1fa9fb2..4a15f95 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -63,7 +63,7 @@ def create_wiki_dirs(): # Langs to handle langs = ['', 'ca', 'cs', 'da', 'de', 'es', 'fr', 'hu', \ 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'pt-BR', 'ru', \ - 'sl', 'sv', 'vi', 'zh-CN', 'zh-TW' ] + 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] # Argument handling try: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Change in help[libreoffice-4-0]: add Turkish to WikiHelp, it is fully translated
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1895 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/help refs/changes/95/1895/1 add Turkish to WikiHelp, it is fully translated Change-Id: If89ffb1950f9e9a8d99140e1f37d65f4d4506a89 --- M help-to-wiki.py 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help-to-wiki.py b/help-to-wiki.py index 1fa9fb2..4a15f95 100755 --- a/help-to-wiki.py +++ b/help-to-wiki.py @@ -63,7 +63,7 @@ # Langs to handle langs = ['', 'ca', 'cs', 'da', 'de', 'es', 'fr', 'hu', \ 'it', 'ja', 'ko', 'nl', 'pl', 'pt', 'pt-BR', 'ru', \ - 'sl', 'sv', 'vi', 'zh-CN', 'zh-TW' ] + 'sl', 'sv', 'tr', 'vi', 'zh-CN', 'zh-TW' ] # Argument handling try: -- To view, visit https://gerrit.libreoffice.org/1895 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If89ffb1950f9e9a8d99140e1f37d65f4d4506a89 Gerrit-PatchSet: 1 Gerrit-Project: help Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/ui/view/outlnvs2.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7e8e9031c6ef46d67d5579ca42d0c0f5975d4f98 Author: Herbert Dürr h...@apache.org Date: Tue Jun 19 10:20:57 2012 + fdo#51232: i#119987# fix Impress crash when pasting text under Outline view Patch by: Wang Zhe Testing by: Yan Ji Review by: hdu (cherry picked from commit 484621239c7f743f44579d2b199b0347dc4734cd) Change-Id: I340de4f1b626defa52ecc48938c63ec4d1ce5c1d Signed-off-by: Tor Lillqvist t...@iki.fi diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index 5a2061e..a514bb2 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -243,6 +243,7 @@ void OutlineViewShell::FuTemporary(SfxRequest rReq) else xPresentation-rehearseTimings(); } +Cancel(); rReq.Done(); } break; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: how to add a new font in installer package
On 28/01/13 10:23, huqitu du wrote: yes, I did it , but dosnt work! are you sure? there are 2 places in scp2 where a file has to be added, one is the line you quoted below, and the other is a reference from some other file that uses the gid_File_whatever. please post your complete patch so we can give you better advice what could be missing or wrong. 2013/1/28 Andras Timar tima...@gmail.com mailto:tima...@gmail.com Hi, On Mon, Jan 28, 2013 at 8:38 AM, huqitu du huq...@gmail.com mailto:huq...@gmail.com wrote: I need to add a new font in installer In order to support traditional mongolia, and 1. I copy font file to solver\wntmsci12.pro http://wntmsci12.pro\bin and then 2. modify the scp2\source\ooo\file_font_ooo.scp as DejaVuSans font did, //mongolian fonts #ifndef WITHOUT_FONTS STD_FONT_FILE( gid_File_Fnt_MenkQagan, MQG8F01.ttf, Menk Qagan Tig) #endif but when rebuild the scp2 and instsetoo_native, reinstall the libreoffice, but my font not copyed to windows\fonts dir, what I need to do another thing? You need to add gid_File_Fnt_MenkQagan to scp2/source/ooo/module_hidden_ooo.scp. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Change in core[libreoffice-4-0-0]: fdo#59969 crash fix (insecure clear screen during Logo execu...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1896 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/96/1896/1 fdo#59969 crash fix (insecure clear screen during Logo execution) Change-Id: Id0af685c67c02fecd8b10a40d4fb8135a2df --- M librelogo/source/LibreLogo/LibreLogo.py 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index df5bdc0..542495dd 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -620,6 +620,8 @@ __removeshape__(__ACTUAL__) def clearscreen(arg=None): +if __thread__: +return None __getdocument__() turtle = __getshape__(__TURTLE__) if not turtle: -- To view, visit https://gerrit.libreoffice.org/1896 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0af685c67c02fecd8b10a40d4fb8135a2df Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0-0 Gerrit-Owner: Németh László nem...@numbertext.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
