Reminder: FOSDEM travel requests
Hello, I'd like to file the FOSDEM travel requests late next week, so I'd just like to remind all of you to send your requests to treasu...@documentfoundation.org soon. For details, see my last e-mail at http://www.mail-archive.com/projects@global.libreoffice.org/msg00826.html Thanks, and have a nice weekend, Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
SOLVED: Are we using SimpleReferenceObject correctly?
On 01/29/2013 08:33 PM, Henrik /KaarPoSoft wrote: On 01/28/2013 09:00 PM, Henrik /KaarPoSoft wrote: On 01/28/2013 02:22 PM, Michael Stahl wrote: On 27/01/13 22:55, Henrik /KaarPoSoft wrote: 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. FValue.hxx is included by many modules in connectivity. And since it defines (not just declares) a class referencing SimpleReferenceObject, gcc will emit code for the class (ORowSetValueDecorator). The modules in connectivity (e.g. dbase) which are actually using the class correctly includes salhelper in their .mk file. However, modules in connectivity (e.g. mysql) which are not actually using the class do not include salhelper in their .mk file. So, a legacy linker will see the class and be unable to fulfill the reference. This seems to be exactly what happened to me. In order to identify the class as not being used, we need Link Time Optimization, which was not enabled in my toolchain. I have now enabled Link Time Optimization in gcc and ld (binutils), and I am now able to COMPILE LibreOffice! (I still have 20 failing unittests, and LibreOffice does still not work, but that will be the subject of another thread). Michael, thank you very much for your help! /Henrik ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
SOLVED: Issues building LibreOffice 4.0.0.1
On 01/29/2013 09:31 PM, Henrik /KaarPoSoft wrote:
On 01/29/2013 01:53 PM, Stephan Bergmann wrote:
On 01/24/2013 10:43 PM, Henrik /KaarPoSoft wrote:
On 01/24/2013 10:09 AM, Stephan Bergmann wrote:
On 01/24/2013 12:33 AM, Henrik /KaarPoSoft wrote:
On 01/23/2013 04:54 PM, Stephan Bergmann wrote:
On 01/23/2013 08:31 AM, Henrik /KaarPoSoft wrote:
Your strace lines like
[...]
look oddly truncated. For example, there should be a
.../program/boostraprc file that soffice.bin would indeed try to open
early on.
So I just ran into a problem with a libreoffice-4-0-0 build of mine on
Mac OS X whose symptoms looked very much like the above, expanding LO
bootstrap variables ($UserInstallation from bootstraprc in my case) to
pathnames that were oddly truncated. I tracked that down to bad calls
to putenv (the code to expand bootstrap variables in
sal/rtl/source/bootstrap.cxx tries to obtain values for that variables
via getenv, among others, so it is susceptible to problems resulting
from a broken environment), see
http://cgit.freedesktop.org/libreoffice/core/commit/?id=d841273ba54b173020aa8da18ba7841cf950c13c
Do not call putenv with a temporary string argument.
While that fix is in Mac OS X specific code (so cannot be the cause of
your Linux problems), there are more calls to putenv in the LO code
base, and some of the might be broken in a similar way.
Stephan
I have applied the attached patch to my build.
Some of the changes are just quick-and-dirty, and leaking.
However, with those patches strace does not show any oddly truncated
lines, and LibreOffice continues a bit longer before dying on me (but I
will address this in another subject).
Thank you very much for your help!
/Henrik
diff -Naur libreoffice-4.0.0.3.ORIG/cppuhelper/test/loader/loader.test.cxx libreoffice-4.0.0.3/cppuhelper/test/loader/loader.test.cxx
--- libreoffice-4.0.0.3.ORIG/cppuhelper/test/loader/loader.test.cxx 2013-01-31 11:54:53.0 +0100
+++ libreoffice-4.0.0.3/cppuhelper/test/loader/loader.test.cxx 2013-02-06 18:04:23.239228816 +0100
@@ -130,11 +130,7 @@
result += servicePurpose;
result += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\) - ));
-char buff[256];
-strcpy(buff, TestComponent.uno=);
-strcat(buff, pServicePurpose);
-
-putenv(buff);
+setenv(TestComponent.uno, pServicePurpose, 1);
try {
cppu::writeSharedLibComponentInfo(
diff -Naur libreoffice-4.0.0.3.ORIG/sal/osl/unx/process.cxx libreoffice-4.0.0.3/sal/osl/unx/process.cxx
--- libreoffice-4.0.0.3.ORIG/sal/osl/unx/process.cxx 2013-01-31 11:54:53.0 +0100
+++ libreoffice-4.0.0.3/sal/osl/unx/process.cxx 2013-02-06 18:04:23.239228816 +0100
@@ -272,7 +272,7 @@
}
else
{
-putenv(data.m_pszEnv[i]); /*TODO: check error return*/
+putenv(strdup(data.m_pszEnv[i])); /*TODO: check error return*/
}
}
diff -Naur libreoffice-4.0.0.3.ORIG/sal/osl/unx/signal.c libreoffice-4.0.0.3/sal/osl/unx/signal.c
--- libreoffice-4.0.0.3.ORIG/sal/osl/unx/signal.c 2013-01-31 11:54:53.0 +0100
+++ libreoffice-4.0.0.3/sal/osl/unx/signal.c 2013-02-06 18:06:03.264680154 +0100
@@ -542,7 +542,6 @@
if ( strEnv )
{
putenv( rtl_string_getStr( strEnv ) );
-rtl_string_release( strEnv );
}
rtl_uString_release( ustrEnvironment );
diff -Naur libreoffice-4.0.0.3.ORIG/svtools/bmpmaker/bmp.cxx libreoffice-4.0.0.3/svtools/bmpmaker/bmp.cxx
--- libreoffice-4.0.0.3.ORIG/svtools/bmpmaker/bmp.cxx 2013-01-31 11:54:53.0 +0100
+++ libreoffice-4.0.0.3/svtools/bmpmaker/bmp.cxx 2013-02-06 18:08:42.648988158 +0100
@@ -217,10 +217,7 @@
int main( int nArgCount, char* ppArgs[] )
{
#ifdef UNX
-static char aDisplayVar[ 1024 ];
-
-strcpy( aDisplayVar, DISPLAY= );
-putenv( aDisplayVar );
+setenv(DISPLAY, , 1);
#endif
::std::vector String aArgs;
diff -Naur libreoffice-4.0.0.3.ORIG/svtools/bmpmaker/bmpsum.cxx libreoffice-4.0.0.3/svtools/bmpmaker/bmpsum.cxx
--- libreoffice-4.0.0.3.ORIG/svtools/bmpmaker/bmpsum.cxx 2013-01-31 11:54:53.0 +0100
+++ libreoffice-4.0.0.3/svtools/bmpmaker/bmpsum.cxx 2013-02-06 18:08:48.848078258 +0100
@@ -450,10 +450,7 @@
int main( int nArgCount, char* ppArgs[] )
{
#ifdef UNX
-static char aDisplayVar[ 1024 ];
-
-strcpy( aDisplayVar, DISPLAY= );
-putenv( aDisplayVar );
+setenv(DISPLAY, , 1);
#endif
::std::vector String aArgs;
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/inc
sw/inc/cmdid.h | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 7b706885b88ee2cd2da4f2a0741f6488d45a Author: Matthias Freund matti...@yahoo.de Date: Fri Feb 8 23:38:27 2013 +0100 Remarktranslations german - english I have translated some german remarks into english for better understanding the sourcecode. I hope this helps a lot... Change-Id: I9d790684ec4c999aacbe5d7f47138a4bee26c7c7 Reviewed-on: https://gerrit.libreoffice.org/2058 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index e5052cf..0c31ee9 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -233,7 +233,7 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_INSERT_BREAK_DLG (FN_INSERT + 4 ) /* Break */ #define FN_INSERT_COLUMN_BREAK (FN_INSERT + 5 ) /* Column break */ -#define FN_INSERT_FIELD (FN_INSERT + 8 ) /* Textbefehl */ +#define FN_INSERT_FIELD (FN_INSERT + 8 ) /* Textcommand */ #define FN_CHANGE_DBFIELD (FN_INSERT + 9 ) /* Change the database field */ #define FN_INSERT_CAPTION (FN_INSERT + 10) /* Caption */ @@ -458,7 +458,7 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_TITLE_DESCRIPTION_SHAPE (FN_FORMAT2 + 15) /* shape title and description */ -#define FN_NUMBER_FORMAT(FN_FORMAT2 + 120) /* set Boxen/NumberFormatter */ +#define FN_NUMBER_FORMAT(FN_FORMAT2 + 120) /* set Boxes/NumberFormatter */ #define FN_NUMBER_STANDARD (FN_FORMAT2 + 121) #define FN_NUMBER_TWODEC(FN_FORMAT2 + 123) #define FN_NUMBER_SCIENTIFIC(FN_FORMAT2 + 124) @@ -701,8 +701,8 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_DELETE_WHOLE_LINE(FN_SELECTION + 35) /* DeleteLine ??? */ #define FN_PAGEUP (FN_SELECTION + 37) /* PageUpWithCursor */ #define FN_PAGEDOWN (FN_SELECTION + 38) /* PageDownWithCursor */ -#define FN_SET_ADD_MODE (FN_SELECTION + 39) /* Selektionsmodus */ -#define FN_SET_EXT_MODE (FN_SELECTION + 40) /* Selektionsmodus */ +#define FN_SET_ADD_MODE (FN_SELECTION + 39) /* Selectionmode */ +#define FN_SET_EXT_MODE (FN_SELECTION + 40) /* Selectionmode */ #define FN_ESCAPE (FN_SELECTION + 41) /* Normal */ #define FN_SHIFT_BACKSPACE (FN_SELECTION + 42) /* like Backspace */ #define FN_SELECT_WORD (FN_SELECTION + 43) /* select word*/ @@ -836,7 +836,7 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_COND_COLL(FN_PARAM2+1) /* Item for conditional templates */ #define FN_PARAM_SELECTION (FN_PARAM2+2) /* selected word for format/character/hyperlink */ -#define FN_PARAM_ACT_NUMBER (FN_PARAM2+3) /* PointerItem die aktuelle NumRule */ +#define FN_PARAM_ACT_NUMBER (FN_PARAM2+3) /* PointerItem the current NumRule */ #define FN_PARAM_NUM_PRESET (FN_PARAM2+5) /* predefined numbering */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/_viewsh.sdi | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) New commits: commit e3519f6dc62aa53e0ea4f55e8270cf2b405d6d84 Author: Matthias Freund matti...@yahoo.de Date: Sat Feb 9 00:39:38 2013 +0100 Remark translations german - english Hope it helps you a lot. Change-Id: I5db1b746077c783a6fdf75ba0e30a3573ef4ddea Reviewed-on: https://gerrit.libreoffice.org/2059 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index d6ff824..eb4d596 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -314,7 +314,7 @@ interface BaseTextEditView DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR; ] //- - //Ab hier Statusleiste + //From here the statusbar FN_STAT_PAGE // status() [ ExecMethod = ExecuteStatusLine ; @@ -336,7 +336,7 @@ interface BaseTextEditView ] FN_STAT_SELMODE // status(final|play) [ - //Aktueller Selektionsmode: 0 == Normal, 2 == Ergaenzen, 1 == Erweitern + //Current Selectionmode: 0 == Normal, 2 == Add, 1 == Enhance ExecMethod = ExecuteStatusLine ; StateMethod = StateStatusLine ; ] @@ -384,7 +384,7 @@ interface BaseTextEditView StateMethod = StateStatusLine ; ] //-- - //End mit Statusleiste + //End of the statusbar //-- SID_ATTR_BORDER_SHADOW // status() [ @@ -393,7 +393,7 @@ interface BaseTextEditView ] // /* */ -/* Properties Seitenformat*/ +/* Properties Page Format */ /* */ // SID_ATTR_PAGE // status() @@ -435,7 +435,7 @@ interface BaseTextEditView DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR; ] /* -suchen und ersetzen +search and replace */ @@ -478,7 +478,7 @@ interface BaseTextEditView StateMethod = StateTabWin ; DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR; ] -// ab hier Export = FALSE; +// from here Export = FALSE; FID_SEARCH_ON // status() [ ExecMethod = ExecSearch ; @@ -640,8 +640,8 @@ interface BaseTextEditView StateMethod = StateViewOptions ; ] - //Extra/Optionen/Ansicht -//Wird zusammen zum Property ViewSettings + //Extra/Options/View +//Will be summerized to Property ViewSettings FN_VIEW_HIDDEN_PARA [ ExecMethod = ExecViewOptions ; @@ -655,7 +655,7 @@ interface BaseTextEditView StateMethod = StateViewOptions ; Export = FALSE; ] - // alles ab hier kann weg (Export = FALSE;), wenn die vorangehenden funktionieren + // Everything from here can be removed (Export = FALSE;), if the previous works FN_RULER // status() [ ExecMethod = ExecViewOptions ; @@ -772,14 +772,14 @@ interface GlobalContents [ ] -// Bereichsname, Index-Titel oder Leerstring +// Areaname, Index-Titel or Empty String String Title FN_COLL_TITLE ( UINT16 PositionFN_COLL_TITLE ) [ ] -// ohne FileName wird ein TextBereich an der Position eingefuegt +// Without a FileName an area of the text is inserted at this location. BOOLInsertDocument FN_COLL_ADD ( UINT16 PositionFN_COLL_ADD, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/basesh.sdi |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 50b9a90ef4ab73d812970545d4d89a128d6d01bf
Author: Matthias Freund matti...@yahoo.de
Date: Sat Feb 9 01:15:34 2013 +0100
Remark Translation german - english
Change-Id: Iddfc42ba61ddf533e0d0832a54730a8f3058b1c0
Reviewed-on: https://gerrit.libreoffice.org/2060
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/sw/sdi/basesh.sdi b/sw/sdi/basesh.sdi
index 4a17a63..baeb362 100644
--- a/sw/sdi/basesh.sdi
+++ b/sw/sdi/basesh.sdi
@@ -21,8 +21,8 @@ interface TextSelection : BaseTextSelection
uuid = F23BA0A8-73A0-11d0-89CA-008029E4B0B1
]
{
-// hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
-// nicht unterstuetzt werden
+// Here shall the slots are inserted which are not supported by
+// StarWriter/WEB
FN_TOOL_ANCHOR_PAGE
[
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/view/viewsh.cxx | 214 ++---
1 file changed, 96 insertions(+), 118 deletions(-)
New commits:
commit c1e3943ceac62209b78e13a42ea67044383f4798
Author: Winfried Donkers o...@dci-electronics.nl
Date: Fri Feb 8 19:32:39 2013 +0100
translate German comments, remove obsolete code
Change-Id: Icfb1e2985f746d7a451037e2d411ebbfeed26a54
Reviewed-on: https://gerrit.libreoffice.org/2054
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 8d8d333..bec7c75 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -199,7 +199,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
}
bInEndAction = sal_True;
-//Laeuft hiermit das EndAction der Letzten Shell im Ring?
+//will this put the EndAction of the last shell in the sequence?
ViewShell::bLstAct = sal_True;
ViewShell *pSh = (ViewShell*)this-GetNext();
@@ -238,9 +238,8 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
if ( bIsShellForCheckViewLayout )
GetLayout()-CheckViewLayout( GetViewOptions(), aVisArea );
-//Wenn wir selbst keine Paints erzeugen, so warten wir auf das Paint
-//vom System. Dann ist das Clipping korrekt gesetzt; Beispiel: verschieben
-//eines DrawObjektes.
+//If we don't call Paints, we wait for the Paint of the system.
+//Then the clipping is set correctly; e.g. shifting of a Draw object
if ( Imp()-GetRegion() ||
aInvalidRect.HasArea() ||
bExtraData )
@@ -263,12 +262,11 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
SwRegionRects *pRegion = Imp()-GetRegion();
-//JP 27.11.97: wer die Selection hided, muss sie aber auch
-// wieder Showen. Sonst gibt es Paintfehler!
-// z.B.: addional Mode, Seite vertikal hab zu sehen, in der
-// Mitte eine Selektion und mit einem anderen Cursor an linken
-// rechten Rand springen. Ohne ShowCrsr verschwindet die
-// Selektion
+//JP 27.11.97: what hid the selection, must also Show it,
+// else we get Paint errors!
+// e.g. additional mode, page half visible vertically, in the
+// middle a selection and with an other cursor jump to left
+// right border. Without ShowCrsr the selection disappears.
bool bShowCrsr = pRegion IsA( TYPE(SwCrsrShell) );
if( bShowCrsr )
((SwCrsrShell*)this)-HideCrsrs();
@@ -279,7 +277,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
Imp()-pRegion = NULL;
-//Erst Invert dann Compress, niemals andersherum!
+//First Invert then Compress, never the other way round!
pRegion-Invert();
pRegion-Compress();
@@ -293,7 +291,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
bool bPaint = true;
if ( IsEndActionByVirDev() )
{
-//virtuelles device erzeugen und einstellen.
+//create virtual device and set.
if ( !pVout )
pVout = new VirtualDevice( *GetOut() );
MapMode aMapMode( GetOut()-GetMapMode() );
@@ -423,10 +421,10 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
Imp()-EndAction();
-//Damit sich die automatischen Scrollbars auch richtig anordnen k?nnen
-//muessen wir die Aktion hier kuenstlich beenden (EndAction loesst ein
-//Notify aus, und das muss Start-/EndAction rufen um die Scrollbars
-//klarzubekommen.
+//We artificially end the action here to enable the automatic scrollbars
+//to adjust themselves correctly
+//EndAction sends a Notify, and that must call Start-/EndAction to
+//adjust the scrollbars correctly
--nStartAction;
UISizeNotify();
++nStartAction;
@@ -446,7 +444,7 @@ void ViewShell::ImplStartAction()
void ViewShell::ImplLockPaint()
{
if ( GetWin() GetWin()-IsVisible() )
-GetWin()-EnablePaint( sal_False ); //Auch die Controls abklemmen.
+GetWin()-EnablePaint( sal_False ); //Also cut off the controls.
Imp()-LockPaint();
}
@@ -458,7 +456,7 @@ void ViewShell::ImplUnlockPaint( sal_Bool bVirDev )
{
if ( (bInSizeNotify || bVirDev ) VisArea().HasArea() )
{
-//Refresh mit virtuellem Device um das Flackern zu verhindern.
+//Refresh with virtual device to avoid flickering.
VirtualDevice *pVout = new VirtualDevice( *pOut );
pVout-SetMapMode( pOut-GetMapMode() );
Size aSize( VisArea().SSize() );
@@ -568,7 +566,7 @@ void ViewShell::MakeVisible( const SwRect
[Libreoffice-commits] core.git: connectivity/inc connectivity/qa connectivity/source
connectivity/inc/connectivity/FValue.hxx |5
connectivity/qa/connectivity/commontools/FValue_test.cxx | 44 +
connectivity/source/commontools/FValue.cxx | 124 ++-
3 files changed, 98 insertions(+), 75 deletions(-)
New commits:
commit 0efe5cf57e524aa197fbb57aee8a5548cb32f34a
Author: David Ostrovsky da...@ostrovsky.org
Date: Thu Feb 7 00:13:33 2013 +0100
ORowSetValue: move float and double to union
Change-Id: Ic5de8ad2cf9ef1143b1a5468e5fc5c9974aca5ec
Reviewed-on: https://gerrit.libreoffice.org/2021
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/connectivity/inc/connectivity/FValue.hxx
b/connectivity/inc/connectivity/FValue.hxx
index 3f72b41..02b4a4b 100644
--- a/connectivity/inc/connectivity/FValue.hxx
+++ b/connectivity/inc/connectivity/FValue.hxx
@@ -60,9 +60,12 @@ namespace connectivity
sal_Int64 m_nInt64;
sal_uInt64 m_uInt64;
+float m_nFloat;
+double m_nDouble;
+
rtl_uString*m_pString;
-void* m_pValue; // can contains double, etc
+void* m_pValue; // date/time/timestamp/sequence
} m_aValue;
sal_Int32 m_eTypeKind;// the database type
diff --git a/connectivity/qa/connectivity/commontools/FValue_test.cxx
b/connectivity/qa/connectivity/commontools/FValue_test.cxx
index be3024e..b460f64 100644
--- a/connectivity/qa/connectivity/commontools/FValue_test.cxx
+++ b/connectivity/qa/connectivity/commontools/FValue_test.cxx
@@ -43,6 +43,9 @@ public:
void test_Int64();
void test_uInt64();
+void test_float();
+void test_double();
+
CPPUNIT_TEST_SUITE(FValueTest);
CPPUNIT_TEST(test_Bool);
@@ -59,6 +62,9 @@ public:
CPPUNIT_TEST(test_Int64);
CPPUNIT_TEST(test_uInt64);
+CPPUNIT_TEST(test_float);
+CPPUNIT_TEST(test_double);
+
CPPUNIT_TEST_SUITE_END();
};
@@ -239,6 +245,44 @@ void FValueTest::test_uInt64()
CPPUNIT_ASSERT_MESSAGE(sal_uInt64 conversion from Any didn't work,
src_saluInt64 == trg_saluInt64);
}
+void FValueTest::test_float()
+{
+float src_float = 1.234f;
+ORowSetValue v(src_float);
+float trg_float = v.getFloat();
+
+std::cerr src_float: src_float std::endl;
+std::cerr trg_float: trg_float std::endl;
+
+CPPUNIT_ASSERT_MESSAGE(float conversion to ORowSetValue didn't work,
src_float == trg_float);
+
+Any any_float = v.makeAny();
+ORowSetValue t;
+t.fill(any_float);
+trg_float = t.getFloat();
+
+CPPUNIT_ASSERT_MESSAGE(float conversion from Any didn't work, src_float
== trg_float);
+}
+
+void FValueTest::test_double()
+{
+double src_double = 1.23456789;
+ORowSetValue v(src_double);
+double trg_double = v.getDouble();
+
+std::cerr src_double: src_double std::endl;
+std::cerr trg_double: trg_double std::endl;
+
+CPPUNIT_ASSERT_MESSAGE(double conversion to ORowSetValue didn't work,
src_double == trg_double);
+
+Any any_double = v.makeAny();
+ORowSetValue t;
+t.fill(any_double);
+trg_double = t.getDouble();
+
+CPPUNIT_ASSERT_MESSAGE(double conversion from Any didn't work,
src_double == trg_double);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(FValueTest);
}}
diff --git a/connectivity/source/commontools/FValue.cxx
b/connectivity/source/commontools/FValue.cxx
index e4580dd..fef5087 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -274,17 +274,6 @@ void ORowSetValue::free()
rtl_uString_release(m_aValue.m_pString);
m_aValue.m_pString = NULL;
break;
-case DataType::FLOAT:
-delete (float*)m_aValue.m_pValue;
-TRACE_FREE( float )
-m_aValue.m_pValue = NULL;
-break;
-case DataType::DOUBLE:
-case DataType::REAL:
-delete (double*)m_aValue.m_pValue;
-TRACE_FREE( double )
-m_aValue.m_pValue = NULL;
-break;
case DataType::DATE:
delete (::com::sun::star::util::Date*)m_aValue.m_pValue;
TRACE_FREE( Date )
@@ -320,6 +309,9 @@ void ORowSetValue::free()
case DataType::INTEGER:
case DataType::BIGINT:
case DataType::BOOLEAN:
+case DataType::FLOAT:
+case DataType::DOUBLE:
+case DataType::REAL:
break;
default:
if ( m_aValue.m_pValue )
@@ -359,15 +351,6 @@ ORowSetValue ORowSetValue::operator=(const ORowSetValue
_rRH)
rtl_uString_acquire(_rRH.m_aValue.m_pString);
m_aValue.m_pString =
[Libreoffice-commits] core.git: sw/source
sw/source/core/view/viewimp.cxx | 132 +++-
1 file changed, 10 insertions(+), 122 deletions(-)
New commits:
commit 65e0bf7c4760c51b2357d9c57dd23e6c61b116cb
Author: Winfried Donkers o...@dci-electronics.nl
Date: Fri Feb 8 16:37:09 2013 +0100
translate German comments, remove obsolete code
Change-Id: I4d6e3149f94234e2b884ab81e752805d07a63712
Reviewed-on: https://gerrit.libreoffice.org/2049
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 6b114a2..0ec764d 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -43,18 +43,10 @@
#include IDocumentDeviceAccess.hxx
#include IDocumentSettingAccess.hxx
-/*
-|*
-|* SwViewImp::Init()
-|*
-|* Ersterstellung MA 25. Jul. 94
-|* Letzte AenderungMA 03. Nov. 95
-|*
-|*/
void SwViewImp::Init( const SwViewOption *pNewOpt )
{
OSL_ENSURE( pDrawView, SwViewImp::Init without DrawView );
-//Jetzt die PageView erzeugen wenn sie noch nicht existiert.
+//Create PageView if it doesn't exist
SwRootFrm *pRoot = pSh-GetLayout();//swmod 071108//swmod 071225
if ( !pSdrPageView )
{
@@ -95,15 +87,7 @@ void SwViewImp::Init( const SwViewOption *pNewOpt )
pDrawView-SetMarkHdlSizePixel(9);
}
-/*
-|*
-|* SwViewImp::SwViewImp() CTor fuer die Core-Internas
-|*
-|* Ersterstellung MA 25. Jul. 94
-|* Letzte AenderungMA 06. Sep. 96
-|*
-|*/
-
+// SwViewImp::SwViewImp() CTor for the core internals
SwViewImp::SwViewImp( ViewShell *pParent ) :
pSh( pParent ),
pDrawView( 0 ),
@@ -118,21 +102,11 @@ SwViewImp::SwViewImp( ViewShell *pParent ) :
// OD 12.12.2002 #103492#
mpPgPrevwLayout( 0 )
{
-//bResetXorVisibility =
-//HMHbShowHdlPaint =
bResetHdlHiddenPaint =
bSmoothUpdate = bStopSmooth = bStopPrt = sal_False;
bFirstPageInvalid = sal_True;
}
-/**
-|*
-|* SwViewImp::~SwViewImp()
-|*
-|* Ersterstellung MA 25. Jul. 94
-|* Letzte AenderungMA 16. Dec. 94
-|*
-**/
SwViewImp::~SwViewImp()
{
@@ -141,7 +115,7 @@ SwViewImp::~SwViewImp()
// OD 12.12.2002 #103492#
delete mpPgPrevwLayout;
-//JP 29.03.96: nach ShowSdrPage muss auch HideSdrPage gemacht werden!!!
+//JP 29.03.96: after ShowSdrPage HideSdrPage must also be executed!!!
if( pDrawView )
pDrawView-HideSdrPage();
@@ -153,28 +127,12 @@ SwViewImp::~SwViewImp()
OSL_ENSURE( !pIdleAct,Be idle for the rest of your life. );
}
-/**
-|*
-|* SwViewImp::DelRegions()
-|*
-|* Ersterstellung MA 14. Apr. 94
-|* Letzte AenderungMA 14. Apr. 94
-|*
-**/
void SwViewImp::DelRegion()
{
DELETEZ(pRegion);
}
-/**
-|*
-|* SwViewImp::AddPaintRect()
-|*
-|* Ersterstellung MA ??
-|* Letzte AenderungMA 27. Jul. 94
-|*
-**/
sal_Bool SwViewImp::AddPaintRect( const SwRect rRect )
{
@@ -188,14 +146,6 @@ sal_Bool SwViewImp::AddPaintRect( const SwRect rRect )
return sal_False;
}
-/**
-|*
-|* ViewImp::CheckWaitCrsr()
-|*
-|* Ersterstellung MA 10. Aug. 94
-|* Letzte AenderungMA 10. Aug. 94
-|*
-**/
void SwViewImp::CheckWaitCrsr()
{
@@ -203,14 +153,6 @@ void SwViewImp::CheckWaitCrsr()
pLayAct-CheckWaitCrsr();
}
-/**
-|*
-|* ViewImp::IsCalcLayoutProgress()
-|*
-|* Ersterstellung MA 12. Aug. 94
-|* Letzte AenderungMA 12. Aug. 94
-|*
-**/
sal_Bool SwViewImp::IsCalcLayoutProgress() const
{
@@ -219,14 +161,6 @@ sal_Bool SwViewImp::IsCalcLayoutProgress() const
return sal_False;
}
-/**
-|*
-|* ViewImp::IsUpdateExpFlds()
-|*
-|* Ersterstellung MA 28. Mar. 96
-|* Letzte AenderungMA 28. Mar. 96
-|*
-**/
sal_Bool
Re: Bug 56393 - first page has different width (by default)
On Fri, Feb 8, 2013 at 5:37 PM, Caolán McNamara caol...@redhat.com wrote: On Tue, 2013-01-22 at 22:53 +0200, Lior Kaplan wrote: Hi, I'm having a weird problem with the first page width under LibO 4.0, but I can't provide any example document as the problem disappears while playing with the settings or saving the document. https://bugs.freedesktop.org/show_bug.cgi?id=56393 I can't reproduce this locally. Maybe there's some connection with the new first page headers/footers features somehow. Only thing I can think of is to see if the bibisect builds share the effect and if they do then use those to find the commit range where it appeared. Fixed by https://bugs.freedesktop.org/show_bug.cgi?id=59779 Kaplan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/table/tablecontroller.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit a00b62422e5499e842d0b3b6302ba79f3d808c27
Author: Gokul gswaminat...@kacst.edu.sa
Date: Sat Feb 2 15:29:56 2013 +0300
Fixes fdo#46186, The Table Remains in the defined writing mode.
The table in impress is drawn under the rectangular are, on Selecting
the table it was only selecting the rectangular area and not the cells
inside, Making the layout to be as RTL which was mirroring the table.
But, We need the table to be in RTL Writing mode and not mirroring the
table. Now on applying my patch, If table is selected, it will select
the entire cells inside which is the actual table and the functionality
works fine.
Change-Id: I9d6bdde5019322488be66fa89a6488d348b2cf44
Reviewed-on: https://gerrit.libreoffice.org/1964
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
diff --git a/svx/source/table/tablecontroller.cxx
b/svx/source/table/tablecontroller.cxx
index 9368675..e0a7ce7 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -366,6 +366,13 @@ void SvxTableController::onSelectionHasChanged()
const SdrMarkList rMarkList= mpView-GetMarkedObjectList();
if( rMarkList.GetMarkCount() == 1 )
bSelected = mxTableObj.get() ==
rMarkList.GetMark(0)-GetMarkedSdrObj();
+/* fdo#46186 Selecting the table means selecting the entire cells */
+if(!hasSelectedCells())
+{
+maCursorFirstPos = pTableObj-getFirstCell();
+maCursorLastPos = pTableObj-getLastCell();
+mbCellSelectionMode=true;
+}
}
if( bSelected )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: src/lib
src/lib/CDRContentCollector.cpp |2 +-
src/lib/libcdr_utils.cpp|4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 238768aed4dbd1ae3d679dbd09014c34de2afe03
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Feb 9 14:13:08 2013 +0100
Some cppcheck cleaning
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 7b7d267..00c0af4 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -239,11 +239,11 @@ void libcdr::CDRContentCollector::_flushCurrentPath()
WPXPropertyListVector::Iter i(path);
for (i.rewind(); i.next();)
{
- bool ignoreM = false;
if (!i()[libwpg:path-action])
continue;
if (i()[svg:x] i()[svg:y])
{
+bool ignoreM = false;
x = i()[svg:x]-getDouble();
y = i()[svg:y]-getDouble();
if (firstPoint)
diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp
index 0b9d6f9..5d9fa81 100644
--- a/src/lib/libcdr_utils.cpp
+++ b/src/lib/libcdr_utils.cpp
@@ -333,7 +333,7 @@ void libcdr::writeU8(WPXBinaryData buffer, const int value)
void libcdr::appendCharacters(WPXString text, std::vectorunsigned char
characters, unsigned short charset)
{
- if (!characters.size())
+ if (characters.empty())
return;
static const unsigned short symbolmap [] =
{
@@ -367,7 +367,7 @@ void libcdr::appendCharacters(WPXString text,
std::vectorunsigned char charac
0x23A0, 0x23A4, 0x23A5, 0x23A6, 0x23AB, 0x23AC, 0x23AD, 0x0020 // .. 0xFE
};
- if (!charset characters.size())
+ if (!charset !characters.empty())
charset = getEncoding(characters[0], characters.size());
if (charset == 0x02) // SYMBOL
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/source sw/uiconfig
sw/source/core/docnode/ndsect.cxx |2 +-
sw/uiconfig/swriter/ui/titlepage.ui |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 76a70fe843640949b9fb97278c8f018cf67e130e
Author: Caolán McNamara caol...@redhat.com
Date: Sat Feb 9 13:34:46 2013 +
fix build
Change-Id: I410479392141d10688edf16115309ccc4c1edad1
diff --git a/sw/source/core/docnode/ndsect.cxx
b/sw/source/core/docnode/ndsect.cxx
index 5610c40..42983c9 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1016,7 +1016,7 @@ SwFrm* SwClearDummies( SwFrm* pFrm )
if( !pSectFrm-GetLower() )
{
if( pSectFrm-GetPrev() )
-pSectFrm-GetPrev()-pNext = pTmp;
+pSectFrm-GetPrev()-mpNext = pTmp;
else
pFrm = pTmp;
if( pTmp )
commit 74e64514bb53c7e5ff6fc7b90b629c28121d40f0
Author: Caolán McNamara caol...@redhat.com
Date: Fri Feb 8 15:53:35 2013 +
standardize on 6 pixel padding
Change-Id: I5b10bd0bd3376ecf7cf204d4a4a1567ba1a5e9e5
diff --git a/sw/uiconfig/swriter/ui/titlepage.ui
b/sw/uiconfig/swriter/ui/titlepage.ui
index ff40c75..e4f8e7f 100644
--- a/sw/uiconfig/swriter/ui/titlepage.ui
+++ b/sw/uiconfig/swriter/ui/titlepage.ui
@@ -10,7 +10,7 @@
/object
object class=GtkDialog id=DLG_TITLEPAGE
property name=can_focusFalse/property
-property name=border_width5/property
+property name=border_width6/property
property name=title translatable=yesTitle Page/property
property name=type_hintdialog/property
child internal-child=vbox
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Make help
Dear Developers, I'm trying to build LibreOffice, downloaded whit Git. I'm a trainee in Hugary. I get this error with make: ... [build CXX] UnpackedTarball/graphite/src/TtfUtil.cxx [build CXX] UnpackedTarball/graphite/src/UtfCodec.cxx [build LNK] StaticLibrary/libcodemaker_java.a [build JCS] Jar/unoloader [build C ] bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c [build C ] bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c [build PAT] beanshell javac: error: unrecognized command line option ‘-source’ javac: error: 1.5: No such file or directory javac: error: unrecognized command line option ‘-target’ javac: error: 1.5: No such file or directory make[1]: *** [/home/stalker08/git/libo/workdir/ unxlngi6.pro/JavaClassSet/Jar/unoloader/done] Error 1 make[1]: *** Waiting for unfinished jobs --- Oh dear - something failed during the build - sorry ! For more help with debugging build errors, please see the section in: http://wiki.documentfoundation.org/Development internal build errors: ERROR: error 512 occurred while making /home/stalker08/git/libo/tail_build/prj it seems that the error is inside 'tail_build', please re-run build inside this module to isolate the error and/or test your fix. --- To rebuild a specific module: make tail_build.clean # not recommended, this will re-build almost everything make tail_build when the problem is isolated and fixed, re-run 'make' make: *** [build-postprocess] Error 1 stalker08@linux-1u9f:~/git/libo make tail_build And then the following: stalker08@linux-1u9f:~/git/libo make tail_build cd tail_build make -j 6 -rs [build LNK] Executable/bestreversemap [build LNK] Library/libsal_textenc.so [build JCS] Jar/unoloader [build LNK] Library/libofficebean.so javac: error: unrecognized command line option ‘-source’ javac: error: 1.5: No such file or directory javac: error: unrecognized command line option ‘-target’ javac: error: 1.5: No such file or directory make[1]: *** [/home/stalker08/git/libo/workdir/ unxlngi6.pro/JavaClassSet/Jar/unoloader/done] Error 1 make: *** [tail_build] Error 2 stalker08@linux-1u9f:~/git/libo My system is: stalker08@linux-1u9f:~/git/libo uname -a Linux linux-1u9f.site 3.4.6-2.10-desktop #1 SMP PREEMPT Thu Jul 26 09:36:26 UTC 2012 (641c197) i686 i686 i386 GNU/Linux OpenSUSE 11.2 running in VirtualBox on a Win7 host. What should I do? G. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scp2/source
scp2/source/ooo/common_brand.scp | 17 -- scp2/source/ooo/module_hidden_ooo.scp| 79 +-- scp2/source/ooo/module_lang_template.scp |4 - 3 files changed, 3 insertions(+), 97 deletions(-) New commits: commit a05e96ff0ec64a57e7a8faf0e29128898e234dce Author: Andras Timar ati...@suse.com Date: Sat Feb 9 16:16:59 2013 +0100 scp2: remove unused gids Change-Id: I7e59c571ba59981f6fef33f437f2074dcb42cb5f diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 33e745b..d77d143 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -38,9 +38,6 @@ Module gid_Module_Root_Brand PackageInfo = packinfo_brand.txt; Dirs = (gid_Brand_Dir_Program, gid_Brand_Dir_Share, -gid_Brand_Dir_Share_C05, -gid_Brand_Dir_Share_C05_Rgt, -gid_Brand_Dir_Share_C05_Faq, gid_Brand_Dir_Share_Config, gid_Brand_Dir_Share_Extensions, gid_Brand_Dir_Share_Uno_Packages, @@ -61,12 +58,6 @@ Module gid_Module_Root_Brand gid_Brand_File_Bin_Unopkg, gid_Brand_File_Bin_Libxml2, gid_Brand_File_Bmp_IntroAboutShell, - gid_Brand_File_C05_Zip_Faq, - gid_Brand_File_C05_Zip_Register, - gid_Brand_File_C05_Htm_Faq, - gid_Brand_File_C05_Htm_Rgt, - gid_Brand_File_C05_Pdf_Gettingstartedguide, - gid_Brand_File_C05_Exe_Suptool, gid_Brand_File_Desktophelper_Txt, gid_Brand_File_Html_Thirdpartylicensereadme, gid_Brand_File_Images_Brand_Zip, @@ -76,11 +67,8 @@ Module gid_Module_Root_Brand gid_Brand_File_Lib_Msvcr80, gid_Brand_File_Lib_Msvcp80, gid_Brand_File_Lib_Msvcm80, -gid_Brand_File_Lib_Oirm, -gid_Brand_File_Lib_Oirm2, gid_Brand_File_Msvcm80crt_Manifest, gid_Brand_File_Lib_Npsoplugin, - gid_Brand_File_Lib_Subscrib_C05, gid_Brand_File_Share_Registry_O5oo_Xcd, gid_Brand_File_Script_Unopkg, gid_Brand_File_Share_Xdg_Base, @@ -117,11 +105,6 @@ Module gid_Module_Langpack_Brand_Template gid_Brand_Dir_Readme); Files = (gid_Brand_File_Res_Iso, gid_Brand_File_Res_Ooo, - gid_Brand_File_Res_Oirm, - gid_Brand_File_Help_C05_Sdatabase_Zip, - gid_Brand_File_Help_C05_Scalc_Zip, - gid_Brand_File_Help_C05_Sdraw_Zip, - gid_Brand_File_Help_C05_Swriter_Zip, gid_Brand_File_Readme_Readme, gid_Brand_File_Share_Registry_Cjk_Xcd, gid_Brand_File_Share_Registry_Korea_Xcd, diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 0efe8b6..c3e6035 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -93,38 +93,25 @@ Module gid_Module_Root_Files_2 gid_File_Bin_Tde_Open_Url, gid_File_Bin_Kde_Open_Url, gid_File_Bin_Open_Url, - gid_File_Bin_Pagein, gid_File_Bin_Pluginapp, gid_File_Bin_Senddoc, gid_File_Bin_Gengal, gid_File_Script_Gengal, - gid_File_Profile_Gengal, gid_File_Bin_Spadmin_Bin, gid_File_Bin_Uri_Encode, gid_File_Bin_UIPreviewer, gid_File_Exe_Nsplugin, - gid_File_Lib_Npsoplugin, gid_File_Lib_Soffice, gid_File_Lib_Unopkgapp, - gid_File_Server_Bonobo_Presentationstarter, gid_File_Txt_Pagein_Common, gid_File_Txt_Pagein_Calc, gid_File_Txt_Pagein_Draw, gid_File_Txt_Pagein_Impress, gid_File_Txt_Pagein_Writer, - gid_File_Txt_Patchfiles, - gid_File_Bmp_Installation, gid_File_Shellnew_Ods_Soffice, gid_File_Shellnew_Odg_Soffice, gid_File_Shellnew_Odp_Soffice, - gid_File_Shellnew_Odt_Soffice, - gid_File_Exe_Java, - gid_File_Exe_Userinst, - gid_File_Exe_Userdeinst, - gid_File_Regcleanold, - gid_File_Exe_Regdeinstall, - gid_File_Tmp_Inf_Oldreg, - gid_File_Tmp_Userinstall_Inf); + gid_File_Shellnew_Odt_Soffice); End Module gid_Module_Root_Files_3 @@ -146,24 +133,14 @@ Module gid_Module_Root_Files_3 gid_File_Jar_Table, gid_File_Jar_Letter, gid_File_Jar_Form, - gid_File_Jar_Fax, gid_File_Wizards_Common, - gid_File_Wizards_Event, gid_File_Wizards_Fax, gid_File_Jar_Agenda, gid_File_Jar_Web, gid_File_Jar_Query, gid_File_Jar_Commonwizards, - gid_File_Jar_Sandbox, gid_File_Jar_Scriptframework, gid_File_Jar_Scriptproviderforjava, - gid_File_Jar_Xml_Apis, - gid_File_Jar_Classes, - gid_File_Jar_Xsltfilter, - gid_File_Jar_Xsltvalidate, -
Re: Make help
Hi Gergo, On Sat, 2013-02-09 at 16:12 +0100, Gergő Mocsi wrote: I'm trying to build LibreOffice, downloaded whit Git. I'm a trainee in Hugary. I get this error with make: Fun ! :-) so - I suspect that (unless you're hacking with some Java stuff) that if you add: --without-java to your autogen.lastrun you'll avoid the problem in the first instance. There should be no huge need for compiling with Java these days I think. Failing that - it looks like you don't have the right java installed and/or your javac is behaving oddly :-) Potentially some update-alternatives selection of a newer JVM, and/or logging out in again (in SUSE having installed the right Java is/was necessary to get JAVA_HOME into the environment in the deep past) might help. Hope that helps ! :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 vulc...@gmx.com changed: What|Removed |Added Depends on||59629 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/ui/index/cnttab.cxx | 84 +++---
sw/source/ui/index/swuiidxmrk.cxx | 26 +--
sw/source/ui/lingu/hhcwrp.cxx |2
sw/source/ui/lingu/olmenu.cxx |8 +--
4 files changed, 60 insertions(+), 60 deletions(-)
New commits:
commit 2dd4ac609461b9011748d29a7251d5c0c685d60d
Author: Takeshi Abe t...@fixedpoint.jp
Date: Sun Feb 10 00:37:40 2013 +0900
sal_Bool to bool
Change-Id: I4e1c0136798c8666517ee42407484dbd9b364880
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 71536a8..5702bd3 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -92,7 +92,7 @@ static const sal_Unicode aDeliEnd= ']'; // for the form
#define IDX_FILE_EXTENSION rtl::OUString(*.sdi)
static String lcl_CreateAutoMarkFileDlg( const String rURL,
-const String rFileString, sal_Bool bOpen )
+const String rFileString, bool bOpen )
{
String sRet;
@@ -162,10 +162,10 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base
::svt::CellControllerRefxCheckController;
longnCurrentRow;
-sal_BoolbModified;
+boolbModified;
-voidSetModified() {bModified = sal_True;}
+voidSetModified() {bModified = true;}
protected:
virtual sal_BoolSeekRow( long nRow );
@@ -197,12 +197,12 @@ class SwAutoMarkDlg_Impl : public ModalDialog
String sAutoMarkURL;
const StringsAutoMarkType;
-sal_BoolbCreateMode;
+boolbCreateMode;
DECL_LINK(OkHdl, void *);
public:
SwAutoMarkDlg_Impl(Window* pParent, const String rAutoMarkURL,
-const String rAutoMarkType, sal_Bool bCreate);
+const String rAutoMarkType, bool bCreate);
~SwAutoMarkDlg_Impl();
};
@@ -1554,17 +1554,17 @@ IMPL_LINK(SwTOXSelectTabPage, MenuExecuteHdl, Menu*,
pMenu)
{
case MN_AUTOMARK_OPEN:
sAutoMarkURL = lcl_CreateAutoMarkFileDlg(
-sAutoMarkURL, sAutoMarkType, sal_True);
+sAutoMarkURL, sAutoMarkType, true);
break;
case MN_AUTOMARK_NEW :
sAutoMarkURL = lcl_CreateAutoMarkFileDlg(
-sAutoMarkURL, sAutoMarkType, sal_False);
+sAutoMarkURL, sAutoMarkType, false);
if( !sAutoMarkURL.Len() )
break;
//no break
case MN_AUTOMARK_EDIT:
{
-sal_Bool bNew = pMenu-GetCurItemId()== MN_AUTOMARK_NEW;
+bool bNew = pMenu-GetCurItemId()== MN_AUTOMARK_NEW;
SwAutoMarkDlg_Impl* pAutoMarkDlg = new SwAutoMarkDlg_Impl(
aAutoMarkPB, sAutoMarkURL, sAutoMarkType, bNew );
@@ -1582,14 +1582,14 @@ class SwTOXEdit : public Edit
{
SwFormToken aFormToken;
LinkaPrevNextControlLink;
- sal_Bool bNextControl;
+bool bNextControl;
SwTokenWindow* m_pParent;
public:
SwTOXEdit( Window* pParent, SwTokenWindow* pTokenWin,
const SwFormToken aToken)
: Edit( pParent, WB_BORDER|WB_TABSTOP|WB_CENTER),
aFormToken(aToken),
-bNextControl(sal_False),
+bNextControl(false),
m_pParent( pTokenWin )
{
SetHelpId( HID_TOX_ENTRY_EDIT );
@@ -1598,7 +1598,7 @@ public:
virtual voidKeyInput( const KeyEvent rKEvt );
virtual voidRequestHelp( const HelpEvent rHEvt );
-sal_BoolIsNextControl() const {return bNextControl;}
+boolIsNextControl() const {return bNextControl;}
void SetPrevNextLink( const Link rLink ) {aPrevNextControlLink = rLink;}
const SwFormToken GetFormToken()
@@ -1629,17 +1629,17 @@ voidSwTOXEdit::KeyInput( const KeyEvent rKEvt )
if((rSel.A() == rSel.B()
!rSel.A()) || rSel.A() == (sal_uInt16)nTextLen )
{
-sal_Bool bCall = sal_False;
+bool bCall = false;
KeyCode aCode = rKEvt.GetKeyCode();
if(aCode.GetCode() == KEY_RIGHT rSel.A() == nTextLen)
{
-bNextControl = sal_True;
-bCall = sal_True;
+bNextControl = true;
+bCall = true;
}
else if(aCode.GetCode() == KEY_LEFT !rSel.A() )
{
-bNextControl = sal_False;
-bCall = sal_True;
+bNextControl = false;
+bCall = true;
}
if(bCall aPrevNextControlLink.IsSet())
@@ -1662,14 +1662,14 @@ class SwTOXButton : public PushButton
{
SwFormToken aFormToken;
LinkaPrevNextControlLink;
-sal_BoolbNextControl;
+boolbNextControl;
SwTokenWindow* m_pParent;
public:
SwTOXButton( Window* pParent, SwTokenWindow* pTokenWin,
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Joel Madero jmadero@gmail.com changed: What|Removed |Added Depends on|59629 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - compilerplugins/clang compilerplugins/README solenv/gbuild starmath/qa
compilerplugins/README |9 +
compilerplugins/clang/pluginhandler.cxx | 109 ++--
compilerplugins/clang/pluginhandler.hxx |3
solenv/gbuild/LinkTarget.mk | 15 +--
solenv/gbuild/platform/com_GCC_defs.mk |3
starmath/qa/cppunit/test_nodetotextvisitors.cxx |8 -
starmath/qa/cppunit/test_starmath.cxx |3
7 files changed, 110 insertions(+), 40 deletions(-)
New commits:
commit 857a39265452c23d4769e6d729ae4c30e44b2973
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Sat Feb 9 18:47:55 2013 +0100
make it possible to limit what files will be modified by a compiler plugin
Change-Id: I4e3e8f5ca5e5b5b59b1bd067281f90940dd893b1
diff --git a/compilerplugins/README b/compilerplugins/README
index 52e34b9..a9881c7 100644
--- a/compilerplugins/README
+++ b/compilerplugins/README
@@ -35,8 +35,15 @@ All warnings and errors are marked '[loplugin]' in the
message.
Rewriters analyse and possibly modify given source files.
Usage: make COMPILER_PLUGIN_TOOL=rewriter_name
-It is possible to also pass FORCE_COMPILE_ALL=1 to make to trigger rebuild of
all source files,
-even those that are up to date.
+Additional optional make arguments:
+- it is possible to also pass FORCE_COMPILE_ALL=1 to make to trigger rebuild
of all source files,
+even those that are up to date.
+- UPDATE_FILES=scope - limits which modified files will be actually written
back with the changes
+- mainfile - only the main .cxx file will be modifed (default)
+- all - all source files involved will be modified (possibly even header
files from other LO modules),
+3rd party header files are however never modified
+- module - only files in the given LO module (toplevel directory) will
be modified (including headers)
+
Modifications will be written directly to the source files.
diff --git a/compilerplugins/clang/pluginhandler.cxx
b/compilerplugins/clang/pluginhandler.cxx
index 468587e..0d27ff67 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -13,6 +13,7 @@
#include clang/Frontend/CompilerInstance.h
#include clang/Frontend/FrontendPluginRegistry.h
#include stdio.h
+#include sys/stat.h
#include unistd.h
/*
@@ -38,29 +39,24 @@ static bool pluginObjectsCreated = false;
PluginHandler::PluginHandler( ASTContext context, const vector string
args )
: context( context )
, rewriter( context.getSourceManager(), context.getLangOpts())
+, scope( mainfile )
{
-bool wasCreated = false;
-for( int i = 0;
- i pluginCount;
- ++i )
+bool wasPlugin = false;
+for( vector string ::const_iterator it = args.begin();
+ it != args.end();
+ ++it )
{
-bool create = false;
-if( args.empty()) // no args - create non-writer plugins
-create = !plugins[ i ].isRewriter;
-else // create only the given plugin(s)
-{
-if( find( args.begin(), args.end(), plugins[ i ].optionName ) !=
args.end())
-create = true;
-}
-if( create )
+if( it-size() = 2 (*it)[ 0 ] == '-' (*it)[ 1 ] == '-' )
+handleOption( it-substr( 2 ));
+else
{
-plugins[ i ].object = plugins[ i ].create( context, rewriter );
-wasCreated = true;
+createPlugin( *it );
+wasPlugin = true;
}
}
+if( !wasPlugin )
+createPlugin( ); // = all non-rewriters
pluginObjectsCreated = true;
-if( !args.empty() !wasCreated )
-report( DiagnosticsEngine::Fatal, unknown plugin tool %0 )
args.front();
}
PluginHandler::~PluginHandler()
@@ -72,6 +68,45 @@ PluginHandler::~PluginHandler()
delete plugins[ i ].object;
}
+void PluginHandler::handleOption( const string option )
+{
+if( option.substr( 0, 6 ) == scope= )
+{
+scope = option.substr( 6 );
+if( scope == mainfile || scope == all )
+; // ok
+else
+{
+struct stat st;
+if( stat(( SRCDIR / + scope ).c_str(), st ) != 0 || !S_ISDIR(
st.st_mode ))
+report( DiagnosticsEngine::Fatal, unknown scope %0 (no such
module directory) ) scope;
+}
+}
+else
+report( DiagnosticsEngine::Fatal, unknown option %0 ) option;
+}
+
+void PluginHandler::createPlugin( const string name )
+{
+for( int i = 0;
+ i pluginCount;
+ ++i )
+{
+if( name.empty()) // no plugin given - create non-writer plugins
+{
+if( !plugins[ i ].isRewriter )
+plugins[ i ].object = plugins[ i ].create( context, rewriter );
+}
+else if( plugins[ i ].optionName == name )
+{
+plugins[ i ].object = plugins[ i ].create( context,
Re: Make help
On Saturday 09 of February 2013, Gergő Mocsi wrote: Dear Developers, I'm trying to build LibreOffice, downloaded whit Git. I'm a trainee in Hugary. I get this error with make: ... [build CXX] UnpackedTarball/graphite/src/TtfUtil.cxx [build CXX] UnpackedTarball/graphite/src/UtfCodec.cxx [build LNK] StaticLibrary/libcodemaker_java.a [build JCS] Jar/unoloader [build C ] bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c [build C ] bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c [build PAT] beanshell javac: error: unrecognized command line option ‘-source’ javac: error: 1.5: No such file or directory javac: error: unrecognized command line option ‘-target’ javac: error: 1.5: No such file or directory make[1]: *** [/home/stalker08/git/libo/workdir/ unxlngi6.pro/JavaClassSet/Jar/unoloader/done] Error 1 make[1]: *** Waiting for unfinished jobs Running 'make VERBOSE=1' will show you also the executed commands, so you can find the failing one and debug what the problem is. -- Lubos Lunak l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac g
config_host.mk.in |1 +
configure.ac | 19 +++
g | 16 +++-
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 803137f4715ee7ab127a9718ca213db252193398
Author: Miklos Vajna vmik...@suse.cz
Date: Sat Feb 9 19:09:32 2013 +0100
configure: add --with-referenced-git option
This is similar to --with-linked-git, but:
1) It uses git submodule update --reference, so it works with submodules.
2) The created repo is a true git repo, except that its object database
reuses the referenced repo's objects, so it's a real speedup when e.g.
translations are enabled.
I intentionally didn't just fixed --with-linked-git, to make it clear
this is more like git clone --reference, not git-new-workdir.
Change-Id: I7c9584bce3670fd1e175b90aded2435cfe78056d
diff --git a/config_host.mk.in b/config_host.mk.in
index fc46a76..4f5d2e4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -189,6 +189,7 @@ export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
export GIT_LINK_SRC=@GIT_LINK_SRC@
+export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
export GNOMEVFS_CFLAGS=$(gb_SPACE)@GNOMEVFS_CFLAGS@
export GNOMEVFS_LIBS=$(gb_SPACE)@GNOMEVFS_LIBS@
diff --git a/configure.ac b/configure.ac
index da60c50..723998f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1202,6 +1202,14 @@ AC_ARG_WITH(linked-git,
GIT_LINK_SRC=$withval ,
)
+AC_ARG_WITH(referenced-git,
+AS_HELP_STRING([--with-referenced-git=OTHER_CHECKOUT_DIR],
+[Specify another checkout directory to reference. This makes use of
+ git submodule update --reference, and saves a lot of diskspace
+ when having multiple trees side-by-side.]),
+GIT_REFERENCE_SRC=$withval ,
+)
+
AC_ARG_WITH(vba-package-format,
AS_HELP_STRING([--with-vba-package-format],
[Specify package format for vba compatibility api. Specifying
builtin
@@ -11915,6 +11923,17 @@ if test -n ${GIT_LINK_SRC}; then
fi
AC_SUBST(GIT_LINK_SRC)
+dnl git submodule update --reference
+dnl ===
+if test -n ${GIT_REFERENCE_SRC}; then
+for repo in ${GIT_NEEDED_SUBMODULES}; do
+if ! test -d ${GIT_REFERENCE_SRC}/${repo}; then
+AC_MSG_ERROR([referenced git: required repository does not exist:
${GIT_REFERENCE_SRC}/${repo}])
+fi
+done
+fi
+AC_SUBST(GIT_REFERENCE_SRC)
+
dnl branding
dnl ===
AC_MSG_CHECKING([for alternative branding images directory])
diff --git a/g b/g
index 0b322ed..f086149 100755
--- a/g
+++ b/g
@@ -146,6 +146,14 @@ get_configured_submodules()
fi
}
+get_git_reference()
+{
+REFERENCED_GIT=
+if [ -f config_host.mk ]; then
+ REFERENCED_GIT=$(cat config_host.mk | grep GIT_REFERENCE_SRC | sed -e
s/.*=//)
+fi
+}
+
do_shortcut_update()
{
local module
@@ -246,6 +254,11 @@ local configured
git submodule init $module || return $?
fi
done
+if [ -n $REFERENCED_GIT ] ; then
+for module in $SUBMODULES_CONFIGURED ; do
+git submodule update --reference
$REFERENCED_GIT/.git/modules/$module $module || return $?
+done
+fi
return 0
}
@@ -263,6 +276,7 @@ fi
get_active_submodules
get_configured_submodules
+get_git_reference
@@ -319,7 +333,7 @@ case $COMMAND in
do_checkout $@
;;
clone)
- do_init_modules git submodule update refresh_all_hooks
+ do_init_modules refresh_all_hooks
;;
fetch)
(git fetch $@ git submodule foreach git fetch $@ ) git
submodule update
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
make accessibility failed
ubuntu 12.10 $ make accessibility Makefile:76: [WARN ] !!![WARN ] !!! The following modules claim to be both dmake and gbuild: *[WARN ] !!! Makefile:139: warning: overriding commands for target `aclocal.m4' Makefile:137: warning: ignoring old commands for target `aclocal.m4' Makefile:139: warning: overriding commands for target `autogen.lastrun' Makefile:137: warning: ignoring old commands for target `autogen.lastrun' Makefile:139: warning: overriding commands for target `autogen.lastrun.bak' Makefile:137: warning: ignoring old commands for target `autogen.lastrun.bak' Makefile:139: warning: overriding commands for target `autom4te.cache' Makefile:137: warning: ignoring old commands for target `autom4te.cache' Makefile:139: warning: overriding commands for target `config_host' Makefile:137: warning: ignoring old commands for target `config_host' Makefile:139: warning: overriding commands for target `config_host.mk' Makefile:137: warning: ignoring old commands for target `config_host.mk' Makefile:139: warning: overriding commands for target `config_host.mk.stamp' Makefile:137: warning: ignoring old commands for target `config_host.mk.stamp' Makefile:139: warning: overriding commands for target `config.log' Makefile:137: warning: ignoring old commands for target `config.log' Makefile:139: warning: overriding commands for target `config.status' Makefile:137: warning: ignoring old commands for target `config.status' Makefile:139: warning: overriding commands for target `configure' Makefile:137: warning: ignoring old commands for target `configure' Makefile:139: warning: overriding commands for target `configure.ac' Makefile:137: warning: ignoring old commands for target `configure.ac' Makefile:139: warning: overriding commands for target `g' Makefile:137: warning: ignoring old commands for target `g' Makefile:139: warning: overriding commands for target `instsetoo_native' Makefile:137: warning: ignoring old commands for target `instsetoo_native' Makefile:139: warning: overriding commands for target `lo.xcent' Makefile:137: warning: ignoring old commands for target `lo.xcent' Makefile:139: warning: overriding commands for target `Makefile' Makefile:137: warning: ignoring old commands for target `Makefile' Makefile:139: warning: overriding commands for target `solenv' Makefile:137: warning: ignoring old commands for target `solenv' Makefile:139: warning: overriding commands for target `workdir' Makefile:137: warning: ignoring old commands for target `workdir' Makefile:139: warning: overriding commands for target `*.all' Makefile:137: warning: ignoring old commands for target `*.all' Makefile:139: warning: overriding commands for target `*.deliver' Makefile:137: warning: ignoring old commands for target `*.deliver' Makefile:139: warning: overriding commands for target `*.clean' Makefile:137: warning: ignoring old commands for target `*.clean' cd /home/nadav/projects/lo-core/* unset MAKEFLAGS /home/nadav/projects/lo-core/solenv/bin/build.pl -P4 -- -P4 = (1/1) Building module accessibility = Entering /home/nadav/projects/lo-core/accessibility/prj --- force_dmake_to_error Error: No makefile.mk found! --- dmake: Error executing 'force_dmake_to_error': No such file or directory dmake: Error code -1, while making 'no_traget' --- Oh dear - something failed during the build - sorry ! For more help with debugging build errors, please see the section in: http://wiki.documentfoundation.org/Development internal build errors: ERROR: error 65280 occurred while making /home/nadav/projects/lo-core/accessibility/prj it seems that the error is inside 'accessibility', please re-run build inside this module to isolate the error and/or test your fix. --- To rebuild a specific module: make accessibility.clean # optional make accessibility when the problem is isolated and fixed, re-run 'make' make: *** [Makefile] Error 1 -- http://nadavvin.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: make accessibility failed
On 09/02/13 20:13, Nadav Vinik wrote: ubuntu 12.10 $ make accessibility Makefile:76: [WARN ] !!![WARN ] !!! The following modules claim to be both dmake and gbuild: *[WARN ] !!! = (1/1) Building module accessibility = Entering /home/nadav/projects/lo-core/accessibility/prj --- force_dmake_to_error Error: No makefile.mk http://makefile.mk found! this problem should be fixed since some weeks ago with commit 11199dd01b909d75e97df9617cc5bbb71c43fe3c are you building an older master revision? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vote/2012-mc vote/2013-confpoll
vote/2012-mc/votes.blt | 100 +++ vote/2013-confpoll/votes.blt | 99 ++ 2 files changed, 199 insertions(+) New commits: commit 6cf33bb677df1cdf8e8166ed5197e9c3d2310445 Author: Thorsten Behrens tbehr...@suse.com Date: Sat Feb 9 22:36:00 2013 +0100 Sticking ballot files to git for archival diff --git a/vote/2012-mc/votes.blt b/vote/2012-mc/votes.blt new file mode 100644 index 000..5b90d7b --- /dev/null +++ b/vote/2012-mc/votes.blt @@ -0,0 +1,100 @@ +8 7 +1 2 8 4 1 5 3 7 0 +1 7 4 2 8 6 1 3 0 +1 6 7 4 2 5 3 8 0 +1 2 6 7 4 3 1 5 0 +1 2 6 5 4 7 3 8 0 +1 2 4 5 7 6 3 8 0 +1 8 2 5 4 6 7 3 0 +1 6 1 2 5 7 4 3 0 +1 2 4 6 7 0 +1 2 8 0 +1 1 2 3 4 5 6 7 0 +1 2 4 7 6 5 8 3 0 +1 2 0 +1 6 7 4 3 2 5 0 +1 3 5 7 0 +1 2 7 4 8 6 1 5 0 +1 7 6 3 1 0 +1 2 4 7 5 8 1 3 0 +1 4 5 6 7 2 3 8 0 +1 2 4 6 7 5 8 1 0 +1 6 7 2 4 5 3 1 0 +1 1 6 2 3 7 8 5 0 +1 2 7 3 4 8 6 1 0 +1 1 2 6 3 5 7 4 0 +1 7 6 8 4 5 2 1 0 +1 1 2 4 5 6 0 +1 3 8 2 0 +1 6 7 5 2 4 0 +1 1 6 5 0 +1 2 4 6 5 3 8 7 0 +1 6 7 5 4 2 0 +1 6 2 4 5 1 7 3 0 +1 8 0 +1 5 0 +1 7 4 6 2 3 0 +1 2 8 4 0 +1 2 6 4 7 1 3 5 0 +1 2 6 8 7 4 0 +1 5 2 7 1 0 +1 6 7 2 4 0 +1 7 4 3 6 2 8 5 0 +1 3 2 6 4 7 5 8 0 +1 5 7 2 8 4 0 +1 3 8 5 0 +1 6 5 4 0 +1 8 2 4 5 6 1 7 0 +1 3 4 2 8 7 6 5 0 +1 6 7 0 +1 1 6 7 3 2 8 5 0 +1 4 5 6 7 2 0 +1 6 7 2 4 8 3 1 0 +1 6 7 4 2 3 1 8 0 +1 2 6 7 4 5 8 1 0 +1 3 4 7 1 6 2 0 +1 7 6 2 0 +1 6 7 5 8 2 4 1 0 +1 2 7 4 6 5 3 1 0 +1 2 5 1 4 3 7 6 0 +1 6 7 4 5 3 8 2 0 +1 1 5 2 4 7 8 3 0 +1 4 7 6 0 +1 6 7 2 4 3 5 8 0 +1 2 3 5 8 7 4 6 0 +1 8 2 5 7 3 1 6 0 +1 8 4 2 3 6 7 5 0 +1 5 2 7 8 1 4 3 0 +1 2 8 3 1 4 6 5 0 +1 2 4 7 6 8 5 3 0 +1 2 8 4 1 0 +1 3 2 0 +1 5 6 7 4 2 8 3 0 +1 6 7 2 8 4 1 3 0 +1 4 7 8 3 0 +1 8 4 2 5 6 7 1 0 +1 2 0 +1 6 7 5 2 4 0 +1 7 6 2 3 4 5 8 0 +1 7 4 2 0 +1 6 7 2 0 +1 6 7 4 2 5 8 3 0 +1 2 1 7 8 4 0 +1 8 0 +1 2 4 1 0 +1 4 6 5 2 8 1 7 0 +1 6 7 4 8 5 2 0 +1 6 7 2 8 4 5 1 0 +1 6 4 2 0 +1 6 4 7 2 3 5 8 0 +1 4 5 7 6 0 +0 +David Emmerich Jourdain +Sophie Gautier +Leif Lodahl +Cor Nouws +Simon Phipps +Fridrich Å trba +Eike Rathke +Jean Weber +2012 Membership Committee election diff --git a/vote/2013-confpoll/votes.blt b/vote/2013-confpoll/votes.blt new file mode 100644 index 000..06a9674 --- /dev/null +++ b/vote/2013-confpoll/votes.blt @@ -0,0 +1,99 @@ +2 1 +1 2 0 +1 1 0 +1 2 0 +1 1 0 +1 0 +1 2 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 0 +1 2 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 2 0 +1 0 +1 2 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 1 0 +1 1 0 +1 2 0 +1 2 0 +1 2 0 +1 2 0 +1 1 0 +1 2 0 +1 2 0 +1 2 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 1 0 +1 2 0 +1 2 0 +1 2 0 +1 1 0 +0 +Milano, Italy +Montreal, Canada +LibOCon 2013 location poll ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH libreoffice-4-0] fdo#59953 RTF import: fix unreadable graphic and nested cell...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2044
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/2044/1
fdo#59953 RTF import: fix unreadable graphic and nested cell contents
There were two issues here:
1) c3b0f13546b30e5db3aecd311c7178e4e0933208 added a mechanism to work
around broken documents, but that didn't deal with nested tables.
Additionally, the check compared the max row width with the width of the
last cell, not the last row.
2) d276d3f3ae112a11c8cb5768650d147cbb94275e cleaned up implicit
horizontal merge detection, but didn't deal with valid documents, where
each row definition is available twice.
(cherry picked from commit e15f9ceafdf6e8b21cd315936ab44edfa91dd8b2)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I1a32ec2fcb0d1a8fca7a7bd26501d3daf17880c9
---
A sw/qa/extras/rtfimport/data/fdo59953.rtf
M sw/qa/extras/rtfimport/rtfimport.cxx
M writerfilter/source/dmapper/DomainMapperTableManager.cxx
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
4 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/sw/qa/extras/rtfimport/data/fdo59953.rtf
b/sw/qa/extras/rtfimport/data/fdo59953.rtf
new file mode 100644
index 000..66432e3
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo59953.rtf
@@ -0,0 +1,16 @@
+{\rtf1\ansi\deff0
+\trowd\cellx7384\cellx9652
+\pard\intbl\sl0
+A1
+\cell
+\pard\intbl\sl0\lin10
+B1
+\cell
+\trowd\cellx7384\cellx9652\row
+\trowd\cellx7384\cellx9652
+\pard\intbl A2\cell
+\pard\intbl B2\cell
+\trowd\cellx7384\cellx9652
+\row
+\pard\itap0\sl0\lin14\rin8 \par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 3e15f55..18ae927 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -138,6 +138,7 @@
void testFdo58933();
void testFdo44053();
void testFdo58646line();
+void testFdo59953();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -226,6 +227,7 @@
{fdo58933.rtf, Test::testFdo58933},
{fdo44053.rtf, Test::testFdo44053},
{fdo58646line.rtf, Test::testFdo58646line},
+{fdo59953.rtf, Test::testFdo59953},
};
for (unsigned int i = 0; i SAL_N_ELEMENTS(aMethods); ++i)
{
@@ -1073,6 +1075,16 @@
getParagraph(1, foo\nbar);
}
+void Test::testFdo59953()
+{
+uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
+uno::Referencetext::XTextTable xTable(xTables-getByIndex(0),
uno::UNO_QUERY);
+// Cell width of A1 was 4998 (e.g. not set / not wide enough, ~50% of
total width)
+uno::Referencetable::XTableRows xTableRows(xTable-getRows(),
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int16(7650), getProperty
uno::Sequencetext::TableColumnSeparator (xTableRows-getByIndex(0),
TableColumnSeparators)[0].Position);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 448d6e1..52fbd0c 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -222,7 +222,10 @@
break;
case NS_ooxml::LN_CT_TblGridBase_gridCol:
{
-getCurrentGrid()-push_back(
ConversionHelper::convertTwipToMM100( nIntValue ) );
+if (nIntValue == -1)
+getCurrentGrid()-clear();
+else
+getCurrentGrid()-push_back(
ConversionHelper::convertTwipToMM100( nIntValue ) );
}
break;
case NS_ooxml::LN_CT_TcPrBase_vMerge : //vertical merge
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index a58e139..366959e 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1718,8 +1718,7 @@
case RTF_NESTROW:
{
// If the right edge of the last cell (row width) is smaller
than the width of some other row, mimic the WW8 import: add a fake cell.
-RTFValue::Pointer_t pLastCellx =
m_aStates.top().aTableRowSprms.find(NS_ooxml::LN_CT_TblGridBase_gridCol, false);
-if (pLastCellx.get() pLastCellx-getInt() m_nCellxMax)
+if (nKeyword == RTF_ROW m_aStates.top().nCellX
m_nCellxMax)
dispatchValue(RTF_CELLX, m_nCellxMax);
if (m_aStates.top().nCells)
@@ -2139,6 +2138,7 @@
break;
case RTF_TROWD:
m_aStates.top().aTableRowSprms = m_aDefaultState.aTableRowSprms;
+
[PUSHED] resolve fdo#60450 - Printer list is missing its border in Pr...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2043 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2043 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Caolán McNamara caol...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#38838 Some removal/replacement of the String/UniString w...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1962 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1962 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6daea312198fae3a9717bd8d4fea6371aa4cd275 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jean-Noël Rouvignac jn.rouvig...@gmail.com Gerrit-Reviewer: Jean-Noël Rouvignac jn.rouvig...@gmail.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fixed compilation error of Clang plugins on Ubuntu/Mint
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2045 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/45/2045/1 Fixed compilation error of Clang plugins on Ubuntu/Mint Change-Id: Ib08c5075034e0e16c5541f05425ef15d2cc3a6f6 --- M compilerplugins/clang/plugin.hxx 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx index 92ff6f3..d30c37a 100644 --- a/compilerplugins/clang/plugin.hxx +++ b/compilerplugins/clang/plugin.hxx @@ -15,6 +15,8 @@ #include clang/AST/ASTContext.h #include clang/AST/RecursiveASTVisitor.h +#include clang/Basic/FileManager.h +#include clang/Basic/SourceManager.h #if __clang_major__ 3 || __clang_major__ == 3 __clang_minor__ 2 #include clang/Rewrite/Rewriter.h -- To view, visit https://gerrit.libreoffice.org/2045 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib08c5075034e0e16c5541f05425ef15d2cc3a6f6 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marc-André Laverdière marc-an...@atc.tcs.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] res. bug on numbered paragraph when .doc import
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2046
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/2046/1
res. bug on numbered paragraph when .doc import
This patch solve an issue on .doc import (on paragraph numbering).
It was created from the code found in SwDoc::DelNumRules.
To see the problem you can download simple test document :
wget ftp://craoc.fr/{a,b,c,d}.{doc,png}
Each document contain a paragraph Test test test2 using Normal/default
style (this paragraph is imported correctly) and a Test test test1
using nouveau_style paragraph style.
In a.doc no direct paragraph formating are apply to the test1 paragraph.
a.doc is imported correctly.
To create b.doc, in Microsoft Office Word I opened a.doc, put my cursor
in front of the first charactère of the test1 paragraph (T) and push
backspace.
The result is that it apply some direct paragraph formating on test1 :
* disable paragraph numbering
* apply some indent
To create c.doc I did on b.doc the same things I did to a.doc to create
b.doc.
c.doc direct paragraph formating on test1 :
* disable paragraph numbering
* apply some (other) indent
To create d.doc I did on c.doc the same things I did to a.doc to create
b.doc.
d.doc direct paragraph formating on test1 :
* disable paragraph numbering
Without this patch, when importing {b,c,d}.doc in Writer :
The disable paragraph numbering direct formating isn't correctly
apply and test1 remain a numbered paragraph (even if the dot in front
of the paragraph is removed).
The indent are not correctly apply.
With this patch {a,b,c,d}.doc are correctly imported.
It also reset the left indent of paragraph when the numbering style is
remove.
Change-Id: If0568f341b82c2e8354f1728e5fc6f1ab310ea51
---
M sw/source/filter/ww8/ww8par.hxx
M sw/source/filter/ww8/ww8par3.cxx
2 files changed, 44 insertions(+), 35 deletions(-)
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 8ff035e..0296994 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -1635,6 +1635,15 @@
// Ver8-Listen
void Read_ListLevel(sal_uInt16 nId, const sal_uInt8* pData, short
nLen);
+
+/**
+ * read and interpret the sprmPIlfo used to determine which list
+ * contains the paragraph.
+ * @param nId unused (sprm value, 0x460b for sprmPIlfo).
+ * @param[in] pData operand.
+ * @param[in] nLen size of the operand (pData) in byte, should be 2.
+ * -1 to indicate the actual level is finished.
+ */
void Read_LFOPosition( sal_uInt16 nId, const sal_uInt8* pData, short
nLen);
bool SetTxtFmtCollAndListLevel(const SwPaM rRg, SwWW8StyInf rStyleInfo);
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 0b9de03..343c098 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -1881,15 +1881,17 @@
if( nLen 0 )
{
-// aktuelle Liste ist hier zu Ende, was ist zu tun ???
+// the actual level is finished, what should we do ?
nListLevel = WW8ListManager::nMaxLevel;
if (pStyles !bVer67)
pStyles-nWwNumLevel = 0;
}
else
{
-// Sicherheitspruefung auf NIL Pointer
-if( !pData ) return;
+// security check
+if( !pData )
+return;
+
// die Streamdaten sind hier Null basiert, so wie wir es brauchen
nListLevel = *pData;
@@ -1927,67 +1929,65 @@
if( nLen 0 )
{
-// aktueller Level ist hier zu Ende, was ist zu tun ???
+// the actual level is finished, what should we do ?
nLFOPosition = USHRT_MAX;
nListLevel = WW8ListManager::nMaxLevel;
}
else
{
-// Sicherheitspruefung auf NIL Pointer
+// security check
if( !pData )
return;
+
short nData = SVBT16ToShort( pData );
if( 0 = nData )
{
+// disable the numbering/list style apply to the paragraph or the
style
+
/*
If you have a paragraph in word with left and/or hanging indent
and remove its numbering, then the indentation appears to get
reset, but not back to the base style, instead its goes to a blank
setting.
Unless its a broken ww6 list in 97 in which case more hackery is
-required, some more details about that in
+required, some more details about broken ww6 list in
ww8par6.cxx#SwWW8ImplReader::Read_LR
*/
if (pAktColl)
{
-pAktColl-SetFmtAttr(*GetDfltAttr( RES_PARATR_NUMRULE));
+// here a named style is beeing configured
+
+// disable the numbering/list in the style currently configured
+
[PATCH] use static/reinterpret_cast and minor rewrite
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2047
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/2047/1
use static/reinterpret_cast and minor rewrite
Change-Id: I9d2f21394c03e29d573dc197da90a91c96d55409
---
M sw/source/core/doc/docnum.cxx
M sw/source/core/txtnode/ndtxt.cxx
M sw/source/filter/ww8/ww8par6.cxx
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 25d043b..b4078c8 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1357,11 +1357,14 @@
pTNd-ResetAttr( RES_PARATR_LIST_ISCOUNTED );
if( RES_CONDTXTFMTCOLL == pTNd-GetFmtColl()-Which() )
+{
pTNd-ChkCondColl();
-
+}
else if( !pOutlNd
-
((SwTxtFmtColl*)pTNd-GetFmtColl())-IsAssignedToListLevelOfOutlineStyle()
)//-end,zhaojianwei
+
static_castSwTxtFmtColl*(pTNd-GetFmtColl())-IsAssignedToListLevelOfOutlineStyle()
)//-end,zhaojianwei
+{
pOutlNd = pTNd;
+}
}
}
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 703e632..4881fb5 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -2348,9 +2348,7 @@
SwNumRule* SwTxtNode::GetNumRule(sal_Bool bInParent) const
{
-SwNumRule * pRet = _GetNumRule(bInParent);
-
-return pRet;
+return _GetNumRule(bInParent);
}
void SwTxtNode::NumRuleChgd()
@@ -4845,9 +4843,7 @@
sal_uInt32 SwTxtNode::GetParRsid() const
{
-SvxRsidItem rItem = ( SvxRsidItem ) GetAttr( RES_PARATR_RSID );
-
-return rItem.GetValue();
+return reinterpret_castconst SvxRsidItem(GetAttr( RES_PARATR_RSID
)).GetValue();
}
bool SwTxtNode::CompareParRsid( const SwTxtNode rTxtNode ) const
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 761a68a..c4f260e 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3827,10 +3827,10 @@
SvxLRSpaceItem aLR( RES_LR_SPACE );
const SfxPoolItem* pLR = GetFmtAttr(RES_LR_SPACE);
if( pLR )
-aLR = *(const SvxLRSpaceItem*)pLR;
+aLR = *static_castconst SvxLRSpaceItem*(pLR);
// Fix the regression issue: #i99822#: Discussion?
-// Since the list lever formatting doesn't apply into paragraph style
+// Since the list level formatting doesn't apply into paragraph style
// for list levels of mode LABEL_ALIGNMENT.(see ww8par3.cxx
// W8ImplReader::RegisterNumFmtOnTxtNode).
// Need to apply the list format to the paragraph here.
--
To view, visit https://gerrit.libreoffice.org/2047
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d2f21394c03e29d573dc197da90a91c96d55409
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Maxime de Roucy mdero...@linagora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#60139: Rename bundled extensions's Lightproof service im...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2032 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2032 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6754cd6d4aa0aad6147bc9e404a29ef1075a2548 Gerrit-PatchSet: 2 Gerrit-Project: dictionaries Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Changes to enable display of comments annotations in pptx fi...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2048
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/48/2048/1
Changes to enable display of comments annotations in pptx files
Change-Id: I965798cd3a539ab8deffcdf4a8e2c52c9e8e8fc1
---
A oox/inc/oox/ppt/annotation_buffer.h
A oox/inc/oox/ppt/comments.hxx
M oox/inc/oox/ppt/slidepersist.hxx
M oox/source/core/fragmenthandler2.cxx
M oox/source/ppt/presentationfragmenthandler.cxx
M oox/source/ppt/slidefragmenthandler.cxx
6 files changed, 329 insertions(+), 2 deletions(-)
diff --git a/oox/inc/oox/ppt/annotation_buffer.h
b/oox/inc/oox/ppt/annotation_buffer.h
new file mode 100644
index 000..dcfd0e2
--- /dev/null
+++ b/oox/inc/oox/ppt/annotation_buffer.h
@@ -0,0 +1 @@
+extern std::string commentbuffer_chars;
diff --git a/oox/inc/oox/ppt/comments.hxx b/oox/inc/oox/ppt/comments.hxx
new file mode 100644
index 000..922a407
--- /dev/null
+++ b/oox/inc/oox/ppt/comments.hxx
@@ -0,0 +1,214 @@
+#ifndef OOX_PPT_COMMENTS_HXX
+#define OOX_PPT_COMMENTS_HXX
+
+#define ELEMENT_NOT_FOUND 0
+
+using rtl::OUString;
+#include vector
+#include boost/algorithm/string.hpp //split function to tokenize for date
time
+//#include strtk.hpp //tokenize the text of comments
+
+#include com/sun/star/util/DateTime.hpp
+
+
+class commentAuthor
+{
+ private:
+ ::rtl::OUString clrIdx;
+ ::rtl::OUString id;
+ ::rtl::OUString initials;
+ ::rtl::OUString lastIdx;
+ ::rtl::OUString name;
+
+ public:
+ void setclrIdx(::rtl::OUString _clrIdx)
+ {
+clrIdx = _clrIdx;
+ }
+ void setid(::rtl::OUString _id)
+ {
+id=_id;
+ }
+ void setinitials(::rtl::OUString _initials)
+ {
+initials=_initials;
+ }
+ void setlastIdx(::rtl::OUString _lastIdx)
+ {
+lastIdx=_lastIdx;
+ }
+ void setname(::rtl::OUString _name)
+ {
+name=_name;
+ }
+ ::rtl::OUString getclrIdx()
+ {
+return clrIdx;
+ }
+ ::rtl::OUString getid()
+ {
+return id;
+ }
+ ::rtl::OUString getinitials()
+ {
+return initials;
+ }
+ ::rtl::OUString getlastIdx()
+ {
+return lastIdx;
+ }
+ ::rtl::OUString getname()
+ {
+return name;
+ }
+};
+
+class commentAuthorList
+{
+ public:
+ std::vectorcommentAuthor cmAuthorLst;
+
+ void setValues( commentAuthorList list)
+ {
+std::vectorcommentAuthor::iterator it;
+for(it=list.cmAuthorLst.begin();it!=list.cmAuthorLst.end();it++)
+{
+ cmAuthorLst.push_back(commentAuthor());
+ cmAuthorLst.back().setclrIdx(it-getclrIdx());
+ cmAuthorLst.back().setid(it-getid());
+ cmAuthorLst.back().setinitials(it-getinitials());
+ cmAuthorLst.back().setlastIdx(it-getlastIdx());
+ cmAuthorLst.back().setname(it-getname());
+}
+ }
+};
+
+class comment
+{
+ private:
+ ::rtl::OUString authorId;
+ ::rtl::OUString dt;
+ ::rtl::OUString idx;
+ ::rtl::OUString x;
+ ::rtl::OUString y;
+ ::rtl::OUString text;
+ ::com::sun::star::util::DateTime aDateTime;
+
+ public:
+ void setAuthorId(::rtl::OUString _aId)
+ {
+authorId = _aId;
+ }
+ void setdt(::rtl::OUString _dt)
+ {
+dt=_dt;
+setDateTime(_dt);
+ }
+ void setidx(::rtl::OUString _idx)
+ {
+idx=_idx;
+ }
+ void set_X(::rtl::OUString _x)
+ {
+x=_x;
+ }
+ void set_Y(::rtl::OUString _y)
+ {
+y=_y;
+ }
+ void set_text(std::string _text)
+ {
+text = rtl::OUString::createFromAscii ( _text.c_str() );
+ }
+
+ private:
+ //DateTime is saved as : 2013-01-10T15:53:26.000
+ void setDateTime (::rtl::OUString datetime)
+ {
+std::string _datetime = rtl::OUStringToOString(datetime,
RTL_TEXTENCODING_UTF8).getStr();
+std::vectorstd::string _dt;
+boost::split( _dt, _datetime, boost::is_any_of( -:T ) );
+aDateTime.Year = atoi(_dt.at(0).c_str());
+aDateTime.Month = atoi(_dt.at(1).c_str());
+aDateTime.Day = atoi(_dt.at(2).c_str());
+aDateTime.Hours = atoi(_dt.at(3).c_str());
+aDateTime.Minutes = atoi(_dt.at(4).c_str());
+aDateTime.HundredthSeconds = atoi(_dt.at(5).c_str());
+std::vectorstd::string::iterator i;
+
+ }
+ public:
+ ::rtl::OUString getAuthorId()
+ {
+return authorId;
+ }
+ ::rtl::OUString getdt()
+ {
+return dt;
+ }
+ ::rtl::OUString getidx()
+ {
+return idx;
+ }
+ ::rtl::OUString get_X()
+ {
+return x;
+ }
+ ::rtl::OUString get_Y()
+ {
+return y;
+ }
+ ::rtl::OUString get_text()
+ {
+return text;
+ }
+
+ ::com::sun::star::util::DateTime getDateTime()
+ {
+return aDateTime;
+ }
+ int get_int_X()
+ {
+std::string temp = rtl::OUStringToOString(get_X(),
RTL_TEXTENCODING_UTF8).getStr();
+return atoi(temp.c_str());
+ }
+ int get_int_Y()
+ {
+std::string temp = rtl::OUStringToOString(get_Y(),
RTL_TEXTENCODING_UTF8).getStr();
+return atoi(temp.c_str());
+ }
+ commentAuthor getAuthor ( commentAuthorList list )
+ {
+std::string temp = rtl::OUStringToOString(authorId,
RTL_TEXTENCODING_UTF8).getStr();
+int aId =
[PATCH] translate German comments, remove obsolete code
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2049
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/2049/1
translate German comments, remove obsolete code
Change-Id: I4d6e3149f94234e2b884ab81e752805d07a63712
---
M sw/source/core/view/viewimp.cxx
1 file changed, 115 insertions(+), 97 deletions(-)
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 6b114a2..8ae0086 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -43,18 +43,20 @@
#include IDocumentDeviceAccess.hxx
#include IDocumentSettingAccess.hxx
-/*
-|*
-|* SwViewImp::Init()
-|*
-|* Ersterstellung MA 25. Jul. 94
-|* Letzte AenderungMA 03. Nov. 95
-|*
-|*/
+/**
+
+ SwViewImp::Init()
+
+ Created MA 25. Jul. 94
+ Last change MA 03. Nov. 95
+
+ @author MA
+
+*/
void SwViewImp::Init( const SwViewOption *pNewOpt )
{
OSL_ENSURE( pDrawView, SwViewImp::Init without DrawView );
-//Jetzt die PageView erzeugen wenn sie noch nicht existiert.
+//Create PageView if it doesn't exist
SwRootFrm *pRoot = pSh-GetLayout();//swmod 071108//swmod 071225
if ( !pSdrPageView )
{
@@ -95,14 +97,16 @@
pDrawView-SetMarkHdlSizePixel(9);
}
-/*
-|*
-|* SwViewImp::SwViewImp() CTor fuer die Core-Internas
-|*
-|* Ersterstellung MA 25. Jul. 94
-|* Letzte AenderungMA 06. Sep. 96
-|*
-|*/
+/**
+
+ SwViewImp::SwViewImp() CTor for the core internals
+
+ Created MA 25. Jul. 94
+ Last change MA 06. Sep. 96
+
+ @author MA
+
+*/
SwViewImp::SwViewImp( ViewShell *pParent ) :
pSh( pParent ),
@@ -118,21 +122,21 @@
// OD 12.12.2002 #103492#
mpPgPrevwLayout( 0 )
{
-//bResetXorVisibility =
-//HMHbShowHdlPaint =
bResetHdlHiddenPaint =
bSmoothUpdate = bStopSmooth = bStopPrt = sal_False;
bFirstPageInvalid = sal_True;
}
-/**
-|*
-|* SwViewImp::~SwViewImp()
-|*
-|* Ersterstellung MA 25. Jul. 94
-|* Letzte AenderungMA 16. Dec. 94
-|*
-**/
+/**
+
+ SwViewImp::~SwViewImp()
+
+ Created MA 25. Jul. 94
+ Last change MA 16. Dec. 94
+
+ @author MA
+
+*/
SwViewImp::~SwViewImp()
{
@@ -141,7 +145,7 @@
// OD 12.12.2002 #103492#
delete mpPgPrevwLayout;
-//JP 29.03.96: nach ShowSdrPage muss auch HideSdrPage gemacht werden!!!
+//JP 29.03.96: after ShowSdrPage HideSdrPage must also be executed!!!
if( pDrawView )
pDrawView-HideSdrPage();
@@ -153,28 +157,32 @@
OSL_ENSURE( !pIdleAct,Be idle for the rest of your life. );
}
-/**
-|*
-|* SwViewImp::DelRegions()
-|*
-|* Ersterstellung MA 14. Apr. 94
-|* Letzte AenderungMA 14. Apr. 94
-|*
-**/
+/**
+
+ SwViewImp::DelRegions()
+
+ Created MA 14. Apr. 94
+ Last change MA 14. Apr. 94
+
+ @author MA
+
+*/
void SwViewImp::DelRegion()
{
DELETEZ(pRegion);
}
-/**
-|*
-|* SwViewImp::AddPaintRect()
-|*
-|* Ersterstellung MA ??
-|* Letzte AenderungMA 27. Jul. 94
-|*
-**/
+/**
+
+ SwViewImp::AddPaintRect()
+
+ Created MA ??
+ Last change MA 27. Jul. 94
+
+ @author MA
+
+*/
sal_Bool SwViewImp::AddPaintRect( const SwRect rRect )
{
@@ -188,14 +196,16 @@
return sal_False;
}
-/**
-|*
-|* ViewImp::CheckWaitCrsr()
-|*
-|* Ersterstellung MA 10. Aug. 94
-|* Letzte AenderungMA 10. Aug. 94
-|*
-**/
+/**
+
+ ViewImp::CheckWaitCrsr()
+
+ Created MA 10. Aug. 94
+ Last change MA 10. Aug. 94
+
+ @author MA
+
+*/
void SwViewImp::CheckWaitCrsr()
{
@@ -203,14 +213,16 @@
pLayAct-CheckWaitCrsr();
}
-/**
-|*
-|* ViewImp::IsCalcLayoutProgress()
-|*
-|* Ersterstellung MA 12. Aug. 94
-|* Letzte AenderungMA 12. Aug. 94
-|*
-**/
+/**
+
+ ViewImp::IsCalcLayoutProgress()
+
+ Created MA 12. Aug. 94
+ Last change MA 12. Aug. 94
+
+ @author MA
+
+*/
sal_Bool SwViewImp::IsCalcLayoutProgress() const
{
@@ -219,14
[PATCH] Crop issue resolved
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2050
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/50/2050/1
Crop issue resolved
Change-Id: Ia822f87c3b29acd80c50a64edb617344c3e4507b
---
M oox/inc/oox/export/drawingml.hxx
M oox/source/export/drawingml.cxx
M oox/source/export/shapes.cxx
3 files changed, 54 insertions(+), 0 deletions(-)
diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index 6198ec6..5dc79b0 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -106,6 +106,7 @@
void WriteGradientFill( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet );
void WriteBlipFill( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet, OUString sURLPropName,
sal_Int32 nXmlNamespace );
void WriteBlipFill( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet, OUString sURLPropName );
+void WriteSrcRect( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet , OUString );
void WriteOutline( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet );
void WriteStretch();
void WriteLinespacing( ::com::sun::star::style::LineSpacing rLineSpacing
);
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 8389b3a..72bba35 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -70,6 +70,10 @@
#include svx/unoapi.hxx
#include svx/svdoashp.hxx
+#include com/sun/star/text/GraphicCrop.hpp
+#include com/sun/star/geometry/IntegerRectangle2D.hpp
+using ::com::sun::star::geometry::IntegerRectangle2D;
+
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::drawing;
@@ -605,6 +609,49 @@
}
}
+
+void DrawingML::WriteSrcRect( Reference XPropertySet rXPropSet, OUString
rURL )
+{
+
+Size aOriginalSize;
+rtl::OString aURLBS(rtl::OUStringToOString(rURL,
RTL_TEXTENCODING_UTF8));
+
+const char aURLBegin[] = vnd.sun.star.GraphicObject:;
+sal_Int32 index =
aURLBS.indexOfL(RTL_CONSTASCII_STRINGPARAM(aURLBegin));
+
+if ( index != -1 )
+{
+DBG(printf (begin: %ld %s\n, long( sizeof( aURLBegin ) ), USS(
rURL ) + RTL_CONSTASCII_LENGTH( aURLBegin ) ));
+GraphicObject aGraphic = GraphicObject(
aURLBS.copy(RTL_CONSTASCII_LENGTH(aURLBegin)) );
+
+aOriginalSize = aGraphic.GetPrefSize();
+}
+
+bool bCrop,IsCropped=true;
+
+::com::sun::star::text::GraphicCrop aGraphicCropStruct;
+
+if ( ( bCrop= GetProperty( rXPropSet, GraphicCrop ) ) )
+ {
+mAny = aGraphicCropStruct;
+
+if( (0 == aGraphicCropStruct.Left) (0 == aGraphicCropStruct.Top)
(0 == aGraphicCropStruct.Right) (0 == aGraphicCropStruct.Bottom) )
+{
+IsCropped=false;
+}
+else
+{
+mpFS-singleElementNS(XML_a, XML_srcRect,
+ XML_l,I32S(((aGraphicCropStruct.Left) *
10)/aOriginalSize.Width()),
+ XML_t,I32S(((aGraphicCropStruct.Top) *
10)/aOriginalSize.Height()),
+ XML_r,I32S(((aGraphicCropStruct.Right) *
10)/aOriginalSize.Width()),
+ XML_b,I32S(((aGraphicCropStruct.Bottom) *
10)/aOriginalSize.Height()),
+ FSEND);
+}
+}
+}
+
+
void DrawingML::WriteStretch()
{
mpFS-startElementNS( XML_a, XML_stretch, FSEND );
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 41d505a..f9e6d8d5 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -873,6 +873,12 @@
WriteBlip( xShapeProps, sGraphicURL, pGraphic );
+
/*---*/
+
+WriteSrcRect( xShapeProps, sGraphicURL );
+
+
/*-*/
+
// now we stretch always when we get pGraphic (when changing that
// behavior, test n#780830 for regression, where the OLE sheet might get
tiled
bool bStretch = false;
--
To view, visit https://gerrit.libreoffice.org/2050
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia822f87c3b29acd80c50a64edb617344c3e4507b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: pallavi jadhav pallavi.jad...@synerzip.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Package the right pixman and cairo
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2051 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/2051/1 Package the right pixman and cairo Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608 --- M scp2/source/ooo/file_library_ooo.scp 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 86dde44..642cd81 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -560,7 +560,7 @@ #ifdef MACOSX Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX)); #else - Name = STRING(CONCAT2(libcairo,UNXSUFFIX)); + Name = STRING(CONCAT3(libcairo,UNXSUFFIX,.2)); #endif #elif defined(WNT) #ifdef _gcc3 @@ -578,7 +578,11 @@ Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX +#ifdef MACOSX Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX)); +#else + Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0)); +#endif #endif End -- To view, visit https://gerrit.libreoffice.org/2051 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] Package the right pixman and cairo
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2051 Approvals: Stephan Bergmann: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2051 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd9941ff5dcf303e83790a901e36008c98f57608 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Fridrich Strba fridr...@documentfoundation.org Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] resolve fdo#60450 - Printer list is missing its border in Pr...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2052
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/52/2052/1
resolve fdo#60450 - Printer list is missing its border in Print dialog
Reviewed-on: https://gerrit.libreoffice.org/2043
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
(cherry picked from commit f10ba07935951e6c74663a35de9a79b7d66beb37)
Conflicts:
vcl/source/window/builder.cxx
allow a custom border property for drawing areas
(cherry picked from commit e258b760563dc2a69a1cc8b0c8b7b4c15a2774ad)
Change-Id: I2e28b9f9d52bcb01b04f98d39d12b6d8a627bec5
1e5777e5dcc04d0aa53d1ac4b9091f310ae59035
---
M vcl/source/window/builder.cxx
M vcl/uiconfig/ui/printdialog.ui
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 68bc434..355b28f 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -307,16 +307,16 @@
namespace
{
-OString extractPattern(VclBuilder::stringmap rMap)
+OString extractCustomProperty(VclBuilder::stringmap rMap)
{
-OString sPattern;
-VclBuilder::stringmap::iterator aFind = rMap.find(OString(pattern));
+OString sCustomProperty;
+VclBuilder::stringmap::iterator aFind =
rMap.find(OString(customproperty));
if (aFind != rMap.end())
{
-sPattern = aFind-second;
+sCustomProperty = aFind-second;
rMap.erase(aFind);
}
-return sPattern;
+return sCustomProperty;
}
bool extractResizable(VclBuilder::stringmap rMap)
@@ -688,7 +688,7 @@
else if (name == GtkSpinButton)
{
extractSpinAdjustment(id, rMap);
-OString sPattern = extractPattern(rMap);
+OString sPattern = extractCustomProperty(rMap);
OString sUnit = sPattern;
for (sal_Int32 i = 0; i sPattern.getLength(); ++i)
@@ -755,7 +755,11 @@
// everything over to SvTreeViewBox
//d) remove the users of makeSvTreeViewBox
extractModel(id, rMap);
-pWindow = new ListBox(pParent, WB_LEFT|WB_VCENTER|WB_3DLOOK);
+WinBits nWinStyle = WB_LEFT|WB_VCENTER|WB_3DLOOK;
+OString sBorder = extractCustomProperty(rMap);
+if (!sBorder.isEmpty())
+nWinStyle |= WB_BORDER;
+pWindow = new ListBox(pParent, nWinStyle);
}
else if (name == GtkLabel)
pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
@@ -802,7 +806,10 @@
else if (name == GtkNotebook)
pWindow = new TabControl(pParent, WB_STDTABCONTROL|WB_3DLOOK);
else if (name == GtkDrawingArea)
-pWindow = new Window(pParent);
+{
+OString sBorder = extractCustomProperty(rMap);
+pWindow = new Window(pParent, sBorder.isEmpty() ? 0 : WB_BORDER);
+}
else if (name == GtkTextView)
{
extractBuffer(id, rMap);
@@ -1013,7 +1020,7 @@
if (nDelim != -1)
{
OString sPattern = sID.copy(nDelim+1);
-aProperties[OString(pattern)] = sPattern;
+aProperties[OString(customproperty)] = sPattern;
sID = sID.copy(0, nDelim);
}
}
@@ -1340,7 +1347,7 @@
{
OString sClass;
OString sID;
-OString sPattern;
+OString sCustomProperty;
xmlreader::Span name;
int nsId;
@@ -1359,7 +1366,7 @@
sal_Int32 nDelim = sID.indexOf(':');
if (nDelim != -1)
{
-sPattern = sID.copy(nDelim+1);
+sCustomProperty = sID.copy(nDelim+1);
sID = sID.copy(0, nDelim);
}
}
@@ -1375,8 +1382,8 @@
stringmap aProperties, aPangoAttributes;
-if (!sPattern.isEmpty())
-aProperties[OString(pattern)] = sPattern;
+if (!sCustomProperty.isEmpty())
+aProperties[OString(customproperty)] = sCustomProperty;
Window *pCurrentChild = NULL;
while(1)
diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui
index a0204b5..575eda9 100644
--- a/vcl/uiconfig/ui/printdialog.ui
+++ b/vcl/uiconfig/ui/printdialog.ui
@@ -350,7 +350,7 @@
/packing
/child
child
- object class=GtkTreeView id=printers
+ object class=GtkTreeView
id=printers:border
property
name=height_request100/property
property name=visibleTrue/property
property name=can_focusTrue/property
--
To view, visit https://gerrit.libreoffice.org/2052
To unsubscribe, visit
[PATCH] calc : multiple tabs can be hidden at once
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2053
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/53/2053/1
calc : multiple tabs can be hidden at once
Change-Id: I445eccc188f1817006cb425dc9a0e92a25350ec8
---
M sc/source/ui/view/tabvwshf.cxx
1 file changed, 22 insertions(+), 23 deletions(-)
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index 89585dd..3a66768 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -109,33 +109,33 @@
ScMarkData rMark = pViewData-GetMarkData();
SCTAB nTabSelCount = rMark.GetSelectCount();
sal_uInt16 nVis = 0;
-for ( SCTAB i=0; i nTabCount nVis2; i++ )
+for ( SCTAB i=0; i nTabCount nVisnTabSelCount + 1; i++ )
if (pDoc-IsVisible(i))
++nVis;
-if ( nVis2 || !pDoc-IsDocEditable() || nTabSelCount 1 )
+if ( nVis=nTabSelCount || !pDoc-IsDocEditable() )
break;
-
rtl::OUString aName;
-if( pReqArgs != NULL )
-{
-const SfxPoolItem* pItem;
-if( pReqArgs-HasItem( FID_TABLE_HIDE, pItem ) )
-aName = ((const SfxStringItem*)pItem)-GetValue();
-}
-
-if (aName.isEmpty())
-{
-pDoc-GetName( nCurrentTab, aName );// aktuelle
Tabelle
-rReq.AppendItem( SfxStringItem( FID_TABLE_HIDE, aName ) );
-}
-
SCTAB nHideTab;
-if (pDoc-GetTable( aName, nHideTab ))
-HideTable( nHideTab );
+ScMarkData::MarkedTabsType selectedTabs =
rMark.GetSelectedTabs();
-if( ! rReq.IsAPI() )
-rReq.Done();
+ScMarkData::MarkedTabsType::const_iterator it;
+it = selectedTabs.begin();
+while (it != selectedTabs.end())
+{
+nHideTab = *it;
+
+pDoc-GetName( nHideTab, aName );
+rReq.AppendItem( SfxStringItem( FID_TABLE_HIDE, aName ) );
+
+if (pDoc-GetTable( aName, nHideTab ))
+HideTable( nHideTab );
+
+if( ! rReq.IsAPI() )
+rReq.Done();
+
+it++;
+}
}
break;
@@ -841,11 +841,10 @@
case FID_TABLE_HIDE:
{
sal_uInt16 nVis = 0;
-for ( SCTAB i=0; i nTabCount nVis2; i++ )
+for ( SCTAB i=0; i nTabCount nVisnTabSelCount + 1;
i++ )
if (pDoc-IsVisible(i))
++nVis;
-
-if ( nVis2 || !pDoc-IsDocEditable() || nTabSelCount 1 )
+if ( nVis=nTabSelCount || !pDoc-IsDocEditable() )
rSet.DisableItem( nWhich );
}
break;
--
To view, visit https://gerrit.libreoffice.org/2053
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I445eccc188f1817006cb425dc9a0e92a25350ec8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Laurent Godard lgodard.li...@laposte.net
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] translate German comments, remove obsolete code
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2054
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/2054/1
translate German comments, remove obsolete code
Change-Id: Icfb1e2985f746d7a451037e2d411ebbfeed26a54
---
M sw/source/core/view/viewsh.cxx
1 file changed, 96 insertions(+), 118 deletions(-)
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 8d8d333..bec7c75 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -199,7 +199,7 @@
}
bInEndAction = sal_True;
-//Laeuft hiermit das EndAction der Letzten Shell im Ring?
+//will this put the EndAction of the last shell in the sequence?
ViewShell::bLstAct = sal_True;
ViewShell *pSh = (ViewShell*)this-GetNext();
@@ -238,9 +238,8 @@
if ( bIsShellForCheckViewLayout )
GetLayout()-CheckViewLayout( GetViewOptions(), aVisArea );
-//Wenn wir selbst keine Paints erzeugen, so warten wir auf das Paint
-//vom System. Dann ist das Clipping korrekt gesetzt; Beispiel: verschieben
-//eines DrawObjektes.
+//If we don't call Paints, we wait for the Paint of the system.
+//Then the clipping is set correctly; e.g. shifting of a Draw object
if ( Imp()-GetRegion() ||
aInvalidRect.HasArea() ||
bExtraData )
@@ -263,12 +262,11 @@
SwRegionRects *pRegion = Imp()-GetRegion();
-//JP 27.11.97: wer die Selection hided, muss sie aber auch
-// wieder Showen. Sonst gibt es Paintfehler!
-// z.B.: addional Mode, Seite vertikal hab zu sehen, in der
-// Mitte eine Selektion und mit einem anderen Cursor an linken
-// rechten Rand springen. Ohne ShowCrsr verschwindet die
-// Selektion
+//JP 27.11.97: what hid the selection, must also Show it,
+// else we get Paint errors!
+// e.g. additional mode, page half visible vertically, in the
+// middle a selection and with an other cursor jump to left
+// right border. Without ShowCrsr the selection disappears.
bool bShowCrsr = pRegion IsA( TYPE(SwCrsrShell) );
if( bShowCrsr )
((SwCrsrShell*)this)-HideCrsrs();
@@ -279,7 +277,7 @@
Imp()-pRegion = NULL;
-//Erst Invert dann Compress, niemals andersherum!
+//First Invert then Compress, never the other way round!
pRegion-Invert();
pRegion-Compress();
@@ -293,7 +291,7 @@
bool bPaint = true;
if ( IsEndActionByVirDev() )
{
-//virtuelles device erzeugen und einstellen.
+//create virtual device and set.
if ( !pVout )
pVout = new VirtualDevice( *GetOut() );
MapMode aMapMode( GetOut()-GetMapMode() );
@@ -423,10 +421,10 @@
Imp()-EndAction();
-//Damit sich die automatischen Scrollbars auch richtig anordnen k?nnen
-//muessen wir die Aktion hier kuenstlich beenden (EndAction loesst ein
-//Notify aus, und das muss Start-/EndAction rufen um die Scrollbars
-//klarzubekommen.
+//We artificially end the action here to enable the automatic scrollbars
+//to adjust themselves correctly
+//EndAction sends a Notify, and that must call Start-/EndAction to
+//adjust the scrollbars correctly
--nStartAction;
UISizeNotify();
++nStartAction;
@@ -446,7 +444,7 @@
void ViewShell::ImplLockPaint()
{
if ( GetWin() GetWin()-IsVisible() )
-GetWin()-EnablePaint( sal_False ); //Auch die Controls abklemmen.
+GetWin()-EnablePaint( sal_False ); //Also cut off the controls.
Imp()-LockPaint();
}
@@ -458,7 +456,7 @@
{
if ( (bInSizeNotify || bVirDev ) VisArea().HasArea() )
{
-//Refresh mit virtuellem Device um das Flackern zu verhindern.
+//Refresh with virtual device to avoid flickering.
VirtualDevice *pVout = new VirtualDevice( *pOut );
pVout-SetMapMode( pOut-GetMapMode() );
Size aSize( VisArea().SSize() );
@@ -568,7 +566,7 @@
#if OSL_DEBUG_LEVEL 0
else
{
-//MA: 04. Nov. 94, braucht doch keiner oder??
+//MA: 04. Nov. 94, no one needs this, does one?
OSL_ENSURE( !this, MakeVisible fuer Drucker wird doch
gebraucht? );
}
@@ -601,8 +599,8 @@
sal_uInt16 ViewShell::GetNumPages()
{
-//Es kann sein, das noch kein Layout existiert weil die Methode vom
-//Root-Ctor gerufen wird.
+//It is possible that no layout exists when the method from
+//root-Ctor is called.
return GetLayout() ? GetLayout()-GetPageNum() : 0;
}
@@ -666,14 +664,14 @@
void
[PUSHED] Resolves fdo#59889 fault in dragging edge of RTL table
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1979 Approvals: Tor Lillqvist: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1979 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If412b443ec8f82942ff80ba3aec24a9bfc053ac9 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Karthikeyan Krishnamurthi karthike...@kacst.edu.sa Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#60234 fdo#60492: fix emboleobj library on WNT:
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2055 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/55/2055/1 fdo#60234 fdo#60492: fix emboleobj library on WNT: Use prefix consistently in all component files for the library. (regression from 393588ce8e698203dd87a87eb506afb551457717) Change-Id: I58dce631f474e022be320c748f62238953a28e17 (cherry picked from commit 63ca871bf8f14e0450e5da0dbcfa3ee5d48f1604) --- M embeddedobj/source/msole/emboleobj.windows.component 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embeddedobj/source/msole/emboleobj.windows.component b/embeddedobj/source/msole/emboleobj.windows.component index d70f7dc..ac823ee 100644 --- a/embeddedobj/source/msole/emboleobj.windows.component +++ b/embeddedobj/source/msole/emboleobj.windows.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . -- -component loader=com.sun.star.loader.SharedLibrary +component loader=com.sun.star.loader.SharedLibrary prefix=emboleobj xmlns=http://openoffice.org/2010/uno-components; implementation name=com.sun.star.comp.embed.MSOLEObjectSystemCreator service name=com.sun.star.comp.embed.MSOLEObjectSystemCreator/ -- To view, visit https://gerrit.libreoffice.org/2055 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I58dce631f474e022be320c748f62238953a28e17 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Michael Stahl mst...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Fix Resource leak: ddf
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2057 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/57/2057/1 Fix Resource leak: ddf Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479 --- M setup_native/source/win32/wintools/makecab/parseddf.c 1 file changed, 2 insertions(+), 0 deletions(-) diff --git a/setup_native/source/win32/wintools/makecab/parseddf.c b/setup_native/source/win32/wintools/makecab/parseddf.c index cbd9914..cf081e3 100644 --- a/setup_native/source/win32/wintools/makecab/parseddf.c +++ b/setup_native/source/win32/wintools/makecab/parseddf.c @@ -378,6 +378,8 @@ ccab-cbFolderThresh = ccab-cb; ccab-iDisk = 0; +fclose(ddf); + return DDF_OK; } -- To view, visit https://gerrit.libreoffice.org/2057 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Julien Nabet serval2...@yahoo.fr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remarktranslations german - english
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2058 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/58/2058/1 Remarktranslations german - english I have translated some german remarks into english for better understanding the sourcecode. I hope this helps a lot... Change-Id: I9d790684ec4c999aacbe5d7f47138a4bee26c7c7 --- M sw/inc/cmdid.h 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index e5052cf..0c31ee9 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -233,7 +233,7 @@ #define FN_INSERT_BREAK_DLG (FN_INSERT + 4 ) /* Break */ #define FN_INSERT_COLUMN_BREAK (FN_INSERT + 5 ) /* Column break */ -#define FN_INSERT_FIELD (FN_INSERT + 8 ) /* Textbefehl */ +#define FN_INSERT_FIELD (FN_INSERT + 8 ) /* Textcommand */ #define FN_CHANGE_DBFIELD (FN_INSERT + 9 ) /* Change the database field */ #define FN_INSERT_CAPTION (FN_INSERT + 10) /* Caption */ @@ -458,7 +458,7 @@ #define FN_TITLE_DESCRIPTION_SHAPE (FN_FORMAT2 + 15) /* shape title and description */ -#define FN_NUMBER_FORMAT(FN_FORMAT2 + 120) /* set Boxen/NumberFormatter */ +#define FN_NUMBER_FORMAT(FN_FORMAT2 + 120) /* set Boxes/NumberFormatter */ #define FN_NUMBER_STANDARD (FN_FORMAT2 + 121) #define FN_NUMBER_TWODEC(FN_FORMAT2 + 123) #define FN_NUMBER_SCIENTIFIC(FN_FORMAT2 + 124) @@ -701,8 +701,8 @@ #define FN_DELETE_WHOLE_LINE(FN_SELECTION + 35) /* DeleteLine ??? */ #define FN_PAGEUP (FN_SELECTION + 37) /* PageUpWithCursor */ #define FN_PAGEDOWN (FN_SELECTION + 38) /* PageDownWithCursor */ -#define FN_SET_ADD_MODE (FN_SELECTION + 39) /* Selektionsmodus */ -#define FN_SET_EXT_MODE (FN_SELECTION + 40) /* Selektionsmodus */ +#define FN_SET_ADD_MODE (FN_SELECTION + 39) /* Selectionmode */ +#define FN_SET_EXT_MODE (FN_SELECTION + 40) /* Selectionmode */ #define FN_ESCAPE (FN_SELECTION + 41) /* Normal */ #define FN_SHIFT_BACKSPACE (FN_SELECTION + 42) /* like Backspace */ #define FN_SELECT_WORD (FN_SELECTION + 43) /* select word*/ @@ -836,7 +836,7 @@ #define FN_COND_COLL(FN_PARAM2+1) /* Item for conditional templates */ #define FN_PARAM_SELECTION (FN_PARAM2+2) /* selected word for format/character/hyperlink */ -#define FN_PARAM_ACT_NUMBER (FN_PARAM2+3) /* PointerItem die aktuelle NumRule */ +#define FN_PARAM_ACT_NUMBER (FN_PARAM2+3) /* PointerItem the current NumRule */ #define FN_PARAM_NUM_PRESET (FN_PARAM2+5) /* predefined numbering */ -- To view, visit https://gerrit.libreoffice.org/2058 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9d790684ec4c999aacbe5d7f47138a4bee26c7c7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remark translations german - english
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2059 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/59/2059/1 Remark translations german - english Hope it helps you a lot. Change-Id: I5db1b746077c783a6fdf75ba0e30a3573ef4ddea --- M sw/sdi/_viewsh.sdi 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/sw/sdi/_viewsh.sdi b/sw/sdi/_viewsh.sdi index d6ff824..eb4d596 100644 --- a/sw/sdi/_viewsh.sdi +++ b/sw/sdi/_viewsh.sdi @@ -314,7 +314,7 @@ DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR; ] //- - //Ab hier Statusleiste + //From here the statusbar FN_STAT_PAGE // status() [ ExecMethod = ExecuteStatusLine ; @@ -336,7 +336,7 @@ ] FN_STAT_SELMODE // status(final|play) [ - //Aktueller Selektionsmode: 0 == Normal, 2 == Ergaenzen, 1 == Erweitern + //Current Selectionmode: 0 == Normal, 2 == Add, 1 == Enhance ExecMethod = ExecuteStatusLine ; StateMethod = StateStatusLine ; ] @@ -384,7 +384,7 @@ StateMethod = StateStatusLine ; ] //-- - //End mit Statusleiste + //End of the statusbar //-- SID_ATTR_BORDER_SHADOW // status() [ @@ -393,7 +393,7 @@ ] // /* */ -/* Properties Seitenformat*/ +/* Properties Page Format */ /* */ // SID_ATTR_PAGE // status() @@ -435,7 +435,7 @@ DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR; ] /* -suchen und ersetzen +search and replace */ @@ -478,7 +478,7 @@ StateMethod = StateTabWin ; DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR; ] -// ab hier Export = FALSE; +// from here Export = FALSE; FID_SEARCH_ON // status() [ ExecMethod = ExecSearch ; @@ -640,8 +640,8 @@ StateMethod = StateViewOptions ; ] - //Extra/Optionen/Ansicht -//Wird zusammen zum Property ViewSettings + //Extra/Options/View +//Will be summerized to Property ViewSettings FN_VIEW_HIDDEN_PARA [ ExecMethod = ExecViewOptions ; @@ -655,7 +655,7 @@ StateMethod = StateViewOptions ; Export = FALSE; ] - // alles ab hier kann weg (Export = FALSE;), wenn die vorangehenden funktionieren + // Everything from here can be removed (Export = FALSE;), if the previous works FN_RULER // status() [ ExecMethod = ExecViewOptions ; @@ -772,14 +772,14 @@ [ ] -// Bereichsname, Index-Titel oder Leerstring +// Areaname, Index-Titel or Empty String String Title FN_COLL_TITLE ( UINT16 PositionFN_COLL_TITLE ) [ ] -// ohne FileName wird ein TextBereich an der Position eingefuegt +// Without a FileName an area of the text is inserted at this location. BOOLInsertDocument FN_COLL_ADD ( UINT16 PositionFN_COLL_ADD, -- To view, visit https://gerrit.libreoffice.org/2059 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5db1b746077c783a6fdf75ba0e30a3573ef4ddea Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Remark Translation german - english
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2060
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/60/2060/1
Remark Translation german - english
Change-Id: Iddfc42ba61ddf533e0d0832a54730a8f3058b1c0
---
M sw/sdi/basesh.sdi
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sw/sdi/basesh.sdi b/sw/sdi/basesh.sdi
index 4a17a63..baeb362 100644
--- a/sw/sdi/basesh.sdi
+++ b/sw/sdi/basesh.sdi
@@ -21,8 +21,8 @@
uuid = F23BA0A8-73A0-11d0-89CA-008029E4B0B1
]
{
-// hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
-// nicht unterstuetzt werden
+// Here shall the slots are inserted which are not supported by
+// StarWriter/WEB
FN_TOOL_ANCHOR_PAGE
[
--
To view, visit https://gerrit.libreoffice.org/2060
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddfc42ba61ddf533e0d0832a54730a8f3058b1c0
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Matthias Freund matti...@yahoo.de
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
license statement
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license Warm Regards, Abdulaziz Ayed Alayed developer at Motah Program , KACST http://www.motah.org.sa Warning: This message and its attachment, if any, are confidential and may contain information protected by law. If you are not the intended recipient, please contact the sender immediately and delete the message and its attachment, if any. You should not copy the message and its attachment, if any, or disclose its contents to any other person or use it for any purpose. Statements and opinions expressed in this e-mail and its attachment, if any, are those of the sender, and do not necessarily reflect those of King Abdulaziz city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST accepts no liability for any damage caused by this email. ?: ??? ??? ??? ? ?? ?? (?? ) ? ?? ? ??? ??? ? ? ???. ??? ?? ??? ? ?? ??? ? ??? ?? ? ??? ? (?? )? ??? ?? ??? ?? ? ??? ??? ?? (?? ) ?? ?? ??? ? ?? ? ?? ? ?? ? ??? ???. ? ??? ??? ??? ? (?? ) ?? ??? ??? ??? ? ? ? ?? ??? ? ??? ? ??? ?? ??? ?? ??? ??? ?? ?? ?? ?? ??? ??. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Converted Insert - picture - scan - select source widget.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2061 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/2061/1 Converted Insert - picture - scan - select source widget. Change-Id: Ic593056b43e145554b0d011e1547f3c4c098a508 --- A extensions/uiconfig/scanner.ui 1 file changed, 480 insertions(+), 0 deletions(-) diff --git a/extensions/uiconfig/scanner.ui b/extensions/uiconfig/scanner.ui new file mode 100644 index 000..8216a8d --- /dev/null +++ b/extensions/uiconfig/scanner.ui @@ -0,0 +1,480 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkAction id=action1/ + object class=GtkDialog id=Scanner +property name=can_focusFalse/property +property name=border_width5/property +property name=type_hintdialog/property +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=layout_stylestart/property +child + object class=GtkButton id=ok +property name=labelgtk-ok/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=cancel +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=button3 +property name=label translatable=yesAbout +Dev_ice/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child +child + object class=GtkButton id=button4 +property name=label translatable=yesCreate +Previe_w/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position3/property + /packing +/child +child + object class=GtkButton id=button5 +property name=label translatable=yes_Scan/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_underlineTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position4/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +
[PUSHED] Remarktranslations german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2058 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2058 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d790684ec4c999aacbe5d7f47138a4bee26c7c7 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remark translations german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2059 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2059 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5db1b746077c783a6fdf75ba0e30a3573ef4ddea Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Remark Translation german - english
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2060 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2060 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddfc42ba61ddf533e0d0832a54730a8f3058b1c0 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matthias Freund matti...@yahoo.de Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] translate German comments, remove obsolete code
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2054 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2054 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icfb1e2985f746d7a451037e2d411ebbfeed26a54 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] ORowSetValue: move float and double to union
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2021 Approvals: Caolán McNamara: Verified; Looks good to me, approved LibreOffice gerrit bot: Verified -- To view, visit https://gerrit.libreoffice.org/2021 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic5de8ad2cf9ef1143b1a5468e5fc5c9974aca5ec Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: David Ostrovsky david.ostrov...@gmx.de 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
[PUSHED] translate German comments, remove obsolete code
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2049 Approvals: Thomas Arnhold: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2049 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d6e3149f94234e2b884ab81e752805d07a63712 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Winfried Donkers o...@dci-electronics.nl Gerrit-Reviewer: Thomas Arnhold tho...@arnhold.org Gerrit-Reviewer: Winfried Donkers o...@dci-electronics.nl ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Fixes fdo#46186, The Table Remains in the defined writing mo...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1964 Approvals: Ahmad Harthi: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1964 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9d6bdde5019322488be66fa89a6488d348b2cf44 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: gokul s gswaminat...@kacst.edu.sa Gerrit-Reviewer: Ahmad Harthi aalhar...@kacst.edu.sa Gerrit-Reviewer: Lior Kaplan kaplanl...@gmail.com Gerrit-Reviewer: Tor Lillqvist t...@iki.fi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] export different first page header/footer to doc/docx
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2062
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/2062/1
export different first page header/footer to doc/docx
Change-Id: Iba39bf12c2419bb480e91ccb45851ec869c40e01
---
M sw/source/filter/ww8/wrtw8sty.cxx
M sw/source/filter/ww8/ww8atr.cxx
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index f002c1f..81e3ed7 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1525,7 +1525,6 @@
sal_uInt8 nBreakCode = 2;// default neue Seite beginnen
bool bOutPgDscSet = true, bLeftRightPgChain = false;
const SwFrmFmt* pPdFmt = pPd-GetMaster();
-const SwFrmFmt* pPdFirstPgFmt = pPdFmt;
if ( rSepInfo.pSectionFmt )
{
// ist pSectionFmt gesetzt, dann gab es einen SectionNode
@@ -1584,7 +1583,15 @@
}
}
-bool titlePage = false;
+// Libreoffice 4.0+ introduces support for page styles (SwPageDesc) with
+// a different header/footer for the first page. The same effect can be
+// achieved by chaining two page styles together (SwPageDesc::GetFollow)
+// which are identical except for header/footer.
+// The latter method is still used by the doc/docx import filter.
+// In both of these cases, we emit a single Word section with different
+// first page header/footer.
+const SwFrmFmt* pPdFirstPgFmt = pPd-GetFirst();
+bool titlePage = pPdFmt != pPdFirstPgFmt;
if ( bOutPgDscSet )
{
// es ist ein Follow gesetzt und dieser zeigt nicht auf sich
@@ -1600,7 +1607,7 @@
{
const SwPageDesc *pFollow = pPd-GetFollow();
const SwFrmFmt rFollowFmt = pFollow-GetMaster();
-if ( sw::util::IsPlausableSingleWordSection( *pPdFmt, rFollowFmt )
)
+if ( sw::util::IsPlausableSingleWordSection( *pPdFirstPgFmt,
rFollowFmt ) )
{
if (rSepInfo.pPDNd)
pPdFirstPgFmt = pPd-GetPageFmtOfNode( *rSepInfo.pPDNd );
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 003bde1..096f012 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -364,7 +364,7 @@
bNewPageDesc = true;
else
{
-const SwFrmFmt rTitleFmt = pAktPageDesc-GetMaster();
+const SwFrmFmt rTitleFmt = pAktPageDesc-GetFirst();
const SwFrmFmt rFollowFmt = pCurrent-GetMaster();
bNewPageDesc = !IsPlausableSingleWordSection(rTitleFmt,
--
To view, visit https://gerrit.libreoffice.org/2062
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba39bf12c2419bb480e91ccb45851ec869c40e01
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Luke Deller l...@deller.id.au
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fix compile for change to boost 1.53.0 declaring smart point...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2064
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/2064/1
fix compile for change to boost 1.53.0 declaring smart pointer operator bool as
explicity for C++11 compilers
Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79
---
M comphelper/inc/comphelper/scoped_disposing_ptr.hxx
M sc/source/filter/excel/xechart.cxx
M sc/source/filter/excel/xehelper.cxx
M sc/source/filter/excel/xichart.cxx
M sc/source/filter/inc/xichart.hxx
M slideshow/source/engine/animatedsprite.cxx
M slideshow/source/engine/shapes/viewshape.cxx
M slideshow/source/engine/shapesubset.cxx
M slideshow/source/engine/slide/slideanimations.cxx
M slideshow/source/inc/shapeattributelayer.hxx
M slideshow/source/inc/shapeattributelayerholder.hxx
M sw/source/core/inc/bookmrk.hxx
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
index 9b4fe1b..6c34074 100644
--- a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
+++ b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
@@ -78,7 +78,7 @@
operator bool () const
{
-return m_aItem;
+return static_cast bool (m_aItem);
}
virtual ~scoped_disposing_ptr()
diff --git a/sc/source/filter/excel/xechart.cxx
b/sc/source/filter/excel/xechart.cxx
index fd99e8b..75a2eb2 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -683,7 +683,7 @@
bool XclExpChEscherFormat::IsValid() const
{
-return maData.mxEscherSet;
+return static_cast bool (maData.mxEscherSet);
}
void XclExpChEscherFormat::Save( XclExpStream rStrm )
diff --git a/sc/source/filter/excel/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index c493560..81e9ac2 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -303,7 +303,7 @@
if( GetBiff() == EXC_BIFF8 )// no HLINK records in BIFF2-BIFF7
{
// there was/is already a HLINK record
-mbMultipleUrls = mxLinkRec;
+mbMultipleUrls = static_cast bool (mxLinkRec);
mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos )
);
diff --git a/sc/source/filter/excel/xichart.cxx
b/sc/source/filter/excel/xichart.cxx
index 63c9c43..f2321bf 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2690,7 +2690,7 @@
maType.Finalize( bStockChart );
// extended type info
-maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false );
+maTypeInfo.Set( maType.GetTypeInfo(), static_cast bool (mxChart3d),
false );
// reverse series order for some unstacked 2D chart types
if( maTypeInfo.mbReverseSeries !Is3dChart() !maType.IsStacked()
!maType.IsPercent() )
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 57538f0..7c44412 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -1230,9 +1230,9 @@
/** Returns true, if the axis contains caption labels. */
inline bool HasLabels() const { return !mxTick ||
mxTick-HasLabels(); }
/** Returns true, if the axis shows its major grid lines. */
-inline bool HasMajorGrid() const { return mxMajorGrid; }
+inline bool HasMajorGrid() const { return static_cast bool
(mxMajorGrid); }
/** Returns true, if the axis shows its minor grid lines. */
-inline bool HasMinorGrid() const { return mxMinorGrid; }
+inline bool HasMinorGrid() const { return static_cast bool
(mxMinorGrid); }
/** Creates an API axis object. */
XAxisRefCreateAxis( const XclImpChTypeGroup rTypeGroup, const
XclImpChAxis* pCrossingAxis ) const;
diff --git a/slideshow/source/engine/animatedsprite.cxx
b/slideshow/source/engine/animatedsprite.cxx
index e63d600..5d421c2 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -151,7 +151,7 @@
}
}
-return mpSprite;
+return static_cast bool (mpSprite);
}
void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize
rPixelOffset )
diff --git a/slideshow/source/engine/shapes/viewshape.cxx
b/slideshow/source/engine/shapes/viewshape.cxx
index 20c73de..621535f 100644
--- a/slideshow/source/engine/shapes/viewshape.cxx
+++ b/slideshow/source/engine/shapes/viewshape.cxx
@@ -178,7 +178,7 @@
}
}
-return io_rCacheEntry.mpRenderer;
+return static_cast bool (io_rCacheEntry.mpRenderer);
}
bool ViewShape::draw( const ::cppcanvas::CanvasSharedPtr
rDestinationCanvas,
diff --git a/slideshow/source/engine/shapesubset.cxx
b/slideshow/source/engine/shapesubset.cxx
index c5636cc..da28159 100644
---
[PATCH] import different first page header/footer from doc
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2065
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/2065/1
import different first page header/footer from doc
When a Word section has a different first page header/footer,
this used to be imported into LO as a chain of two page styles.
Now that LO supports a single page style with different first page
header/footer we can import to that.
This change also incidentally fixes fdo#57908.
bnc#654230 had the same underlying problem, so the workaround committed
for that (which includes comments expressing lack of understanding)
has been removed.
Change-Id: I6df7e9abc8f2a327a3b33e06322ca943f6f24605
---
M sw/source/filter/ww8/wrtw8sty.cxx
M sw/source/filter/ww8/ww8par.cxx
M sw/source/filter/ww8/ww8par.hxx
M sw/source/filter/ww8/ww8par6.cxx
4 files changed, 76 insertions(+), 151 deletions(-)
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx
b/sw/source/filter/ww8/wrtw8sty.cxx
index b0e4e92..980c4e6 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -1622,12 +1622,6 @@
}
}
-// The code above tries to detect if this is first page
headers/footers,
-// but it doesn't work even for quite trivial testcases. As I don't
actually
-// understand that code, I'll keep it. The simple and (at least for
me) reliable way
-// to detect for first page seems to be just RES_POOLPAGE_FIRST.
-if( pPd-GetPoolFmtId() == RES_POOLPAGE_FIRST )
-titlePage = true;
if( titlePage )
AttrOutput().SectionTitlePage();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index fdef14c..2659624 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1932,27 +1932,11 @@
return false;
}
-void SwWW8ImplReader::Read_HdFt(bool bIsTitle, int nSect,
-const SwPageDesc *pPrev, const wwSection rSection)
+void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
+const wwSection rSection)
{
-sal_uInt8 nWhichItems = 0;
-SwPageDesc *pPD = 0;
-if (!bIsTitle)
-{
-nWhichItems =
-rSection.maSep.grpfIhdt ~(WW8_HEADER_FIRST | WW8_FOOTER_FIRST);
-pPD = rSection.mpPage;
-}
-else
-{
-// Always read title page header/footer data - it could be used by
following sections
-nWhichItems = ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST );
-
-pPD = rSection.mpTitlePage;
-}
-
sal_uInt8 grpfIhdt = rSection.maSep.grpfIhdt;
-
+SwPageDesc *pPD = rSection.mpPage;
if( pHdFt )
{
@@ -1962,7 +1946,7 @@
for( sal_uInt8 nI = 0x20; nI; nI = 1, nNumber-- )
{
-if (nI nWhichItems)
+if (nI grpfIhdt)
{
bool bOk = true;
if( bVer67 )
@@ -1975,10 +1959,14 @@
bool bUseLeft
= (nI ( WW8_HEADER_EVEN | WW8_FOOTER_EVEN )) ? true:
false;
+bool bUseFirst
+= (nI ( WW8_HEADER_FIRST | WW8_FOOTER_FIRST )) ? true:
false;
bool bFooter
= (nI ( WW8_FOOTER_EVEN | WW8_FOOTER_ODD |
WW8_FOOTER_FIRST )) ? true: false;
-SwFrmFmt rFmt = bUseLeft ? pPD-GetLeft() : pPD-GetMaster();
+SwFrmFmt rFmt = bUseLeft ? pPD-GetLeft()
+: bUseFirst ? pPD-GetFirst()
+: pPD-GetMaster();
SwFrmFmt* pHdFtFmt;
if (bFooter)
@@ -1989,6 +1977,8 @@
pPD-GetMaster().SetFmtAttr(SwFmtFooter(true));
if (bUseLeft)
pPD-GetLeft().SetFmtAttr(SwFmtFooter(true));
+if (bUseFirst)
+pPD-GetFirst().SetFmtAttr(SwFmtFooter(true));
pHdFtFmt =
const_castSwFrmFmt*(rFmt.GetFooter().GetFooterFmt());
}
else
@@ -1999,6 +1989,8 @@
pPD-GetMaster().SetFmtAttr(SwFmtHeader(true));
if (bUseLeft)
pPD-GetLeft().SetFmtAttr(SwFmtHeader(true));
+if (bUseFirst)
+pPD-GetFirst().SetFmtAttr(SwFmtHeader(true));
pHdFtFmt =
const_castSwFrmFmt*(rFmt.GetHeader().GetHeaderFmt());
}
@@ -2042,16 +2034,8 @@
OSL_ENSURE(rSection.mpPage, makes no sense to call with a main page);
if (rSection.mpPage)
{
-mrReader.Read_HdFt(false, nSect, pPrevious ? pPrevious-mpPage : 0,
+mrReader.Read_HdFt(nSect, pPrevious ? pPrevious-mpPage : 0,
rSection);
-}
-
-if (rSection.mpTitlePage)
-{
-// 2 Pagedescs noetig: 1.Seite und folgende
-// 1. Seite einlesen
-mrReader.Read_HdFt(true, nSect, pPrevious ? pPrevious-mpTitlePage : 0,
-rSection);
[PATCH] add 6 width border to toplevel widgets of printdialog
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/2067 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/2067/1 add 6 width border to toplevel widgets of printdialog Change-Id: I415769aeda335d65a4a5dc03be56e26a860046e3 --- M vcl/uiconfig/ui/printdialog.ui 1 file changed, 4 insertions(+), 0 deletions(-) diff --git a/vcl/uiconfig/ui/printdialog.ui b/vcl/uiconfig/ui/printdialog.ui index 227063e..a49737e 100644 --- a/vcl/uiconfig/ui/printdialog.ui +++ b/vcl/uiconfig/ui/printdialog.ui @@ -190,6 +190,7 @@ object class=GtkBox id=box3 property name=visibleTrue/property property name=can_focusFalse/property +property name=border_width6/property property name=orientationvertical/property child object class=GtkFrame id=frame1 @@ -910,6 +911,7 @@ object class=GtkBox id=customcontents property name=visibleTrue/property property name=can_focusFalse/property +property name=border_width6/property property name=orientationvertical/property child placeholder/ @@ -934,6 +936,7 @@ object class=GtkBox id=box9 property name=visibleTrue/property property name=can_focusFalse/property +property name=border_width6/property property name=orientationvertical/property child object class=GtkFrame id=frame5 @@ -1368,6 +1371,7 @@ object class=GtkFrame id=frame6 property name=visibleTrue/property property name=can_focusFalse/property +property name=border_width6/property property name=label_xalign0/property property name=shadow_typenone/property child -- To view, visit https://gerrit.libreoffice.org/2067 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I415769aeda335d65a4a5dc03be56e26a860046e3 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] convert setup_native to gbuild and add to tail_build
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2063 Approvals: David Ostrovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2063 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie12338dada22c59d55d89ed9611bb1a958b04223 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/frmtool.cxx | 167 +++---
1 file changed, 84 insertions(+), 83 deletions(-)
New commits:
commit 020e2b900b017d64a52f494707015a0e2e959d63
Author: Matthias Freund matti...@yahoo.de
Date: Sat Feb 9 23:35:08 2013 +0100
Remmark translation german - english
This is only partly translated, i do the rest another day.
I hope it helps a lot.
Change-Id: I35d23c9e75d0880df76eaf652fcc9b0fb1bb2112
Reviewed-on: https://gerrit.libreoffice.org/2069
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index 8b43fe6..75790e4 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -200,7 +200,7 @@ SwFrmNotify::~SwFrmNotify()
}
}
-//Fuer Hintergrundgrafiken muss bei Groessenaenderungen ein Repaint her.
+//For each resize of the background graphics is a repaint necessary.
const bool bPrtWidth =
(aPrt.*fnRect-fnGetWidth)() !=
(pFrm-Prt().*fnRect-fnGetWidth)();
const bool bPrtHeight =
@@ -470,12 +470,13 @@ SwLayNotify::~SwLayNotify()
}
else
{
-//Proportionale Anpassung der innenliegenden.
-//1. Wenn der Formatierte kein Fly ist
-//2. Wenn er keine Spalten enthaelt
-//3. Wenn der Fly eine feste Hoehe hat und die Spalten in der
+//Proportional adoption of the internal.
+//1. If the formatted is no Fly
+//2. If he contains no columns
+//3. If the Fly has a fixed hight and the columns
+// are next to be.
// Hoehe danebenliegen.
-//4. niemals bei SectionFrms.
+//4. Never at SectionFrms.
bool bLow;
if( pLay-IsFlyFrm() )
{
@@ -530,25 +531,25 @@ SwLayNotify::~SwLayNotify()
}
}
bNotify = true;
-//TEUER!! aber wie macht man es geschickter?
+//EXPENSIVE!! But how we do it more elegant?
if( bInvaPercent )
pLay-InvaPercentLowers( pLay-Prt().Height() - aPrt.Height()
);
}
if ( pLay-IsTabFrm() )
-//Damit _nur_ der Shatten bei Groessenaenderungen gemalt wird.
+//So that _only_ the shadow is drawn while resizing.
((SwTabFrm*)pLay)-SetComplete();
else
{
const ViewShell *pSh = pLay-getRootFrm()-GetCurrShell();
if( !( pSh pSh-GetViewOptions()-getBrowseMode() ) ||
!(pLay-GetType() (FRM_BODY | FRM_PAGE)) )
-//Damit die untergeordneten sauber retouchiert werden.
-//Problembsp: Flys an den Henkeln packen und verkleinern.
-//Nicht fuer Body und Page, sonst flackerts beim HTML-Laden.
+//Thereby the subordinates are retouched clean.
+//Example problem: Take the Flys with the handles and downsize.
+//Not for body and page, otherwise it flickers when loading HTML.
pLay-SetCompletePaint();
}
}
-//Lower benachrichtigen wenn sich die Position veraendert hat.
+//Notify Lower if the position has changed.
const bool bPrtPos = POS_DIFF( aPrt, pLay-Prt() );
const bool bPos = bPrtPos || POS_DIFF( aFrm, pLay-Frm() );
const bool bSize = pLay-Frm().SSize() != aFrm.SSize();
@@ -559,7 +560,7 @@ SwLayNotify::~SwLayNotify()
if ( bPrtPos )
pLay-SetCompletePaint();
-//Nachfolger benachrichtigen wenn sich die SSize geaendert hat.
+//Inform the Follower if the SSize has changed.
if ( bSize )
{
if( pLay-GetNext() )
@@ -646,8 +647,8 @@ SwFlyNotify::~SwFlyNotify()
SwViewImp *pImp = pSh ? pSh-Imp() : 0;
if ( !pImp || !pImp-IsAction() || !pImp-GetLayAction().IsAgain() )
{
-//Wenn in der LayAction das IsAgain gesetzt ist kann es sein,
-//dass die alte Seite inzwischen vernichtet wurde!
+//If in the LayAction the IsAgain is set it can be
+//that the old page is destroyed in the meantime!
::Notify( pFly, pOldPage, aFrmAndSpace, aPrt );
// #i35640# - additional notify anchor text frame,
// if Writer fly frame has changed its page
@@ -660,8 +661,8 @@ SwFlyNotify::~SwFlyNotify()
pFly-ResetNotifyBack();
}
-//Haben sich Groesse oder Position geaendert, so sollte die View
-//das wissen.
+//Have the size or the positon changed,
+//so should the view know this.
SWRECTFN( pFly )
const bool bPosChgd = POS_DIFF( aFrm, pFly-Frm() );
const bool bFrmChgd = pFly-Frm().SSize() != aFrm.SSize();
@@ -784,7 +785,7 @@ SwCntntNotify::~SwCntntNotify()
pCell = pCell-GetUpper();
[Libreoffice-commits] core.git: comphelper/inc sc/source slideshow/source sw/source
comphelper/inc/comphelper/scoped_disposing_ptr.hxx |2 +-
sc/source/filter/excel/xechart.cxx |2 +-
sc/source/filter/excel/xehelper.cxx|2 +-
sc/source/filter/excel/xichart.cxx |2 +-
sc/source/filter/inc/xichart.hxx |4 ++--
slideshow/source/engine/animatedsprite.cxx |2 +-
slideshow/source/engine/shapes/viewshape.cxx |2 +-
slideshow/source/engine/shapesubset.cxx|2 +-
slideshow/source/engine/slide/slideanimations.cxx |2 +-
slideshow/source/inc/shapeattributelayer.hxx |2 +-
slideshow/source/inc/shapeattributelayerholder.hxx |2 +-
sw/source/core/inc/bookmrk.hxx |2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit d4bab97023e3569571a92551040574b20aceca7c
Author: Mark Wright markwri...@internode.on.net
Date: Sun Feb 10 02:04:02 2013 +1100
fix compile for change to boost 1.53.0 declaring smart pointer operator
bool as explicity for C++11 compilers
Change-Id: If2c3ad68b2ffea645a9f2035cd802553edc0ee79
Reviewed-on: https://gerrit.libreoffice.org/2064
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
index 9b4fe1b..6c34074 100644
--- a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
+++ b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
@@ -78,7 +78,7 @@ public:
operator bool () const
{
-return m_aItem;
+return static_cast bool (m_aItem);
}
virtual ~scoped_disposing_ptr()
diff --git a/sc/source/filter/excel/xechart.cxx
b/sc/source/filter/excel/xechart.cxx
index fd99e8b..75a2eb2 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -683,7 +683,7 @@ void XclExpChEscherFormat::Convert( const ScfPropertySet
rPropSet, XclChObjectT
bool XclExpChEscherFormat::IsValid() const
{
-return maData.mxEscherSet;
+return static_cast bool (maData.mxEscherSet);
}
void XclExpChEscherFormat::Save( XclExpStream rStrm )
diff --git a/sc/source/filter/excel/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index c493560..81e9ac2 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -303,7 +303,7 @@ rtl::OUString XclExpHyperlinkHelper::ProcessUrlField( const
SvxURLField rUrlFie
if( GetBiff() == EXC_BIFF8 )// no HLINK records in BIFF2-BIFF7
{
// there was/is already a HLINK record
-mbMultipleUrls = mxLinkRec;
+mbMultipleUrls = static_cast bool (mxLinkRec);
mxLinkRec.reset( new XclExpHyperlink( GetRoot(), rUrlField, maScPos )
);
diff --git a/sc/source/filter/excel/xichart.cxx
b/sc/source/filter/excel/xichart.cxx
index 63c9c43..f2321bf 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -2690,7 +2690,7 @@ void XclImpChTypeGroup::Finalize()
maType.Finalize( bStockChart );
// extended type info
-maTypeInfo.Set( maType.GetTypeInfo(), mxChart3d, false );
+maTypeInfo.Set( maType.GetTypeInfo(), static_cast bool (mxChart3d),
false );
// reverse series order for some unstacked 2D chart types
if( maTypeInfo.mbReverseSeries !Is3dChart() !maType.IsStacked()
!maType.IsPercent() )
diff --git a/sc/source/filter/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx
index 57538f0..7c44412 100644
--- a/sc/source/filter/inc/xichart.hxx
+++ b/sc/source/filter/inc/xichart.hxx
@@ -1230,9 +1230,9 @@ public:
/** Returns true, if the axis contains caption labels. */
inline bool HasLabels() const { return !mxTick ||
mxTick-HasLabels(); }
/** Returns true, if the axis shows its major grid lines. */
-inline bool HasMajorGrid() const { return mxMajorGrid; }
+inline bool HasMajorGrid() const { return static_cast bool
(mxMajorGrid); }
/** Returns true, if the axis shows its minor grid lines. */
-inline bool HasMinorGrid() const { return mxMinorGrid; }
+inline bool HasMinorGrid() const { return static_cast bool
(mxMinorGrid); }
/** Creates an API axis object. */
XAxisRefCreateAxis( const XclImpChTypeGroup rTypeGroup, const
XclImpChAxis* pCrossingAxis ) const;
diff --git a/slideshow/source/engine/animatedsprite.cxx
b/slideshow/source/engine/animatedsprite.cxx
index e63d600..5d421c2 100644
--- a/slideshow/source/engine/animatedsprite.cxx
+++ b/slideshow/source/engine/animatedsprite.cxx
@@ -151,7 +151,7 @@ namespace slideshow
}
}
-return mpSprite;
+return static_cast bool (mpSprite);
}
void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize
rPixelOffset )
diff --git a/slideshow/source/engine/shapes/viewshape.cxx
[Libreoffice-commits] core.git: setup_native/source
setup_native/source/win32/wintools/makecab/parseddf.c |2 ++ 1 file changed, 2 insertions(+) New commits: commit e7014ca47b9147c925fb99154b55c71c7127e935 Author: Julien Nabet serval2...@yahoo.fr Date: Fri Feb 8 22:53:18 2013 +0100 Fix Resource leak: ddf Change-Id: I4361b4f4670a0437c8220d2e7f92f2ffbe0cc479 Reviewed-on: https://gerrit.libreoffice.org/2057 Tested-by: LibreOffice gerrit bot ger...@libreoffice.org Reviewed-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/setup_native/source/win32/wintools/makecab/parseddf.c b/setup_native/source/win32/wintools/makecab/parseddf.c index cbd9914..cf081e3 100644 --- a/setup_native/source/win32/wintools/makecab/parseddf.c +++ b/setup_native/source/win32/wintools/makecab/parseddf.c @@ -378,6 +378,8 @@ DDFERR ParseDdf(char* ddfFile, PCCAB ccab, DDFSRCFILE ** srcListH, unsigned int ccab-cbFolderThresh = ccab-cb; ccab-iDisk = 0; +fclose(ddf); + return DDF_OK; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - sc/source
sc/source/core/tool/reffind.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 03158229fdfda1003d072853610fbfbe433b8be9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Feb 5 15:23:44 2013 -0500
fdo#39135: Prevent integer overflow update the character during loop.
These two errors in the code contributed to the reported bug. Let's
fix them.
Change-Id: If82a1bd4d1e27145b48e722b30388cc9dc4a8a6e
Reviewed-on: https://gerrit.libreoffice.org/2008
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index 660bab0..c8e1722 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -169,15 +169,20 @@ void ExpandToTextR1C1(const sal_Unicode* p, xub_StrLen
nLen, xub_StrLen rStartP
if (c == '\'')
break;
}
+if (rStartPos == 0)
+break;
}
else if (c == ']')
{
// Skip until the opening braket.
for (--rStartPos; rStartPos 0; --rStartPos)
{
+c = p[rStartPos];
if (c == '[')
break;
}
+if (rStartPos == 0)
+break;
}
else if (!IsText(c))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - embeddedobj/source postprocess/Rdb_services.mk sal/inc scp2/source sfx2/source
embeddedobj/source/msole/oleembed.cxx | 13 +++--
embeddedobj/source/msole/ownview.cxx |4 +++-
postprocess/Rdb_services.mk |5 -
sal/inc/sal/log-areas.dox |5 +
scp2/source/ooo/file_library_ooo.scp |3 ++-
sfx2/source/view/ipclient.cxx |9 +++--
6 files changed, 32 insertions(+), 7 deletions(-)
New commits:
commit 5a65ca67d9acefed399ed8706efa402c543bed87
Author: Michael Stahl mst...@redhat.com
Date: Sun Feb 10 00:18:46 2013 +0100
fdo#60491: embeddedobj: catch exception in fallback path
This allows the OLE object to at least be passed to the OS for
opening...
Change-Id: I97f93eb3a015d7771f3fc909517ffb96d61fde52
diff --git a/embeddedobj/source/msole/oleembed.cxx
b/embeddedobj/source/msole/oleembed.cxx
index 81739c3..da15ae0 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -709,7 +709,14 @@ namespace
aArgs ), uno::UNO_QUERY_THROW );
uno::Reference io::XStream xCONTENTS;
-
xNameContainer-getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CONTENTS)))
= xCONTENTS;
+try
+{
+xNameContainer-getByName(CONTENTS) = xCONTENTS;
+}
+catch (container::NoSuchElementException const)
+{
+// ignore
+}
sal_Bool bCopied = xCONTENTS.is()
lcl_CopyStream(xCONTENTS-getInputStream(), xStream-getOutputStream());
commit af8c7599148cf8c2bed567a8fdf5393fc3c16409
Author: Michael Stahl mst...@redhat.com
Date: Sun Feb 10 00:11:01 2013 +0100
embeddedobj: log some exceptions
Change-Id: I2e565bc6e57f7bf59fdd6eb5fc577e0b3d58b9f6
diff --git a/embeddedobj/source/msole/oleembed.cxx
b/embeddedobj/source/msole/oleembed.cxx
index 5fdda99..81739c3 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -854,8 +854,10 @@ void SAL_CALL OleEmbeddedObject::doVerb( sal_Int32 nVerbID
)
{
throw;
}
-catch( uno::Exception )
+catch (uno::Exception const e)
{
+SAL_WARN(embeddedobj.ole, OleEmbeddedObject::doVerb:
+-9 fallback path: exception caught: e.Message);
}
}
diff --git a/embeddedobj/source/msole/ownview.cxx
b/embeddedobj/source/msole/ownview.cxx
index 7447b9c..8b4dbf8 100644
--- a/embeddedobj/source/msole/ownview.cxx
+++ b/embeddedobj/source/msole/ownview.cxx
@@ -167,8 +167,10 @@ sal_Bool OwnView_Impl::CreateModelFromURL( const
::rtl::OUString aFileURL )
}
}
}
-catch( const uno::Exception )
+catch (uno::Exception const e)
{
+SAL_WARN(embeddedobj.ole, OwnView_Impl::CreateModelFromURL:
+ exception caught: e.Message);
}
}
diff --git a/sal/inc/sal/log-areas.dox b/sal/inc/sal/log-areas.dox
index 7f3f4a4..0d2ae52 100644
--- a/sal/inc/sal/log-areas.dox
+++ b/sal/inc/sal/log-areas.dox
@@ -75,6 +75,11 @@ certain functionality.
@li @c editeng
@li @c editeng.items
+@section embeddedobj
+
+@li @c embeddedobj - embedded objects
+@li @c embeddedobj.ole - OLE embedded objects
+
@section extensions
@li @c extensions.plugin
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 1310df3..ffed312 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -971,8 +971,11 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
m_pImp-m_aScaleHeight = Fraction(
aScaledArea.GetHeight(), aNewSize.Height() );
}
}
-catch ( uno::Exception )
+catch (uno::Exception const e)
{
+SAL_WARN(embeddedobj, SfxInPlaceClient::DoVerb:
+ -9 fallback path: exception caught:
+ e.Message);
nError = ERRCODE_SO_GENERALERROR;
}
}
@@ -982,8 +985,10 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
// TODO/LATER: it would be nice to be able to provide the
current target state outside
nError = ERRCODE_SO_CANNOT_DOVERB_NOW;
}
-catch ( uno::Exception )
+catch (uno::Exception const e)
{
+SAL_WARN(embeddedobj, SfxInPlaceClient::DoVerb:
+ exception caught: e.Message);
nError = ERRCODE_SO_GENERALERROR;
//TODO/LATER: better error handling
}
commit ca8ac449e3524f895de1e94a3c5d511591031b40
Author: Michael Stahl mst...@redhat.com
Date: Sat Feb 9 22:39:42 2013 +0100
fdo#60491: scp2: always
[Libreoffice-commits] core.git: sc/source
sc/source/ui/view/cellsh1.cxx | 74 ++
1 file changed, 54 insertions(+), 20 deletions(-)
New commits:
commit 5fe7b7561aa78e87f90e8a9436cb674e53ef8f4e
Author: Winfried Donkers o...@dci-electronics.nl
Date: Mon Jan 28 18:42:38 2013 +0100
fdo#56098 paste special shift options incorrect/incomplete
Change-Id: Ic84ec07f4e0963ad1759036f1d7cbfa295289375
Reviewed-on: https://gerrit.libreoffice.org/1903
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index c22d91d..c32ed5d 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1259,29 +1259,63 @@ void ScCellShell::ExecuteEdit( SfxRequest rReq )
pDlg-SetOtherDoc( bOtherDoc );
// if ChangeTrack MoveMode disable
pDlg-SetChangeTrack( pDoc-GetChangeTrack() !=
NULL );
-// cut/move references may disable shift
-// directions if source and destination ranges
intersect
-if ( !bOtherDoc )
+// fdo#56098 disable shift if necessary
+if ( !bOtherDoc pOwnClip )
{
-if ( pOwnClip
pOwnClip-GetDocument()-IsCutMode() )
+ScViewData* pData = GetViewData();
+if ( pData-GetMarkData().GetTableSelect(
pData-GetTabNo() ) )
{
-ScViewData* pData = GetViewData();
-if ( pData-GetMarkData().GetTableSelect(
-pData-GetTabNo() ) )
+SCCOL nStartX, nEndX, nClipStartX,
nClipSizeX, nRangeSizeX;
+SCROW nStartY, nEndY, nClipStartY,
nClipSizeY, nRangeSizeY;
+SCTAB nStartTab, nEndTab;
+pOwnClip-GetDocument()-GetClipStart(
nClipStartX, nClipStartY );
+pOwnClip-GetDocument()-GetClipArea(
nClipSizeX, nClipSizeY, sal_True );
+
+if ( !( pData-GetSimpleArea( nStartX,
nStartY, nStartTab,
+ nEndX, nEndY, nEndTab ) ==
SC_MARK_SIMPLE
+ nStartTab == nEndTab ) )
{
-SCCOL nPosX = pData-GetCurX();
-SCROW nPosY = pData-GetCurY();
-SCCOL nClipSizeX;
-SCROW nClipSizeY;
-// for CutMode, filtered rows can
always be included
-pOwnClip-GetDocument()-GetClipArea(
nClipSizeX, nClipSizeY, sal_True );
-int nDisableShift = 0;
-if ( nPosX + 2 * nClipSizeX + 1
MAXCOL ) // fdo#56098
- nDisableShift |=
SC_CELL_SHIFT_DISABLE_RIGHT;
-if ( nPosY + 2 * nClipSizeY + 1
MAXROW ) // fdo#56098
-nDisableShift |=
SC_CELL_SHIFT_DISABLE_DOWN;
-if ( nDisableShift )
-pDlg-SetCellShiftDisabled(
nDisableShift );
+// the destination is not a simple
range,
+// assume the destination as the
current cell
+nStartX = nEndX = pData-GetCurX();
+nStartY = nEndY = pData-GetCurY();
+nStartTab = pData-GetTabNo();
+}
+// we now have clip- and range dimensions
+// the size of the destination area is the
larger of the two
+nRangeSizeX = nClipSizeX = nEndX -
nStartX ? nClipSizeX : nEndX - nStartX;
+nRangeSizeY = nClipSizeY = nEndY -
nStartY ? nClipSizeY : nEndY - nStartY;
+// When the source and destination areas
intersect things may go wrong,
+// especially if the area contains
references. This may produce data loss
+// (e.g. formulas that get wrong
references), this scenario _must_ be avoided.
+
[Libreoffice-commits] core.git: sw/source
sw/source/ui/wrtsh/delete.cxx | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
New commits:
commit 8d09cb0fc4530c2c1aeb8fa79dc91509de1e8943
Author: Matthias Freund matti...@yahoo.de
Date: Sun Feb 10 00:08:20 2013 +0100
Comment translation german - english.
sw/source/ui/wrtsh/delete.cxx
Change-Id: I92487e7474c4e27cee939812edf410e9a26731e7
Reviewed-on: https://gerrit.libreoffice.org/2070
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index 6f6d3aa..d858742 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -83,7 +83,7 @@ bool SwWrtShell::TryRemoveIndent()
}
/*
- Beschreibung: Zeile loeschen
+ Description: Erase the line
*/
@@ -92,7 +92,7 @@ long SwWrtShell::DelLine()
{
SwActContext aActContext(this);
ResetCursorStack();
-// alten Cursor merken
+// remember the old cursor
Push();
ClearMark();
SwCrsrShell::LeftMargin();
@@ -130,7 +130,7 @@ long SwWrtShell::DelToEndOfLine()
long SwWrtShell::DelLeft()
{
-// wenns denn ein Fly ist, wech damit
+// If it's a Fly, throw it away
int nSelType = GetSelectionType();
const int nCmp = nsSelectionType::SEL_FRM | nsSelectionType::SEL_GRF |
nsSelectionType::SEL_OLE | nsSelectionType::SEL_DRW;
if( nCmp nSelType )
@@ -156,13 +156,13 @@ long SwWrtShell::DelLeft()
return 1L;
}
-// wenn eine Selektion existiert, diese loeschen.
+// If a selection exists, erase this
if ( IsSelection() )
{
if( !IsBlockMode() || HasSelection() )
{
-//OS: wieder einmal Basic: SwActContext muss vor
-//EnterStdMode verlassen werden!
+//OS: Once again Basic: SwActContext must be leaved
+//before EnterStdMode!
{
SwActContext aActContext(this);
ResetCursorStack();
@@ -183,7 +183,7 @@ long SwWrtShell::DelLeft()
EnterStdMode();
}
-// JP 29.06.95: nie eine davor stehende Tabelle loeschen.
+// JP 29.06.95: never erase a table wich standing in front of.
bool bSwap = false;
const SwTableNode * pWasInTblNd = SwCrsrShell::IsCrsrInTbl();
@@ -234,8 +234,8 @@ long SwWrtShell::DelLeft()
long SwWrtShell::DelRight()
{
-// werden verodert, wenn Tabellenselektion vorliegt;
-// wird hier auf nsSelectionType::SEL_TBL umgesetzt.
+// Will be or'ed, if a tableselection exists;
+// will here be implemented on nsSelectionType::SEL_TBL
long nRet = 0;
int nSelection = GetSelectionType();
if(nSelection nsSelectionType::SEL_TBL_CELLS)
@@ -251,13 +251,13 @@ long SwWrtShell::DelRight()
case nsSelectionType::SEL_TXT:
case nsSelectionType::SEL_TBL:
case nsSelectionType::SEL_NUM:
-// wenn eine Selektion existiert, diese loeschen.
+// If a selection exists, erase it.
if( IsSelection() )
{
if( !IsBlockMode() || HasSelection() )
{
-//OS: wieder einmal Basic: SwActContext muss vor
-//EnterStdMode verlassen werden!
+//OS: And once again Basic: SwActContext must be
+//leaved before EnterStdMode !
{
SwActContext aActContext(this);
ResetCursorStack();
@@ -445,9 +445,9 @@ long SwWrtShell::DelToStartOfPara()
return nRet;
}
/*
- * alle Loeschoperationen sollten mit Find statt mit
- * Nxt-/PrvDelim arbeiten, da letzteren mit Wrap Around arbeiten
- * -- das ist wohl nicht gewuenscht.
+ * All erase operations should work with Find instead with
+ * Nxt-/PrvDelim, because the latter works with Wrap Around
+ * -- that's probably not wished.
*/
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/docsh.sdi |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a83a362e5865830018d5b99f84faf251760556b9
Author: Matthias Freund matti...@yahoo.de
Date: Sun Feb 10 00:36:27 2013 +0100
Comment translation german - english
Translation.
Change-Id: I07d8f85437ce6ff59ac40970de29cc2fccde3d5a
Reviewed-on: https://gerrit.libreoffice.org/2071
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/sdi/docsh.sdi b/sw/sdi/docsh.sdi
index 2c8a9e9..83253dc 100644
--- a/sw/sdi/docsh.sdi
+++ b/sw/sdi/docsh.sdi
@@ -21,7 +21,7 @@ interface TextDocument : BaseTextDocument
uuid = 0D960120-111C-101D-9757-6E74207A7520
]
{
-// Slots, die nicht in der WebDocShell gebraucht werden
+// Slots, wich are not needed in the WebDocShell
FN_OUTLINE_TO_IMPRESS
[
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/tabsh.sdi |4 ++--
sw/sdi/textsh.sdi |4 ++--
sw/sdi/viewsh.sdi |2 +-
sw/sdi/wdocsh.sdi |2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 408f462daff5fb059f775e69f9f8f724f765ea22
Author: Matthias Freund matti...@yahoo.de
Date: Sun Feb 10 00:53:33 2013 +0100
Comment translation german - english
This times i have more files with few translations.
Change-Id: I5a6cb89a36b8fab3db8cfb4029316e51834445b6
Reviewed-on: https://gerrit.libreoffice.org/2072
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index cb2f2b1..3f78944 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -21,8 +21,8 @@ interface TextTable : BaseTextTable
uuid = 49CE7CA0-111A-101D-9757-6E74207A7520
]
{
-// hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
-// nicht unterstuetzt werden
+// Here should the slots be integrated, which are not supported
+// in StarWriter/WEB
import TextSelection;
diff --git a/sw/sdi/textsh.sdi b/sw/sdi/textsh.sdi
index e6cd93c..b817536 100644
--- a/sw/sdi/textsh.sdi
+++ b/sw/sdi/textsh.sdi
@@ -28,8 +28,8 @@ interface Text : BaseText
DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR;
Cachable ;
]
- // hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
- // nicht unterstuetzt werden
+ // Here should the slots be integrated, which are not supported
+ // in StarWriter/WEB
import TextSelection;
diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi
index 479a188..e6b4bc3 100644
--- a/sw/sdi/viewsh.sdi
+++ b/sw/sdi/viewsh.sdi
@@ -43,7 +43,7 @@ interface TextEditView : BaseTextEditView
uuid = 09782660-111A-101D-9757-6E74207A7520
]
{
- // Slots, die nicht in der WebDocShell gebraucht werden
+ // Slots, wich are not needed in the WebDocShell
FN_INSERT_OBJ_CTRL
[
ExecMethod = Execute ;
diff --git a/sw/sdi/wdocsh.sdi b/sw/sdi/wdocsh.sdi
index 68bfe71..f3d62b9 100644
--- a/sw/sdi/wdocsh.sdi
+++ b/sw/sdi/wdocsh.sdi
@@ -21,7 +21,7 @@ interface WebDocument : BaseTextDocument
uuid = B47F0DE4-1E1F-11d1-89CA-008029E4B0B1
]
{
-// hier nur Slots, die der vollstaendige Writer nicht braucht
+// here only Slots, which the full Writer doesn't need
SID_SOURCEVIEW
[
ExecMethod = Execute ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi
sw/sdi/wtextsh.sdi |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 77f2073df576ebec5303bc29a242597f75ab0e61 Author: Matthias Freund matti...@yahoo.de Date: Sun Feb 10 01:14:30 2013 +0100 Comment translation german - english And again a litte change... Change-Id: Ia2fe42dc34983755a8ed23d188f41f73be71e5c8 Reviewed-on: https://gerrit.libreoffice.org/2073 Reviewed-by: Norbert Thiebaud nthieb...@gmail.com Tested-by: Norbert Thiebaud nthieb...@gmail.com diff --git a/sw/sdi/wtextsh.sdi b/sw/sdi/wtextsh.sdi index 818f3fd..94af14e 100644 --- a/sw/sdi/wtextsh.sdi +++ b/sw/sdi/wtextsh.sdi @@ -28,8 +28,8 @@ interface WebText : BaseText DisableFlags=SW_DISABLE_ON_PROTECTED_CURSOR; Cachable ; ] -// hier sollen die Slots eingefuegt werden, die n u r vom StarWriter/WEB -// unterstuetzt werden +// Here should the slots are be inserted, but O N L Y those that are supported +// by StarWriter/WEB import TextSelection; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - config_host.mk.in configure.ac solenv/bin
config_host.mk.in |1
configure.ac | 35
solenv/bin/modules/installer/simplepackage.pm | 37 ++
3 files changed, 73 insertions(+)
New commits:
commit 4db4976033e55e35eb779e0f9083981f8a2b2cbc
Author: Tor Lillqvist t...@iki.fi
Date: Fri Feb 8 01:08:42 2013 +0200
Add support for codesigning on Mac OS X
Only sign the .app. Presumably that's enough here in the 4.0 branch.
Change-Id: I7a25c6b7bfa2047b1cb6bcb913750b1b476124f6
Reviewed-on: https://gerrit.libreoffice.org/2031
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/config_host.mk.in b/config_host.mk.in
index d7ede5a..7b9834d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -312,6 +312,7 @@ export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
export LINK_X64_BINARY=@LINK_X64_BINARY@
@x_Cygwin@ export LS=@WIN_LS@
export MANDIR=@MANDIR@
+export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
export MACOSX_DEPLOYMENT_TARGET=@MACOSX_DEPLOYMENT_TARGET@
export MACOSX_DEPLOYMENT_TARGET_FOR_BUILD=@MACOSX_DEPLOYMENT_TARGET_FOR_BUILD@
export MACOSX_SDK_PATH=@MACOSX_SDK_PATH@
diff --git a/configure.ac b/configure.ac
index 5bdbd37..e7c06f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1081,6 +1081,15 @@ AC_ARG_ENABLE(silent-msi,
[Enable MSI with LIMITUI=1 (silent install).]),
,)
+AC_ARG_ENABLE(macosx-code-signing,
+AS_HELP_STRING([--enable-macosx-code-signing=identity],
+[Sign the app bundle being stored in the disk image. The
+ default is to do signing if there is a suitable certificate
+ in your keychain, so if you don't want that, use the
+ corresponding --disable option. Experimental work in
+ progress, don't use unless you are working on this.]),
+,)
+
AC_ARG_ENABLE(postgresql-sdbc,
AS_HELP_STRING([--disable-postgresql-sdbc],
[Disable the build of the PostgreSQL-SDBC driver.])
@@ -2822,6 +2831,31 @@ if test $_os = Darwin; then
fi
AC_MSG_NOTICE([MAC_OS_X_VERSION_MIN_REQUIRED=$MAC_OS_X_VERSION_MIN_REQUIRED])
AC_MSG_NOTICE([MAC_OS_X_VERSION_MAX_ALLOWED=$MAC_OS_X_VERSION_MAX_ALLOWED])
+
+AC_MSG_CHECKING([whether to do code signing])
+
+if test -z $enable_macosx_code_signing -o $enable_macosx_code_signing
= yes; then
+# By default use the first suitable certificate (?).
+
+#
http://stackoverflow.com/questions/13196291/difference-between-mac-developer-and-3rd-party-mac-developer-application
+# says that the Mac Developer certificate is useful just for
self-testing. For distribution
+# outside the Mac App Store, use the Developer ID Application one,
and for distribution in
+# the App Store, the 3rd Party Mac Developer one. I think it works
best to the the
+# Developer ID Application one.
+
+identity=`security find-identity -p codesigning -v 2/dev/null | grep
'Developer ID Application:' | awk '{print $2}' |head -1`
+if test -n $identity; then
+MACOSX_CODESIGNING_IDENTITY=$identity
+pretty_name=`security find-identity -p codesigning -v | grep
$MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'`
+AC_MSG_RESULT([yes, using the identity
$MACOSX_CODESIGNING_IDENTITY for $pretty_name])
+fi
+elif test -n $enable_macosx_code_signing; then
+MACOSX_CODESIGNING_IDENTITY=$enable_macosx_code_signing
+pretty_name=`security find-identity -p codesigning -v | grep
$MACOSX_CODESIGNING_IDENTITY | sed -e 's/^[[^]]*//' -e 's///'`
+AC_MSG_RESULT([yes, using the identity $MACOSX_CODESIGNING_IDENTITY
for $pretty_name])
+else
+AC_MSG_RESULT([no])
+fi
fi
AC_SUBST(FRAMEWORKSHOME)
AC_SUBST(MACOSX_SDK_PATH)
@@ -2830,6 +2864,7 @@ AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
AC_SUBST(MAC_OS_X_VERSION_MIN_REQUIRED)
AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED)
AC_SUBST(XCRUN)
+AC_SUBST(MACOSX_CODESIGNING_IDENTITY)
dnl ===
dnl Windows specific tests and stuff
diff --git a/solenv/bin/modules/installer/simplepackage.pm
b/solenv/bin/modules/installer/simplepackage.pm
index 561b0fe..26911a4 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -418,6 +418,43 @@ sub create_package
chdir $localfrom;
}
+ else
+ {
+ if (defined($ENV{'MACOSX_CODESIGNING_IDENTITY'}))
+ {
+ # Just sign the .app as a whole, which means signing
+ # the CFBundleExecutable from Info.plist,
+ # i.e. soffice, plus the contents of the Resources
+ # treee (which is not much, far from all of our
+ # non-code resources).
+
+ # Don't bother here in the 4.0 branch to sign each
+
Re: make accessibility failed
On 9 February 2013 22:45, Michael Stahl mst...@redhat.com wrote: On 09/02/13 20:13, Nadav Vinik wrote: ubuntu 12.10 $ make accessibility Makefile:76: [WARN ] !!![WARN ] !!! The following modules claim to be both dmake and gbuild: *[WARN ] !!! = (1/1) Building module accessibility = Entering /home/nadav/projects/lo-core/accessibility/prj --- force_dmake_to_error Error: No makefile.mk http://makefile.mk found! this problem should be fixed since some weeks ago with commit 11199dd01b909d75e97df9617cc5bbb71c43fe3c are you building an older master revision? No. fresh checkout from master. -- הבלוג שלי: http://nadavvin.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 55083] Locale wrongly taken as Default Language
https://bugs.freedesktop.org/show_bug.cgi?id=55083 --- Comment #7 from Kumāra kumara.bhik...@gmail.com --- Comment on attachment 74473 -- https://bugs.freedesktop.org/attachment.cgi?id=74473 AutoCorrect dialog box For someone who is unaware of this bug, if he makes a change to the locale setting, he would later be wondering why everything under AutoCorrect aren't working. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55083] Locale wrongly taken as Default Language
https://bugs.freedesktop.org/show_bug.cgi?id=55083 Kumāra kumara.bhik...@gmail.com changed: What|Removed |Added Version|3.6.1.2 release |3.6.5.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 55083] Locale wrongly taken as Default Language
https://bugs.freedesktop.org/show_bug.cgi?id=55083 --- Comment #8 from Kumāra kumara.bhik...@gmail.com --- Thank, Thomas, for the attention to this. It's not a show stopper, but it can be bewildering and frustrating for one who's using English, and have set the locale setting to a non-English locale. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60531] New: Extensionname: error: http://updateexte.libreoffice.org/Extensionupdateservice/check.update no existe
https://bugs.freedesktop.org/show_bug.cgi?id=60531 Priority: medium Bug ID: 60531 Keywords: regression Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Extensionname: error: http://updateexte.libreoffice.org/Extensionupdateserv ice/check.update no existe Severity: normal Classification: Unclassified OS: Windows (All) Reporter: aritzi...@hotmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.0.0.0.beta2 Component: Extensions Product: LibreOffice Problem description: I have used severals versions, last was 3.6.5 official release. Yesterday I installed version 4.0. Now if I open Libreoofice and I check for updates on the extension manager I get an error: http://updateexte.libreoffice.org/Extensionupdateservice/check.update no existe Steps to reproduce: 1. Open Libreoffice 2. Go to extension manager 3. Check for updates Thanks. I´d like very much Libreofice. Sorry my bad english. Operating System: Windows 7 Version: 4.0.0.0.beta2 Last worked in: 3.6.5.2 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60533] New: Brackets (..), {..}, [..] inverted )..(, }..{, ]..[ when switch to RTL text direction with all fonts (Affect : calc, impress, draw).
https://bugs.freedesktop.org/show_bug.cgi?id=60533
Priority: medium
Bug ID: 60533
Assignee: libreoffice-bugs@lists.freedesktop.org
Summary: Brackets (..),{..},[..] inverted )..(,}..{,]..[ when
switch to RTL text direction with all fonts (Affect :
calc, impress, draw).
Severity: major
Classification: Unclassified
OS: All
Reporter: navin.pati...@gmail.com
Hardware: Other
Status: UNCONFIRMED
Version: unspecified
Component: graphics stack
Product: LibreOffice
Created attachment 74477
-- https://bugs.freedesktop.org/attachment.cgi?id=74477action=edit
screenshot
Steps to reproduce bug.
1. Start any of following Libo app calc, impress, draw.
2. Enable CTL.
3. Type text enclosed within brackets e.g. (Libreoffice)
4. Switch to RTL Writing mode.
Result :
Brackets are inverted. )Libreoffice(
--
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60534] New: Brackets (..), {..}, [..] inverted to )..(, }..{, ]..[ when switch to RTL text direction with Graphite fonts only. ( Affect :all Libo applications).
https://bugs.freedesktop.org/show_bug.cgi?id=60534
Priority: medium
Bug ID: 60534
Assignee: libreoffice-bugs@lists.freedesktop.org
Summary: Brackets (..),{..},[..] inverted to )..(,}..{,]..[
when switch to RTL text direction with Graphite fonts
only. ( Affect :all Libo applications).
Severity: normal
Classification: Unclassified
OS: All
Reporter: navin.pati...@gmail.com
Hardware: Other
Status: UNCONFIRMED
Version: unspecified
Component: graphics stack
Product: LibreOffice
Created attachment 74478
-- https://bugs.freedesktop.org/attachment.cgi?id=74478action=edit
screenshot
Steps to reproduce bug.
1. Start any of Libo app.
2. Enable CTL.
3. Type text enclosed within brackets e.g. (Libreoffice) in RTL mode.
4. Change text font to “Linux Biolinum G”.
Result :
Brackets are inverted. )Libreoffice(
--
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60535] New: Please support embedding of MP4 and MOV with H.264 Videos
https://bugs.freedesktop.org/show_bug.cgi?id=60535 Priority: medium Bug ID: 60535 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Please support embedding of MP4 and MOV with H.264 Videos Severity: normal Classification: Unclassified OS: All Reporter: gerry.trep...@googlemail.com Hardware: Other Status: UNCONFIRMED Version: 4.0.0.2 rc Component: filters and storage Product: LibreOffice LibreOffice currently does not support embedding of MP4 and MOV that use the very popular H.264 video compression standard. How to reproduce: * Download the sample video here: http://webian.org/dev/export/22/prototypes/html5/videos/trailer_dvd.mp4 * Create a new impress file and try to embedd the video via Insert - Movie and Sound. * The file embedds and also the sound works, but video does not work. * Apparently the H.264 compression is not supported: ** Message: don't know how to handle video/x-h264, stream-format=(string)byte-stream, alignment=(string)au, level=(string)3, profile=(string)main, width=(int)720, height=(int)576, framerate=(fraction)25/1, pixel-aspect-ratio=(fraction)259/180, parsed=(boolean)true Solution: Please add support for the H.264 compression standard. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60535] Please support embedding of MP4 and MOV videos with H.264 compression
https://bugs.freedesktop.org/show_bug.cgi?id=60535 Gerry gerry.trep...@googlemail.com changed: What|Removed |Added Summary|Please support embedding of |Please support embedding of |MP4 and MOV with H.264 |MP4 and MOV videos with |Videos |H.264 compression -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60535] Please support embedding of MP4 and MOV videos with H.264 compression
https://bugs.freedesktop.org/show_bug.cgi?id=60535 Gerry gerry.trep...@googlemail.com changed: What|Removed |Added Severity|normal |enhancement -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60537] New: VIEWING: Corrupt characters in LibreOffice 4 with Nouveau
https://bugs.freedesktop.org/show_bug.cgi?id=60537 Priority: medium Bug ID: 60537 Keywords: regression Assignee: libreoffice-bugs@lists.freedesktop.org Summary: VIEWING: Corrupt characters in LibreOffice 4 with Nouveau Severity: normal Classification: Unclassified OS: Linux (All) Reporter: joseal...@hotmail.com Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.0.0.3 release Component: Writer Product: LibreOffice Created attachment 74479 -- https://bugs.freedesktop.org/attachment.cgi?id=74479action=edit Characters messed up after scrolling up and down in the LivreOffice 4 help Problem description: Hello, I'm using Linux Mint 14 x64 MATE kernel 3.5.0-17, with a NVIDIA GTX 460 graphic card and the nouveau driver. When I scroll up or down in LibreOffice 4 writer the most of the characters mess up or dissapear. The same happens if I select a wide zone with the mouse. If I minimize the window and restore it the characters are well displayed, but if I scroll again all mess up again. Nevertheless with LibreOffice 3.6.4 it doesn't happen, it just happen in LibreOffice 4. Using the NVIDIA privative drivers it is solved, but these drivers doesn't work well with other applications I use, so using the NVIDIA privative drivers is not a solution for my problem. How do I fix this problem in LibreOffice 4? Steps to reproduce: 1. Open LibreOffice writer 4.0.0.3 release 2. Go to help LibreOffice help 3. Scroll up and down Current behavior: help text's characters mess up Expected behavior: you should be able to read the help flawlessly scrolling up or down Operating System: Linux (Other) Version: 4.0.0.3 release Last worked in: 3.6.4.3 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60534] Brackets (..), {..}, [..] inverted to )..(, }..{, ]..[ when switch to RTL text direction with Graphite fonts only. ( Affect :all Libo applications).
https://bugs.freedesktop.org/show_bug.cgi?id=60534 Lior Kaplan kaplanl...@gmail.com changed: What|Removed |Added Attachment #74478|text/plain |image/png mime type|| -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60534] Brackets (..), {..}, [..] inverted to )..(, }..{, ]..[ when switch to RTL text direction with Graphite fonts only. ( Affect :all Libo applications).
https://bugs.freedesktop.org/show_bug.cgi?id=60534 Lior Kaplan kaplanl...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE --- Comment #1 from Lior Kaplan kaplanl...@gmail.com --- *** This bug has been marked as a duplicate of bug 59892 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60533] Brackets (..), {..}, [..] inverted )..(, }..{, ]..[ when switch to RTL text direction with all fonts (Affect : calc, impress, draw).
https://bugs.freedesktop.org/show_bug.cgi?id=60533 Lior Kaplan kaplanl...@gmail.com changed: What|Removed |Added Attachment #74477|text/plain |image/png mime type|| -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60533] Brackets (..), {..}, [..] inverted )..(, }..{, ]..[ when switch to RTL text direction with all fonts (Affect : calc, impress, draw).
https://bugs.freedesktop.org/show_bug.cgi?id=60533 --- Comment #1 from Lior Kaplan kaplanl...@gmail.com --- Which version on LibreOffice and which OS ? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60533] Brackets (..), {..}, [..] inverted )..(, }..{, ]..[ when switch to RTL text direction with all fonts (Affect : calc, impress, draw).
https://bugs.freedesktop.org/show_bug.cgi?id=60533 navin patidar pati...@kacst.edu.sa changed: What|Removed |Added Version|unspecified |4.1.0.0.alpha0+ Master -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60538] New: Special Unicode characters are handled differently depending on file opening way and lead to crash on pdf export
https://bugs.freedesktop.org/show_bug.cgi?id=60538 Priority: medium Bug ID: 60538 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Special Unicode characters are handled differently depending on file opening way and lead to crash on pdf export Severity: normal Classification: Unclassified OS: Windows (All) Reporter: c701...@rmqkr.net Hardware: x86-64 (AMD64) Status: NEW Version: 4.0.0.3 release Component: Libreoffice Product: LibreOffice Created attachment 74480 -- https://bugs.freedesktop.org/attachment.cgi?id=74480action=edit Odt file with copiright sign which cases a crash on pdf export Hello! I have an odt document which consist a copyright character, which was copied from ms-word and pasted in the odt-document. And it seems that character cause a crash when i try to export to pdf. Investigating the problem i found out that LO handles that character differently depending on how I open the file. On Windows, when I double-click the file, Writer app starts, opens the file and displays that symbol correctly as c in circle. Then if I try to export it to PDF LO invariably crashes, sometimes also giving me a weird message that the file was blocked by another user (right before a crash)... BUT! If I firstly start LO with Start menu, then open the file using File-Open menu, copyright sign is displayed as a placeholder (a small rectangle instead of normal character). In this case PDF exporting works fine. Expected behavior: LO always displays that character correctly regardless of how the file was opened and never crashes on exporting it to PDF. That symbol code is U+F0D3. OS: Win 7 x64, LO version is 4.0.0.3 (Build ID: 7545bee9c2a0782548772a21bc84a9dcc583b89), but it seems 3.6.2 is affected too. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58630] Calc - CRASH when using Validity
https://bugs.freedesktop.org/show_bug.cgi?id=58630 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added Status|NEW |NEEDINFO --- Comment #4 from Julien Nabet serval2...@yahoo.fr --- Michel/mariosv: do you still reproduce this with final release 4.0? If yes, could you try to retrieve a backtrace (even without symbols if you can't)? -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60534] Brackets (..), {..}, [..] inverted to )..(, }..{, ]..[ when switch to RTL text direction with Graphite fonts only. ( Affect :all Libo applications).
https://bugs.freedesktop.org/show_bug.cgi?id=60534 navin patidar pati...@kacst.edu.sa changed: What|Removed |Added Version|unspecified |4.1.0.0.alpha0+ Master -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60534] Brackets (..), {..}, [..] inverted to )..(, }..{, ]..[ when switch to RTL text direction with Graphite fonts only. ( Affect :all Libo applications).
https://bugs.freedesktop.org/show_bug.cgi?id=60534 --- Comment #2 from navin patidar pati...@kacst.edu.sa --- hi Lior this bug isn't duplicate of bug 59892, here only brackets are inverted not complete text. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60534] Brackets (..), {..}, [..] inverted to )..(, }..{, ]..[ when switch to RTL text direction with Graphite fonts only. ( Affect :all Libo applications).
https://bugs.freedesktop.org/show_bug.cgi?id=60534 navin patidar pati...@kacst.edu.sa changed: What|Removed |Added Blocks||33302 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60533] Brackets (..), {..}, [..] inverted )..(, }..{, ]..[ when switch to RTL text direction with all fonts (Affect : calc, impress, draw).
https://bugs.freedesktop.org/show_bug.cgi?id=60533 navin patidar pati...@kacst.edu.sa changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |pati...@kacst.edu.sa |desktop.org | QA Contact||aalhar...@kacst.edu.sa Blocks||33302 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60539] New: FILESAVE: Column-width of a Query couldn't be saved
https://bugs.freedesktop.org/show_bug.cgi?id=60539 Priority: medium Bug ID: 60539 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: FILESAVE: Column-width of a Query couldn't be saved Severity: normal Classification: Unclassified OS: All Reporter: rob...@familiegrosskopf.de Hardware: Other Status: UNCONFIRMED Version: 3.3.0 Beta2 Component: Database Product: LibreOffice Created attachment 74481 -- https://bugs.freedesktop.org/attachment.cgi?id=74481action=edit Open the query and try to chga the with of the field Name and Town In Base you could change the column-width of tables and of queries. Mostly the automatic values are unusable. So I have changed it with the context-menue or by dragging the header with the mouse. When I change this in the tables it is saved in the *.odb-file. Opening the file later and the column has the same width when I have closed the table the last time. When I change the width in a query it hasn't be saved in the *.odb-file. Opening the query again and the columns are set to automatic again - except the columns, which have been set manually by changing the columns in the table. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60539] FILESAVE: Column-width of a Query couldn't be saved
https://bugs.freedesktop.org/show_bug.cgi?id=60539 rob...@familiegrosskopf.de changed: What|Removed |Added Attachment #74481|text/plain |application/vnd.oasis.opend mime type||ocument.base -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60210] : crash at start up
https://bugs.freedesktop.org/show_bug.cgi?id=60210 --- Comment #35 from Michael Meeks michael.me...@novell.com --- Not sure how to check if the libreoffice4.0-stdlibs package had been installed. rpm -qa | grep stdlibs # or rpm -qa | grep libreoffice-4.0-stlibs Would do it for you - rpm -e that name if they are try again :-) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58630] Calc - CRASH when using Validity
https://bugs.freedesktop.org/show_bug.cgi?id=58630 --- Comment #5 from mariosv mari...@miguelangel.mobi --- (In reply to comment #4) Michel/mariosv: do you still reproduce this with final release 4.0? If yes, could you try to retrieve a backtrace (even without symbols if you can't)? Hi Julian reproducible with: Win7x64 Ultimate Version 4.0.0.3 (Build ID: 7545bee9c2a0782548772a21bc84a9dcc583b89) I never get the back-trace, but I think there is a comment in some place about how to do if, if I find it I'll try. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60540] New: Mac OS X Installation has some minor display problems
https://bugs.freedesktop.org/show_bug.cgi?id=60540 Priority: medium Bug ID: 60540 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Mac OS X Installation has some minor display problems Severity: trivial Classification: Unclassified OS: Mac OS X (All) Reporter: dennisroc...@gmail.com Hardware: All Status: UNCONFIRMED Version: 4.0.0.3 release Component: Installation Product: LibreOffice Created attachment 74483 -- https://bugs.freedesktop.org/attachment.cgi?id=74483action=edit Display Problems of the Installation As it can be seen on the screenshot, the box with the border in the background isn't correctly placed. It should be LibreOffice -- Applications and the border around. Resizing the finder window didn't helped. Older versions displayed it correct. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 58630] Calc - CRASH when using Validity
https://bugs.freedesktop.org/show_bug.cgi?id=58630 Julien Nabet serval2...@yahoo.fr changed: What|Removed |Added CC||bfo.bugm...@spamgourmet.com --- Comment #6 from Julien Nabet serval2...@yahoo.fr --- mariosv: here some info for Windows part, https://wiki.documentfoundation.org/BugReport#How_to_get_a_backtrace_.28on_Windows.29 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 60540] Mac OS X Installation has some minor display problems
https://bugs.freedesktop.org/show_bug.cgi?id=60540 --- Comment #1 from Roczek dennisroc...@gmail.com --- Uhm just a additional note: that was an installation on OS X 10.7.5 (so all patches installed), but on a Laptop with Mac OS X 10.6.8 it looks just fine. Very strange. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
