[Libreoffice-commits] .: Branch 'libreoffice-3-6' - dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 51 + 1 file changed, 33 insertions(+), 18 deletions(-) New commits: commit 591939d9f2e76853e27bd77bdf1606e263a2ddf0 Author: Lionel Elie Mamane lio...@mamane.lu Date: Fri Jan 18 18:44:22 2013 +0100 mark *all* tables of a nested join as added Else, if the n^{th} (with n2) table also appears in a (non-NATURAL) INNER JOIN, it is repeated later, leading to an error from the database engine Change-Id: I03e0f0ef51f45be9d7ddfa63a9dbe09dc500f8dd Reviewed-on: https://gerrit.libreoffice.org/1764 Reviewed-by: Miklos Vajna vmik...@suse.cz Tested-by: Miklos Vajna vmik...@suse.cz diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 7b33375..e1d7427 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -485,10 +485,29 @@ namespace return BuildJoin(_xConnection, rRh, BuildTable(_xConnection,pLh), data); } //-- +typedef ::std::map ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess tableNames_t; + //-- +void addConnectionTableNames( const Reference XConnection _xConnection, + const OQueryTableConnection* const pEntryConn, + tableNames_t _rTableNames ) +{ +// insert tables into table list to avoid double entries +const OQueryTableWindow* const pEntryTabFrom = static_castOQueryTableWindow*(pEntryConn-GetSourceWin()); +const OQueryTableWindow* const pEntryTabTo = static_castOQueryTableWindow*(pEntryConn-GetDestWin()); + +::rtl::OUString sTabName(BuildTable(_xConnection,pEntryTabFrom)); +if(_rTableNames.find(sTabName) == _rTableNames.end()) +_rTableNames[sTabName] = sal_True; +sTabName = BuildTable(_xConnection,pEntryTabTo); +if(_rTableNames.find(sTabName) == _rTableNames.end()) +_rTableNames[sTabName] = sal_True; +} + //-- void GetNextJoin( const Reference XConnection _xConnection, OQueryTableConnection* pEntryConn, OQueryTableWindow* pEntryTabTo, -::rtl::OUString aJoin) +::rtl::OUString aJoin, +tableNames_t _rTableNames) { OQueryTableConnectionData* pEntryConnData = static_castOQueryTableConnectionData*(pEntryConn-GetData().get()); if ( pEntryConnData-GetJoinType() == INNER_JOIN !pEntryConnData-isNatural() ) @@ -496,15 +515,18 @@ namespace if(aJoin.isEmpty()) { +addConnectionTableNames(_xConnection, pEntryConn, _rTableNames); OQueryTableWindow* pEntryTabFrom = static_castOQueryTableWindow*(pEntryConn-GetSourceWin()); aJoin = BuildJoin(_xConnection,pEntryTabFrom,pEntryTabTo,pEntryConnData); } else if(pEntryTabTo == pEntryConn-GetDestWin()) { +addConnectionTableNames(_xConnection, pEntryConn, _rTableNames); aJoin = BuildJoin(_xConnection,aJoin,pEntryTabTo,pEntryConnData); } else if(pEntryTabTo == pEntryConn-GetSourceWin()) { +addConnectionTableNames(_xConnection, pEntryConn, _rTableNames); aJoin = BuildJoin(_xConnection,pEntryTabTo,aJoin,pEntryConnData); } @@ -523,7 +545,7 @@ namespace // exists there a connection to a OQueryTableWindow that holds a connection that has been already visited JoinCycle(_xConnection,pNext,pEntryTab,aJoin); if(!pNext-IsVisited()) -GetNextJoin(_xConnection,pNext,pEntryTab,aJoin); +GetNextJoin(_xConnection, pNext, pEntryTab, aJoin, _rTableNames); } } @@ -541,7 +563,7 @@ namespace // exists there a connection to a OQueryTableWindow that holds a connection that has been already visited JoinCycle(_xConnection,pNext,pEntryTab,aJoin); if(!pNext-IsVisited()) -GetNextJoin(_xConnection,pNext,pEntryTab,aJoin); +GetNextJoin(_xConnection, pNext, pEntryTab, aJoin, _rTableNames); } } } @@ -1024,7 +1046,7 @@ namespace //-- void searchAndAppendName(const Reference XConnection _xConnection, const OQueryTableWindow* _pTableWindow, - ::std::map
[PUSHED] Change in core[libreoffice-3-6]: mark *all* tables of a nested join as added
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1764 Approvals: Miklos Vajna: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1764 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03e0f0ef51f45be9d7ddfa63a9dbe09dc500f8dd Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4f4e963da72aeffae9a88676abb438c65c122bf2 Author: Andras Timar ati...@suse.com Date: Tue Jan 22 09:37:08 2013 +0100 Updated core Project: translations f0efa7684ae765f13bc0e31773c80afb918ac5d1 diff --git a/translations b/translations index c8b3fff..f0efa76 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit c8b3fffc0e81443cd547cc8662a2693f85c84f4b +Subproject commit f0efa7684ae765f13bc0e31773c80afb918ac5d1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/textframes.odt |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 10 +++ sw/source/filter/ww8/docxattributeoutput.cxx | 68 ++- sw/source/filter/ww8/docxattributeoutput.hxx |2 4 files changed, 68 insertions(+), 12 deletions(-) New commits: commit 4a787e2078ca1a19e065cb356fc80f421213ad87 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jan 22 09:36:00 2013 +0100 sw: DOCX export of TextFrames testcase Change-Id: Ie46a2627d247fb293606c6deab3254113b741336 diff --git a/sw/qa/extras/ooxmlexport/data/textframes.odt b/sw/qa/extras/ooxmlexport/data/textframes.odt new file mode 100644 index 000..301744a Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/textframes.odt differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index a6a7783..c1fd412 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -68,6 +68,7 @@ public: void testFdo51550(); void testN789482(); void test1Table1Page(); +void testTextFrames(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -107,6 +108,7 @@ void Test::run() {fdo51550.odt, Test::testFdo51550}, {n789482.docx, Test::testN789482}, // {1-table-1-page.docx, Test::test1Table1Page}, // doesn't work on openSUSE12.2 at least +{textframes.odt, Test::testTextFrames}, }; // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { @@ -509,6 +511,14 @@ void Test::test1Table1Page() CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor-getPage()); } +void Test::testTextFrames() +{ +// The frames were simply missing, so let's check if all 3 frames were imported back. +uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xIndexAccess-getCount()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); commit a2bee4547a4997759e41aed8de0f2af95460a732 Author: Miklos Vajna vmik...@suse.cz Date: Mon Jan 21 16:47:34 2013 +0100 sw: DOCX export of TextFrame size/position Change-Id: Ie830fe9f7276fbc8f20e7d37424116d6653a6931 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index ca11d99..416063a 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -272,9 +272,14 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT m_rExport.mpParentFrame = pParentFrame; +m_bTextFrameSyntax = true; +m_aTextFrameStyle = position:absolute; +m_rExport.OutputFormat( pParentFrame-GetFrmFmt(), false, false, true ); +m_bTextFrameSyntax = false; + m_pSerializer-startElementNS( XML_w, XML_r, FSEND ); m_pSerializer-startElementNS( XML_w, XML_pict, FSEND ); -m_pSerializer-startElementNS( XML_v, XML_rect, FSEND ); +m_pSerializer-startElementNS( XML_v, XML_rect, XML_style, m_aTextFrameStyle.makeStringAndClear(), FSEND ); m_pSerializer-startElementNS( XML_v, XML_textbox, FSEND ); m_pSerializer-startElementNS( XML_w, XML_txbxContent, FSEND ); m_rExport.WriteText( ); @@ -4168,7 +4173,12 @@ void DocxAttributeOutput::ParaSnapToGrid( const SvxParaGridItem rGrid ) void DocxAttributeOutput::FormatFrameSize( const SwFmtFrmSize rSize ) { -if ( m_rExport.bOutFlyFrmAttrs ) +if (m_bTextFrameSyntax) +{ +m_aTextFrameStyle.append(;width:).append(double(rSize.GetWidth()) / 20); + m_aTextFrameStyle.append(pt;height:).append(double(rSize.GetHeight()) / 20).append(pt); +} +else if ( m_rExport.bOutFlyFrmAttrs ) { if ( !m_pFlyAttrList ) m_pFlyAttrList = m_pSerializer-createAttrList( ); @@ -4212,7 +4222,10 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem rLRSpace ) { bool bEcma = m_rExport.GetFilter().getVersion( ) == oox::core::ECMA_DIALECT; -if ( m_rExport.bOutFlyFrmAttrs ) +if (m_bTextFrameSyntax) +{ +} +else if ( m_rExport.bOutFlyFrmAttrs ) { if ( !m_pFlyAttrList ) m_pFlyAttrList = m_pSerializer-createAttrList(); @@ -4260,7 +4273,10 @@ void DocxAttributeOutput::FormatLRSpace( const SvxLRSpaceItem rLRSpace ) void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem rULSpace ) { -if ( m_rExport.bOutFlyFrmAttrs ) +if (m_bTextFrameSyntax) +{ +} +else if ( m_rExport.bOutFlyFrmAttrs ) { if ( !m_pFlyAttrList ) m_pFlyAttrList = m_pSerializer-createAttrList(); @@ -4320,7 +4336,10 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem rULSpace ) void
Re: warning related to 2fe852386c9450014f84910b0a282d684f40b56a
On 01/21/2013 08:48 PM, Markus Mohrhard wrote: I have some warning messages in a dbgutil build that vanish if I revert http://cgit.freedesktop.org/libreoffice/core/commit/?id=2fe852386c9450014f84910b0a282d684f40b56a They are like: warn:legacy.osl:16845:1:/home/moggi/devel/libo2/cppuhelper/source/implbase_ex.cxx:221: cannot get type description for type com.sun.star.datatransfer.clipboard.XSystemClipboard! Any recipe how to reproduce them? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] fdo#44582 fixing horizontal scroll bar in sub windows
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1806 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/06/1806/1 fdo#44582 fixing horizontal scroll bar in sub windows Change-Id: Ifea57dec77c5b23771684a1e46267f8431478075 --- M vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 46a4c01..00abced 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -1036,11 +1036,14 @@ rNativeContentRegion = rNativeBoundingRegion; //See fdo#33523, possibly makes sense to do this test for all return values -if (!rNativeContentRegion.GetWidth()) -rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; -if (!rNativeContentRegion.GetHeight()) -rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; -returnVal = sal_True; +if(!Application::GetSettings().GetLayoutRTL()) +{ +if (!rNativeContentRegion.GetWidth()) +rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; +if (!rNativeContentRegion.GetHeight()) +rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; +returnVal = sal_True; +} } if( (nType == CTRL_MENUBAR) (nPart == PART_ENTIRE_CONTROL) ) { -- To view, visit https://gerrit.libreoffice.org/1806 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifea57dec77c5b23771684a1e46267f8431478075 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Abdulaziz A Alayed aala...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/ui/src/colorformat.src |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit 208f8855a40d73aad1ee5086c7ee63b75376eade Author: Andras Timar ati...@suse.com Date: Tue Jan 22 09:55:59 2013 +0100 allow space for translated text expansion Change-Id: I5706fc9201359c05c00d0a97009994d7d188d5bf diff --git a/sc/source/ui/src/colorformat.src b/sc/source/ui/src/colorformat.src index 6333bf4..9e7b5b0 100644 --- a/sc/source/ui/src/colorformat.src +++ b/sc/source/ui/src/colorformat.src @@ -93,13 +93,13 @@ ModalDialog RID_SCDLG_DATABAR FixedText FT_POSITION { Pos = MAP_APPFONT( 10, 135 ); -Size = MAP_APPFONT( 70, 14 ); +Size = MAP_APPFONT( 110, 14 ); Text [ en-US ] = Position of vertical axis; }; FixedText FT_COLOR_AXIS { Pos = MAP_APPFONT( 10, 155 ); -Size = MAP_APPFONT( 70, 14 ); +Size = MAP_APPFONT( 110, 14 ); Text [ en-US ] = Color of vertical axis; }; ListBox LB_POS @@ -120,7 +120,7 @@ ModalDialog RID_SCDLG_DATABAR }; ListBox LB_COL_AXIS { -Pos = MAP_APPFONT( 100, 155 ); +Pos = MAP_APPFONT( 120, 155 ); Size = MAP_APPFONT( 60, 50 ); Border = TRUE; DropDown = TRUE; @@ -145,7 +145,7 @@ ModalDialog RID_SCDLG_DATABAR }; ListBox LB_AXIS_POSITION { -Pos = MAP_APPFONT( 100, 135 ); +Pos = MAP_APPFONT( 120, 135 ); Size = MAP_APPFONT( 50, 50 ); Border = TRUE; DropDown = TRUE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] Change in core[libreoffice-4-0]: allow space for translated text expansion
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1807 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/07/1807/1 allow space for translated text expansion Change-Id: I5706fc9201359c05c00d0a97009994d7d188d5bf --- M sc/source/ui/src/colorformat.src 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sc/source/ui/src/colorformat.src b/sc/source/ui/src/colorformat.src index 6333bf4..9e7b5b0 100644 --- a/sc/source/ui/src/colorformat.src +++ b/sc/source/ui/src/colorformat.src @@ -93,13 +93,13 @@ FixedText FT_POSITION { Pos = MAP_APPFONT( 10, 135 ); -Size = MAP_APPFONT( 70, 14 ); +Size = MAP_APPFONT( 110, 14 ); Text [ en-US ] = Position of vertical axis; }; FixedText FT_COLOR_AXIS { Pos = MAP_APPFONT( 10, 155 ); -Size = MAP_APPFONT( 70, 14 ); +Size = MAP_APPFONT( 110, 14 ); Text [ en-US ] = Color of vertical axis; }; ListBox LB_POS @@ -120,7 +120,7 @@ }; ListBox LB_COL_AXIS { -Pos = MAP_APPFONT( 100, 155 ); +Pos = MAP_APPFONT( 120, 155 ); Size = MAP_APPFONT( 60, 50 ); Border = TRUE; DropDown = TRUE; @@ -145,7 +145,7 @@ }; ListBox LB_AXIS_POSITION { -Pos = MAP_APPFONT( 100, 135 ); +Pos = MAP_APPFONT( 120, 135 ); Size = MAP_APPFONT( 50, 50 ); Border = TRUE; DropDown = TRUE; -- To view, visit https://gerrit.libreoffice.org/1807 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5706fc9201359c05c00d0a97009994d7d188d5bf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Calc.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5c4351eb98e074dcddcb8f491bb0c769c822ff4f Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 22 10:10:20 2013 +0100 StringRefAddressSyntax is nillable ...00134920ec968ff492c88d8c5a6af22f1ebfa328 New option for INDIRECT reference syntax and e6ef9f128e85961921b0b319087010fce1d59a74 Rename this option to make it sound more generic had marked /org.openoffice.Office.Calc/Formula/Syntax/StringRefAddressSyntax (formerly IndirectFuncGrammar) as oor:nillable=false, even though it is given no value in officecfg, and the sole code reading it (SCFORMULAOPT_STRING_REF_SYNTAX case in ScFormulaCfg ctor, sc/source/core/tool/formulaopt.cxx) is prepared to read a nil value. Change-Id: Icab871c821f437cd095280e9af8b0c0c11bbef8f diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs index ee5c513..4ec612e 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs @@ -1468,7 +1468,7 @@ /info value/value /prop -prop oor:name=StringRefAddressSyntax oor:type=xs:int oor:nillable=false +prop oor:name=StringRefAddressSyntax oor:type=xs:int !-- UIHints: Tools - Options - Spreadsheet - Formula -- info authorkyoshida/author ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: warning related to 2fe852386c9450014f84910b0a282d684f40b56a
On 22/01/13 08:37, Stephan Bergmann wrote: On 01/21/2013 08:48 PM, Markus Mohrhard wrote: I have some warning messages in a dbgutil build that vanish if I revert http://cgit.freedesktop.org/libreoffice/core/commit/?id=2fe852386c9450014f84910b0a282d684f40b56a They are like: warn:legacy.osl:16845:1:/home/moggi/devel/libo2/cppuhelper/source/implbase_ex.cxx:221: cannot get type description for type com.sun.star.datatransfer.clipboard.XSystemClipboard! Any recipe how to reproduce them? Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice don't know about the warning above but on Friday looks like I independently did also find that the above commit is definitely responsible for https://bugs.freedesktop.org/show_bug.cgi?id=59515 ( the associated paste problem is easy to reproduce ) I didn't quite get to the bottom of why this change affected things. I was going to get back to trying to find out exactly what was going on there when I finish with the bug I am currently looking at ( but would be happy if some-else solved it for me :-))) ) Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: curl/curl-7.26.0_win-proxy.patch
curl/curl-7.26.0_win-proxy.patch |9 + 1 file changed, 5 insertions(+), 4 deletions(-) New commits: commit c37b23e4c29c0f9f442fac0a4d8f731bee6ea5b6 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Mon Jan 21 18:32:27 2013 +0100 curl: fixed crashers in curl patch for system proxy Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f2 diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch index 222bec4..e3beb40 100644 --- a/curl/curl-7.26.0_win-proxy.patch +++ b/curl/curl-7.26.0_win-proxy.patch @@ -52,7 +52,7 @@ #ifndef CURL_DISABLE_HTTP /* If proxy was not specified, we check for default proxy environment -@@ -4138,7 +4158,62 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4138,7 +4158,63 @@ static char *detect_proxy(struct connectdata *conn) * For compatibility, the all-uppercase versions of these variables are * checked if the lowercase versions don't exist. */ @@ -71,7 +71,7 @@ + ieNoProxy = wstrToCstr(ieProxyConfig-lpszProxyBypass); + + /* Convert the ieNoProxy into a proper no_proxy value */ -+ if(NULL != no_proxy) { ++ if(NULL != ieNoProxy) { +no_proxy = strdup(ieNoProxy); +pos = strpbrk(no_proxy, ; ); +while(NULL != pos) { @@ -95,8 +95,9 @@ +/* We found HTTP proxy value, then use it */ +proxy = strdup( tok + 5 ); + } ++ tok = strtok(NULL, ;); +} -+while(NULL != strtok(NULL, ;)); ++while(NULL != tok); + } +} + } @@ -116,7 +117,7 @@ char proxy_env[128]; no_proxy=curl_getenv(no_proxy); -@@ -4189,9 +4264,9 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4189,9 +4265,9 @@ static char *detect_proxy(struct connectdata *conn) } } /* if(!check_noproxy(conn-host.name, no_proxy)) - it wasn't specified non-proxy */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] Minutes - QA Call 01/11/2013
I read quickly this thread, so certainly I'll repeat some things from one or another person here but here's what I'm doing: - if NEW or UNCONFIRMED and need some info (just 1 or several), I put a comment and put State to NEEDINFO - if NEEDINFO without feedback for at least 2 months: - either I could give a try and it worked for me so WFM - or I couldn't give a try (not the same env, not example file when necessary, etc.), put it INVALID (if reporter didn't answer and we need more info to advance, no need to pile up this bug which became useless) In both cases, I put a comment explaining why I update like this and indicate that the bug can be reopened if it can be reproduced with a newer version (last one if possible) when quite old version (ie 3.6.X), and in this case, asking also for adding information demanded in previous comment. Perhaps I made some exceptions but I try not putting a bug from NEW or UNCONFIRMED to WFM or INVALID. Julien -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Minutes-QA-Call-11-16-2012-tp4019791p4030997.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/source
vcl/source/window/window.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 36f3e5f3180c2d2cb104ba2b0c4b8c3249822f42 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 22 11:02:33 2013 +0100 fdo#59515: Typo CLIPBOARD - PRIMARY ...a regression introduced with 2fe852386c9450014f84910b0a282d684f40b56a fdo#46808, Adapt SystemClipboard UNO service to new style. Change-Id: Ia98eadc0fc80762455c1e8cc33797b322b83e458 diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 90db221..baf4658 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -8452,7 +8452,7 @@ uno::Reference XClipboard Window::GetPrimarySelection() uno::Reference XComponentContext xContext( comphelper::getProcessComponentContext() ); #if defined(UNX) !defined(MACOSX) -ReferenceXSystemClipboard xSystemClipboard = SystemClipboard::createUnix( xContext, Application::GetDisplayConnection(), CLIPBOARD, vcl::createBmpConverter() ); +ReferenceXSystemClipboard xSystemClipboard = SystemClipboard::createUnix( xContext, Application::GetDisplayConnection(), PRIMARY, vcl::createBmpConverter() ); mpWindowImpl-mpFrameData-mxSelection = uno::Reference XClipboard ( xSystemClipboard, UNO_QUERY ); # else static uno::Reference XClipboard s_xSelection; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: warning related to 2fe852386c9450014f84910b0a282d684f40b56a
On 01/22/2013 10:48 AM, Noel Power wrote: don't know about the warning above but on Friday looks like I independently did also find that the above commit is definitely responsible for https://bugs.freedesktop.org/show_bug.cgi?id=59515 ( the associated paste problem is easy to reproduce ) I didn't quite get to the bottom of why this change affected things. I was going to get back to trying to find out exactly what was going on there when I finish with the bug I am currently looking at ( but would be happy if some-else solved it for me :-))) ) That https://bugs.freedesktop.org/show_bug.cgi?id=59515 paste attempt raises 'unknown source' dialog is fixed now with http://cgit.freedesktop.org/libreoffice/core/commit/?id=36f3e5f3180c2d2cb104ba2b0c4b8c3249822f42 fdo#59515: Typo CLIPBOARD - PRIMARY. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - oox/source
oox/source/drawingml/table/tablecell.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 08facbdcf4266f7308073b63ae92a5e15c792eb2 Author: Radek Doulik r...@novell.com Date: Wed Jan 16 20:37:50 2013 +0100 fix cell border line properties n#793408 Change-Id: Id20fa233b7e7eb0f2f01f4c230d1fe3398f2f4ed Signed-off-by: Andras Timar ati...@suse.com diff --git a/oox/source/drawingml/table/tablecell.cxx b/oox/source/drawingml/table/tablecell.cxx index c89a4f9..4bfd76d 100644 --- a/oox/source/drawingml/table/tablecell.cxx +++ b/oox/source/drawingml/table/tablecell.cxx @@ -74,6 +74,7 @@ void applyLineAttributes( const ::oox::core::XmlFilterBase rFilterBase, aBorderLine.Color = aColor.getColor( rFilterBase.getGraphicHelper() ); aBorderLine.OuterLineWidth = static_cast sal_Int16 ( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 ); aBorderLine.InnerLineWidth = static_cast sal_Int16 ( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 4 ); +aBorderLine.LineWidth = static_cast sal_Int16 ( GetCoordinate( rLineProperties.moLineWidth.get( 0 ) ) / 2 ); aBorderLine.LineDistance = 0; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - cppcanvas/source
cppcanvas/source/mtfrenderer/emfplus.cxx | 45 +++ 1 file changed, 45 insertions(+) New commits: commit 8aaf1142cdfda96094ee363cd7477a97021bcb76 Author: Radek Doulik r...@novell.com Date: Thu Jan 10 15:58:30 2013 +0100 implemented EmfPlusRecordTypeFillPie record Change-Id: I15e7464a6a295bb4c1313c0a65ee33b6443c61c8 Signed-off-by: Andras Timar ati...@suse.com diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx index 3c791d4..f1b0eff 100644 --- a/cppcanvas/source/mtfrenderer/emfplus.cxx +++ b/cppcanvas/source/mtfrenderer/emfplus.cxx @@ -29,6 +29,7 @@ #include basegfx/range/b2drange.hxx #include basegfx/range/b2drectangle.hxx #include basegfx/polygon/b2dpolygon.hxx +#include basegfx/polygon/b2dpolygontools.hxx #include basegfx/polygon/b2dpolypolygon.hxx #include basegfx/polygon/b2dpolypolygontools.hxx #include vcl/canvastools.hxx @@ -52,6 +53,7 @@ #define EmfPlusRecordTypeFillRects 16394 #define EmfPlusRecordTypeFillPolygon 16396 #define EmfPlusRecordTypeDrawLines 16397 +#define EmfPlusRecordTypeFillPie 16400 #define EmfPlusRecordTypeFillPath 16404 #define EmfPlusRecordTypeDrawPath 16405 #define EmfPlusRecordTypeDrawImage 16410 @@ -93,6 +95,7 @@ #endif using namespace ::com::sun::star; +using namespace ::basegfx; namespace cppcanvas { @@ -1234,6 +1237,48 @@ namespace cppcanvas case EmfPlusRecordTypeObject: processObjectRecord (rMF, flags); break; +case EmfPlusRecordTypeFillPie: +{ +sal_uInt32 brushIndexOrColor; +float startAngle, sweepAngle; + +rMF brushIndexOrColor startAngle sweepAngle; + +EMFP_DEBUG (printf (EMF+ FillPie colorOrIndex: %x startAngle: %f sweepAngle: %f\n, (unsigned int)brushIndexOrColor, startAngle, sweepAngle)); + +float dx, dy, dw, dh; + +ReadRectangle (rMF, dx, dy, dw, dh, flags 0x4000); + +EMFP_DEBUG (printf (EMF+ RectData: %f,%f %fx%f\n, dx, dy, dw, dh)); + +startAngle = 2*M_PI*startAngle/360; +sweepAngle = 2*M_PI*sweepAngle/360; + +B2DPoint mappedCenter (Map (dx + dw/2, dy + dh/2)); +B2DSize mappedSize( MapSize (dw/2, dh/2)); + +double endAngle = startAngle + sweepAngle; +if (endAngle 0) +endAngle += M_PI*2; +endAngle = fmod (endAngle, M_PI*2); + +if (sweepAngle 0) { +double tmp = startAngle; +startAngle = endAngle; +endAngle = tmp; +} + +EMFP_DEBUG (printf (EMF+ angles: %f,%f --- %f,%f\n, startAngle, sweepAngle, startAngle, endAngle)); + +B2DPolygon polygon = tools::createPolygonFromEllipseSegment (mappedCenter, mappedSize.getX (), mappedSize.getY (), startAngle, endAngle); +polygon.append (mappedCenter); +polygon.setClosed (true); + +B2DPolyPolygon polyPolygon (polygon); +EMFPPlusFillPolygon (polyPolygon, rFactoryParms, rState, rCanvas, flags 0x8000, brushIndexOrColor); +} +break; case EmfPlusRecordTypeFillPath: { sal_uInt32 index = flags 0xff; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - curl/curl-7.26.0_win-proxy.patch
curl/curl-7.26.0_win-proxy.patch | 37 + 1 file changed, 21 insertions(+), 16 deletions(-) New commits: commit fb286e44b862c12d0e84632f9d0a9ae6fd3ea2c1 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Mon Jan 21 18:32:27 2013 +0100 curl: fixed crashers in curl patch for system proxy Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f2 Reviewed-on: https://gerrit.libreoffice.org/1802 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch index 61badc7..e3beb40 100644 --- a/curl/curl-7.26.0_win-proxy.patch +++ b/curl/curl-7.26.0_win-proxy.patch @@ -52,7 +52,7 @@ #ifndef CURL_DISABLE_HTTP /* If proxy was not specified, we check for default proxy environment -@@ -4138,7 +4158,58 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4138,7 +4158,63 @@ static char *detect_proxy(struct connectdata *conn) * For compatibility, the all-uppercase versions of these variables are * checked if the lowercase versions don't exist. */ @@ -71,29 +71,34 @@ + ieNoProxy = wstrToCstr(ieProxyConfig-lpszProxyBypass); + + /* Convert the ieNoProxy into a proper no_proxy value */ -+ no_proxy = strdup(ieNoProxy); -+ pos = strpbrk(no_proxy, ; ); -+ while(NULL != pos) { -+no_proxy[pos-no_proxy] = ','; ++ if(NULL != ieNoProxy) { ++no_proxy = strdup(ieNoProxy); +pos = strpbrk(no_proxy, ; ); ++while(NULL != pos) { ++ no_proxy[pos-no_proxy] = ','; ++ pos = strpbrk(no_proxy, ; ); ++} + } + + if(!check_noproxy(conn-host.name, no_proxy)) { +/* Look for the http proxy setting */ +char* tok; + -+tok = strtok(ieProxy, ;); -+if(strchr(tok, '=') == NULL) { -+ proxy = strdup(ieProxy); -+} -+else { -+ do { -+if(strncmp(tok, http=, 5) == 0) { -+ /* We found HTTP proxy value, then use it */ -+ proxy = strdup( tok + 5 ); ++if(NULL != ieProxy) { ++ tok = strtok(ieProxy, ;); ++ if(strchr(tok, '=') == NULL) { ++proxy = strdup(ieProxy); ++ } ++ else { ++do { ++ if(strncmp(tok, http=, 5) == 0) { ++/* We found HTTP proxy value, then use it */ ++proxy = strdup( tok + 5 ); ++ } ++ tok = strtok(NULL, ;); +} ++while(NULL != tok); + } -+ while(NULL != strtok(NULL, ;)); +} + } + @@ -112,7 +117,7 @@ char proxy_env[128]; no_proxy=curl_getenv(no_proxy); -@@ -4189,9 +4259,9 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4189,9 +4265,9 @@ static char *detect_proxy(struct connectdata *conn) } } /* if(!check_noproxy(conn-host.name, no_proxy)) - it wasn't specified non-proxy */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: curl: fixed crashers in curl patch for system proxy
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1802 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1802 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ieb8e782eab9c9bde1d2099d8cc32eceef9f2 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Bosdonnat Cedric cedric.bosdon...@free.fr Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - oox/inc oox/source sw/qa writerfilter/source
oox/inc/oox/vml/vmlshape.hxx |2 oox/inc/oox/vml/vmltextbox.hxx| 11 oox/inc/oox/vml/vmltextboxcontext.hxx |1 oox/source/vml/vmlshape.cxx | 15 -- oox/source/vml/vmlshapecontext.cxx| 11 ++-- oox/source/vml/vmltextbox.cxx | 36 +- oox/source/vml/vmltextboxcontext.cxx | 45 ++ sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 27 ++ writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 42 ++-- 9 files changed, 149 insertions(+), 41 deletions(-) New commits: commit 22f8333ea6ca8e5c74b8be8a9900136e13874d7c Author: Miklos Vajna vmik...@suse.cz Date: Fri Dec 14 18:16:56 2012 +0100 n#792778 DOCX import: parse group shapes in oox only Previously textframes inside groupshapes were tried to be imported as TextFrames, but then their addition to a GroupShape failed, so the text simply ended up as a normal paragraph. Fix this by importing members of groupshapes as drawinglayer objects, just like how the WW8 import does. Also fix two testcases, which implicitely tested that the groupshape VML element is ignored on import. Change-Id: I1a9fba8a5fd532203a825e55b1d5996277ea12fa Signed-off-by: Andras Timar ati...@suse.com diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index 87b51d1..35d3a85 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -202,7 +202,7 @@ struct ShapeModel ~ShapeModel(); /** Creates and returns a new shape textbox structure. */ -TextBoxcreateTextBox(); +TextBoxcreateTextBox(ShapeTypeModel rModel); /** Creates and returns a new shape client data structure. */ ClientData createClientData(); }; diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx index af69e77..4981443 100644 --- a/oox/inc/oox/vml/vmltextbox.hxx +++ b/oox/inc/oox/vml/vmltextbox.hxx @@ -24,10 +24,17 @@ #include rtl/ustring.hxx #include oox/helper/helper.hxx #include oox/dllapi.h +#include com/sun/star/uno/Reference.h + +namespace com { namespace sun { namespace star { +namespace drawing { class XShape; } +} } } namespace oox { namespace vml { +class ShapeTypeModel; + // /** Font settings for a text portion in a textbox. */ @@ -62,7 +69,7 @@ struct TextPortionModel class OOX_DLLPUBLIC TextBox { public: -explicitTextBox(); +explicitTextBox(ShapeTypeModel rTypeModel); /** Appends a new text portion to the textbox. */ voidappendPortion( const TextFontModel rFont, const ::rtl::OUString rText ); @@ -73,7 +80,9 @@ public: const TextFontModel* getFirstFont() const; /** Returns the entire text of all text portions. */ ::rtl::OUString getText() const; +void convert(com::sun::star::uno::Referencecom::sun::star::drawing::XShape xShape) const; +ShapeTypeModel mrTypeModel; /// Text distance from the border (inset attribute of v:textbox), valid only if set. bool borderDistanceSet; int borderDistanceLeft, borderDistanceTop, borderDistanceRight, borderDistanceBottom; diff --git a/oox/inc/oox/vml/vmltextboxcontext.hxx b/oox/inc/oox/vml/vmltextboxcontext.hxx index 4fd35d1..a644026 100644 --- a/oox/inc/oox/vml/vmltextboxcontext.hxx +++ b/oox/inc/oox/vml/vmltextboxcontext.hxx @@ -41,6 +41,7 @@ public: virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement, const AttributeList rAttribs ); virtual voidonCharacters( const ::rtl::OUString rChars ); +virtual voidonStartElement(const AttributeList rAttribs); virtual voidonEndElement(); private: diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index a70f51f..1b0caf9 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -233,9 +233,9 @@ ShapeModel::~ShapeModel() { } -TextBox ShapeModel::createTextBox() +TextBox ShapeModel::createTextBox(ShapeTypeModel rModel) { -mxTextBox.reset( new TextBox ); +mxTextBox.reset( new TextBox(rModel) ); return *mxTextBox; } @@ -486,6 +486,9 @@ Reference XShape SimpleShape::implConvertAndInsert( const Reference XShapes PropertySet( xShape ).setAnyProperty(PROP_RelativeHeight, makeAny( nHeight ) ); } } + +if (getTextBox()) +getTextBox()-convert(xShape); } // Import Legacy Fragments (if any) @@ -522,8 +525,9 @@ Reference XShape SimpleShape::createPictureObject( const Reference XShapes { aPropSet.setProperty( PROP_GraphicURL, aGraphicUrl ); } -// If the shape
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sc/source
sc/source/ui/src/colorformat.src |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit ea4553f5ce9b16e279e5b95619750ab7d2d1 Author: Andras Timar ati...@suse.com Date: Tue Jan 22 09:55:59 2013 +0100 allow space for translated text expansion Change-Id: I5706fc9201359c05c00d0a97009994d7d188d5bf Reviewed-on: https://gerrit.libreoffice.org/1807 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/sc/source/ui/src/colorformat.src b/sc/source/ui/src/colorformat.src index 6333bf4..9e7b5b0 100644 --- a/sc/source/ui/src/colorformat.src +++ b/sc/source/ui/src/colorformat.src @@ -93,13 +93,13 @@ ModalDialog RID_SCDLG_DATABAR FixedText FT_POSITION { Pos = MAP_APPFONT( 10, 135 ); -Size = MAP_APPFONT( 70, 14 ); +Size = MAP_APPFONT( 110, 14 ); Text [ en-US ] = Position of vertical axis; }; FixedText FT_COLOR_AXIS { Pos = MAP_APPFONT( 10, 155 ); -Size = MAP_APPFONT( 70, 14 ); +Size = MAP_APPFONT( 110, 14 ); Text [ en-US ] = Color of vertical axis; }; ListBox LB_POS @@ -120,7 +120,7 @@ ModalDialog RID_SCDLG_DATABAR }; ListBox LB_COL_AXIS { -Pos = MAP_APPFONT( 100, 155 ); +Pos = MAP_APPFONT( 120, 155 ); Size = MAP_APPFONT( 60, 50 ); Border = TRUE; DropDown = TRUE; @@ -145,7 +145,7 @@ ModalDialog RID_SCDLG_DATABAR }; ListBox LB_AXIS_POSITION { -Pos = MAP_APPFONT( 100, 135 ); +Pos = MAP_APPFONT( 120, 135 ); Size = MAP_APPFONT( 50, 50 ); Border = TRUE; DropDown = TRUE; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Change in core[libreoffice-4-0]: allow space for translated text expansion
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1807 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1807 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5706fc9201359c05c00d0a97009994d7d188d5bf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Minutes - QA Call 01/11/2013
julien2412 schrieb: I read quickly this thread, Hello Julien, thx, for feedback, I believe for for further discussion of possibly necessary rethinking of current or planned proceeding we should start a new thread on libreoffice...@lists.freedesktop.org, here we might discommode devs' workflow. CU Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - oox/inc
oox/inc/oox/vml/vmlshape.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1f2cc4ed10cc86a16c5695abadc0d6105a75ed5d Author: Miklos Vajna vmik...@suse.cz Date: Mon Dec 17 14:56:10 2012 +0100 oox: try to make Windows build happy Change-Id: Ib7340d79fc29ef0d0c46083a6aac6c27aba2629b Signed-off-by: Andras Timar ati...@suse.com diff --git a/oox/inc/oox/vml/vmlshape.hxx b/oox/inc/oox/vml/vmlshape.hxx index 35d3a85..2f4ab6f 100644 --- a/oox/inc/oox/vml/vmlshape.hxx +++ b/oox/inc/oox/vml/vmlshape.hxx @@ -55,7 +55,7 @@ const sal_Int32 VML_CLIENTDATA_FORMULA = 4; // /** The shape model structure contains all properties shared by all types of shapes. */ -struct ShapeTypeModel +struct OOX_DLLPUBLIC ShapeTypeModel { ::rtl::OUString maShapeId; /// Unique identifier of the shape. ::rtl::OUString maShapeName;/// Name of the shape, if present. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c605119a8a69a04e3dcc958d1ac2796d4bb04a9b Author: Olivier R olivier.nore...@gmail.com Date: Mon Jan 21 17:33:47 2013 +0100 Updated core Project: dictionaries 7d469f332804f6ed3efcdfd5f7217703aded1e35 diff --git a/dictionaries b/dictionaries index a272609..7d469f3 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit a272609545d3153107828949911fc04c1e87b329 +Subproject commit 7d469f332804f6ed3efcdfd5f7217703aded1e35 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a2d1ae250d1b63f98e01b391cf06641452347ded Author: Olivier R olivier.nore...@gmail.com Date: Mon Jan 21 17:33:47 2013 +0100 Updated core Project: dictionaries ce03fd39f4a4454b4473a68bcee87fd7e9bde9a1 diff --git a/dictionaries b/dictionaries index 51ee8a4..ce03fd3 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 51ee8a42f9f9b6a408ddf77b34f3ae84e128b1b0 +Subproject commit ce03fd39f4a4454b4473a68bcee87fd7e9bde9a1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] French dictionary update
On Mon, 2013-01-21 at 08:43 -0800, Olivier R. wrote: Hello, Here is a patch to update the French dictionary. For LO 4 and master only. Thanks. Regards, Olivier 0001-French-dictionary-update-v4.9.patch http://nabble.documentfoundation.org/file/n4030863/0001-French-dictionary-update-v4.9.patch I have pushed the patch into both master and 4-0 branch, see http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=7d469f332804f6ed3efcdfd5f7217703aded1e35 http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?h=libreoffice-4-0id=ce03fd39f4a4454b4473a68bcee87fd7e9bde9a1 Thanks for the patch. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [libreoffice-l10n] Translation of the names of the keys on Windows
On Mon, 2013-01-21 at 17:15 +0100, Martin Srebotnjak wrote: Hello, thanks, Petr, I hope this includes my code for Slovenian for Linux and Windows (the latter was in a separate reply to this thread). I committed the change only for Windows, see http://cgit.freedesktop.org/libreoffice/core/commit/?id=2f9cc7a486f89fe34e44f45399ddbeb240a3adb1 I do not see your change for Linux. Could you please resend it or point me to the mail? Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED: master, 4-0] French dictionary update
On Tue, 2013-01-22 at 12:56 +0100, Petr Mladek wrote: On Mon, 2013-01-21 at 08:43 -0800, Olivier R. wrote: Hello, Here is a patch to update the French dictionary. For LO 4 and master only. Thanks. Regards, Olivier 0001-French-dictionary-update-v4.9.patch http://nabble.documentfoundation.org/file/n4030863/0001-French-dictionary-update-v4.9.patch I have pushed the patch into both master and 4-0 branch, see http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?id=7d469f332804f6ed3efcdfd5f7217703aded1e35 http://cgit.freedesktop.org/libreoffice/dictionaries/commit/?h=libreoffice-4-0id=ce03fd39f4a4454b4473a68bcee87fd7e9bde9a1 Also updated the subject to close this thread. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'distro/suse/suse-3.6' - fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |9 + 1 file changed, 1 insertion(+), 8 deletions(-) New commits: commit 0822336d45e7f1bf23dca52f8945e22e37b577e8 Author: Tor Lillqvist tlillqv...@suse.com Date: Tue Jan 22 13:01:44 2013 +0200 Fix bnc#88 Always call IFileDialog::SetFolder() in VistaFilePickerImpl::impl_sta_SetFileName() as that seems to be what the customer wants. Change-Id: I53807847d1d8f954caefe7d9e4b4e4807e6dcbfb diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index b7f8670..ad77c33 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -687,7 +687,6 @@ void VistaFilePickerImpl::impl_sta_SetFileName(const RequestRef rRequest) void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef rRequest) { ::rtl::OUString sDirectory = rRequest-getArgumentOrDefault(PROP_DIRECTORY, ::rtl::OUString()); -boolbForce = rRequest-getArgumentOrDefault(PROP_FORCE, false); if( !m_bInExecute) { @@ -714,13 +713,7 @@ void VistaFilePickerImpl::impl_sta_SetDirectory(const RequestRef rRequest) if ( FAILED(hResult) ) return; -if ( m_bInExecute || bForce ) -iDialog-SetFolder(pFolder); -else -{ -// Use set default folder as Microsoft recommends in the IFileDialog documentation. -iDialog-SetDefaultFolder(pFolder); -} +iDialog-SetFolder(pFolder); } void VistaFilePickerImpl::impl_sta_GetDirectory(const RequestRef rRequest) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source forms/source sc/source sd/source tools/inc
cui/source/dialogs/scriptdlg.cxx |5 +++-- cui/source/options/opthtml.cxx| 14 +++--- forms/source/solar/control/navtoolbar.cxx |2 +- sc/source/ui/app/inputwin.cxx |4 ++-- sc/source/ui/dbgui/dbnamdlg.cxx |6 +++--- sd/source/ui/dlg/paragr.cxx |2 +- tools/inc/tools/string.hxx| 22 ++ 7 files changed, 39 insertions(+), 16 deletions(-) New commits: commit fea25896a87aa5826eb243069d34aae7d0333a4c Author: Michael Stahl mst...@redhat.com Date: Mon Jan 21 21:42:46 2013 +0100 tools/string.hxx: add operator==/!= for OUString/String This has the disadvantage that it makes comparisons involving fast OUString concatenation via operator+ ambiguous, as can be seen in scriptdlg.cxx, but it allows comparing String and OUString wihout explicit conversion, which is nice for incrementally converting code. Change-Id: Ibfc728bdb161a01e0f8311915c97bcbba8b58c0b Reviewed-on: https://gerrit.libreoffice.org/1803 Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index f4b1e94..944ca6f 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -910,7 +910,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } for( sal_Int32 index = 0; index childNodes.getLength(); index++ ) { -if ( (aNewName+extn) == childNodes[index]-getName() ) +if (OUString(aNewName+extn) == childNodes[index]-getName()) { bFound = sal_True; break; @@ -939,7 +939,8 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) bValid = sal_True; for( sal_Int32 index = 0; index childNodes.getLength(); index++ ) { -if ( (aUserSuppliedName+extn) == childNodes[index]-getName() ) +if (OUString(aUserSuppliedName+extn) +== childNodes[index]-getName()) { bValid = sal_False; String aError( m_createErrStr ); diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 49a57fc..9993030 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -111,19 +111,19 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent, sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet ) { SvxHtmlOptions rHtmlOpt = SvxHtmlOptions::Get(); -if(OUString(aSize1NF.GetSavedValue()) != aSize1NF.GetText()) +if(aSize1NF.GetSavedValue() != aSize1NF.GetText()) rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF.GetValue()); -if(OUString(aSize2NF.GetSavedValue()) != aSize2NF.GetText()) +if(aSize2NF.GetSavedValue() != aSize2NF.GetText()) rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF.GetValue()); -if(OUString(aSize3NF.GetSavedValue()) != aSize3NF.GetText()) +if(aSize3NF.GetSavedValue() != aSize3NF.GetText()) rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF.GetValue()); -if(OUString(aSize4NF.GetSavedValue()) != aSize4NF.GetText()) +if(aSize4NF.GetSavedValue() != aSize4NF.GetText()) rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF.GetValue()); -if(OUString(aSize5NF.GetSavedValue()) != aSize5NF.GetText()) +if(aSize5NF.GetSavedValue() != aSize5NF.GetText()) rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF.GetValue()); -if(OUString(aSize6NF.GetSavedValue()) != aSize6NF.GetText()) +if(aSize6NF.GetSavedValue() != aSize6NF.GetText()) rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF.GetValue()); -if(OUString(aSize7NF.GetSavedValue()) != aSize7NF.GetText()) +if(aSize7NF.GetSavedValue() != aSize7NF.GetText()) rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF.GetValue()); if(aNumbersEnglishUSCB.IsChecked() != aNumbersEnglishUSCB.GetSavedValue()) diff --git a/forms/source/solar/control/navtoolbar.cxx b/forms/source/solar/control/navtoolbar.cxx index a356a7f..f146a7e 100644 --- a/forms/source/solar/control/navtoolbar.cxx +++ b/forms/source/solar/control/navtoolbar.cxx @@ -685,7 +685,7 @@ namespace frm //- void RecordPositionInput::FirePosition( sal_Bool _bForce ) { -if ( _bForce || ( GetText() != OUString(GetSavedValue()) ) ) +if ( _bForce || (GetText() != GetSavedValue()) ) { sal_Int64 nRecord = GetValue(); if ( nRecord GetMin() || nRecord GetMax() ) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 64be1b4..79b71d8 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1373,7 +1373,7 @@ void ScMultiTextWnd::InitEditEngine()
[Libreoffice-commits] .: 2 commits - cui/source sal/inc tools/inc
cui/source/dialogs/scriptdlg.cxx |5 +-- sal/inc/sal/log.hxx |3 +- tools/inc/tools/string.hxx | 52 +++ 3 files changed, 56 insertions(+), 4 deletions(-) New commits: commit b9c21b972ee044e2cfe5e8271ef232738669c7fa Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Jan 22 12:24:54 2013 +0100 refer more explicitly to sal/inc/sal/log-areas.dox for adding new areas Change-Id: If9eecbf69a4486dcd84d475719aa66f480faea0b diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx index bd8d476..71e2d52 100644 --- a/sal/inc/sal/log.hxx +++ b/sal/inc/sal/log.hxx @@ -218,7 +218,8 @@ inline char const * unwrapStream(SAL_UNUSED_PARAMETER StreamIgnore const ) { segment ::= [0-9a-z]+ -For a list of areas used see @ref sal_log_areas SAL debug areas. +For a list of areas used see @ref sal_log_areas SAL debug areas. Whenever +you use a new log area, add it to the file sal/inc/sal/log-areas.dox . Whether these macros generate any log output is controlled in a two-stage process. commit 98e90120119360a2b3e92310f98931fce5c12271 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Jan 22 12:24:04 2013 +0100 make fast string concat comparisons non-ambiguous Follow-up to https://gerrit.libreoffice.org/#/c/1803/ . Change-Id: I9131854a579ef57e38dfef7faa539bec98fc305b diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 944ca6f..959f3a1 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -910,7 +910,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } for( sal_Int32 index = 0; index childNodes.getLength(); index++ ) { -if (OUString(aNewName+extn) == childNodes[index]-getName()) +if (aNewName+extn == childNodes[index]-getName()) { bFound = sal_True; break; @@ -939,8 +939,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) bValid = sal_True; for( sal_Int32 index = 0; index childNodes.getLength(); index++ ) { -if (OUString(aUserSuppliedName+extn) -== childNodes[index]-getName()) +if (aUserSuppliedName+extn == childNodes[index]-getName()) { bValid = sal_False; String aError( m_createErrStr ); diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx index 0adf08c..ce81a61 100644 --- a/tools/inc/tools/string.hxx +++ b/tools/inc/tools/string.hxx @@ -355,6 +355,58 @@ inline bool operator!=(::rtl::OUString const rLeft, UniString const rRight) return rLeft != ::rtl::OUString(rRight); } +#ifdef RTL_FAST_STRING +// The above operators make comparisons involving fast string concatenation ambiguous, so provide explicit overloads. +template typename T1, typename T2 +inline bool operator==( const rtl::OUStringConcat T1, T2 concat, const OUString str ) +{ +return OUString( concat ) == str; +} + +template typename T1, typename T2 +inline bool operator!=( const rtl::OUStringConcat T1, T2 concat, const OUString str ) +{ +return OUString( concat ) == str; +} + +template typename T1, typename T2 +inline bool operator==( const OUString str, const rtl::OUStringConcat T1, T2 concat ) +{ +return str == OUString( concat ); +} + +template typename T1, typename T2 +inline bool operator!=( const OUString str, const rtl::OUStringConcat T1, T2 concat ) +{ +return str != OUString( concat ); +} + +template typename T1, typename T2 +inline bool operator==( const rtl::OUStringConcat T1, T2 concat, const UniString str ) +{ +return UniString( concat ) == str; +} + +template typename T1, typename T2 +inline bool operator!=( const rtl::OUStringConcat T1, T2 concat, const UniString str ) +{ +return UniString( concat ) == str; +} + +template typename T1, typename T2 +inline bool operator==( const UniString str, const rtl::OUStringConcat T1, T2 concat ) +{ +return str == UniString( concat ); +} + +template typename T1, typename T2 +inline bool operator!=( const UniString str, const rtl::OUStringConcat T1, T2 concat ) +{ +return str != UniString( concat ); +} + +#endif + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Replace [Uni|Xub]String with OUString in vcl,svtools,toolkit
Christina Roßmanith has abandoned this change. Change subject: Replace [Uni|Xub]String with OUString in vcl,svtools,toolkit .. Patch Set 1: Abandoned I6b82d48245ee2a0782e05a326f7934e9357227d0 contains this changes as subset -- To view, visit https://gerrit.libreoffice.org/1667 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9e6cd6cd6726a1377b46fea773fe5c16aa26ba70 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith chrrossman...@web.de Gerrit-Reviewer: Christina Roßmanith chrrossman...@web.de Gerrit-Reviewer: LOH KOK HOE huahsi...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Replace [Uni|Xub]String with OUString in vcl
Christina Roßmanith has abandoned this change. Change subject: Replace [Uni|Xub]String with OUString in vcl .. Patch Set 1: Abandoned I6b82d48245ee2a0782e05a326f7934e9357227d0 contains this changes as a subset -- To view, visit https://gerrit.libreoffice.org/1666 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I7cbefa72010cc3e49a93db5b2cbf49cfb08061f7 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Christina Roßmanith chrrossman...@web.de Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ 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 Bug 54157 depends on bug 58863, which changed state. Bug 58863 Summary: FILEOPEN .xlsx: IF condition not calculated https://bugs.freedesktop.org/show_bug.cgi?id=58863 What|Removed |Added Status|RESOLVED|REOPENED Resolution|FIXED |--- -- 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] .: tools/inc
tools/inc/tools/stream.hxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit aab9c9deee38de1776acebaa8c0877cf945dca83 Author: Stephan Bergmann sberg...@redhat.com Date: Mon Jan 21 18:28:58 2013 +0100 Detect SvStream::operator calls with bool args w/o using -Wsign-promo ...as -Wsign-promo caused other problems and has been removed again with 488823a140217e393298bc83e75084041a85ed45 Remove -Wsign-promo. It had originally been introduced with e8bbb76827dd7a0e30d7d1db34a812a84d85f390 ensure correct export size type in stream operation, apparently to detect an SvStream::operator call with a bool argument that would pick the int overload instead of the unsigned char (aka sal_Bool) one (which would have happened to trigger the -Wsign-promo warning by luck, given that sal_Bool is unsigned char and not signed char, say). Change-Id: I0bf4389753e53a535bd90ca2a98b6a5be63d179a Reviewed-on: https://gerrit.libreoffice.org/1798 Reviewed-by: LuboÅ¡ LuÅák l.lu...@suse.cz Tested-by: LuboÅ¡ LuÅák l.lu...@suse.cz diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx index abd6520..23d4a04 100644 --- a/tools/inc/tools/stream.hxx +++ b/tools/inc/tools/stream.hxx @@ -324,6 +324,8 @@ public: SvStream operator( sal_Int32 nInt32 ); SvStream operator( sal_Int64 nInt64 ); +SvStream operator( bool b ) +{ return operator(static_cast sal_Bool (b)); } SvStream operator( signed char nChar ); SvStream operator( char nChar ); SvStream operator( unsigned char nChar ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Detect SvStream::operator calls with bool args w/o using -...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1798 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1798 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0bf4389753e53a535bd90ca2a98b6a5be63d179a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Stephan Bergmann sberg...@redhat.com Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/inc/richstring.hxx |7 +++ sc/source/filter/inc/workbookhelper.hxx |2 + sc/source/filter/oox/richstring.cxx | 58 + sc/source/filter/oox/stylesbuffer.cxx| 60 --- sc/source/filter/oox/workbookhelper.cxx | 26 + sc/source/filter/oox/worksheethelper.cxx | 15 --- 6 files changed, 141 insertions(+), 27 deletions(-) New commits: commit f54ce3e7f6d6aab7e34c54ad8eff06650e076fef Author: Noel Power noel.po...@suse.com Date: Tue Jan 22 11:58:20 2013 + lose uno api for font related xlsx import also fixes a bug where the font format of the first portion of a rich text string gets to be set as the default cell style for that cell Change-Id: Ib2e85e6f2a971940b94100c2bf45d85d8afa2869 diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index a279429..4815fa2 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -23,6 +23,10 @@ #include oox/helper/refvector.hxx #include stylesbuffer.hxx +class EditTextObject; +class ESelection; +class ScEditEngineDefaulter; + namespace com { namespace sun { namespace star { namespace text { class XText; } } } } @@ -68,7 +72,9 @@ public: /** Converts the portion and replaces or appends to the passed XText. */ voidconvert( const ::com::sun::star::uno::Reference ::com::sun::star::text::XText rxText, + const Font* pFont, bool bReplace ); +voidconvert( ScEditEngineDefaulter rEE, ESelection rSelection, const Font* pFont ); voidwriteFontProperties( const ::com::sun::star::uno::Reference ::com::sun::star::text::XText rxText, @@ -250,6 +256,7 @@ public: const ::com::sun::star::uno::Reference ::com::sun::star::text::XText rxText, bool bReplaceOld, const Font* pFirstPortionFont = 0 ) const; +::EditTextObject* convert( ScEditEngineDefaulter rEE, const Font* pFont ) const; private: /** Creates, appends, and returns a new empty string portion. */ diff --git a/sc/source/filter/inc/workbookhelper.hxx b/sc/source/filter/inc/workbookhelper.hxx index a4265dc..0e1b87d 100644 --- a/sc/source/filter/inc/workbookhelper.hxx +++ b/sc/source/filter/inc/workbookhelper.hxx @@ -55,6 +55,7 @@ namespace oox { namespace core { } } class ScDocument; +class ScEditEngineDefaulter; namespace oox { namespace xls { @@ -146,6 +147,7 @@ public: // document model - ScDocument getScDocument() const; +ScEditEngineDefaulter getEditEngine() const; /** Returns a reference to the source/target spreadsheet document model. */ ::com::sun::star::uno::Reference ::com::sun::star::sheet::XSpreadsheetDocument getDocument() const; diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index f262598..acbaea6 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -21,9 +21,11 @@ #include com/sun/star/text/XText.hpp #include rtl/ustrbuf.hxx +#include editeng/editobj.hxx #include oox/helper/attributelist.hxx #include oox/helper/propertyset.hxx #include biffinputstream.hxx +#include editutil.hxx namespace oox { namespace xls { @@ -112,6 +114,41 @@ void RichStringPortion::convert( const Reference XText rxText, const Font* p } } +void RichStringPortion::convert( ScEditEngineDefaulter rEE, ESelection rSelection, const Font* pFont ) +{ +rSelection.nStartPos = rSelection.nEndPos; +rSelection.nStartPara = rSelection.nEndPara; +SfxItemSet aItemSet( rEE.GetEmptyItemSet() ); + +const Font* pFontToUse = mxFont.get() ? mxFont.get() : lclNeedsRichTextFormat( pFont ) ? pFont : NULL; + +if ( pFontToUse ) +pFontToUse-fillToItemSet( aItemSet, FONT_PROPTYPE_TEXT ); + +// #TODO need to manually adjust nEndPos ( and nEndPara ) to cater for any paragraphs +sal_Int32 nLastParaLoc = -1; +sal_Int32 nSearchIndex = maText.indexOf( '\n' ); +sal_Int32 nParaOccurence = 0; +while ( nSearchIndex != -1 ) +{ +nLastParaLoc = nSearchIndex; +++nParaOccurence; +rSelection.nEndPos = 0; +nSearchIndex = maText.indexOf( '\n', nSearchIndex + 1); +} + +rSelection.nEndPara += nParaOccurence; +if ( nLastParaLoc != -1 ) +{ +rSelection.nEndPos = maText.getLength() - 1 - nLastParaLoc; +} +else +{ +rSelection.nEndPos = rSelection.nStartPos + maText.getLength(); +} +rEE.QuickSetAttribs( aItemSet, rSelection ); +} + void RichStringPortion::writeFontProperties( const ReferenceXText rxText, const Font* pFont ) const { PropertySet aPropSet(rxText); @@ -378,6 +415,27
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Winfried Donkers o...@dci-electronics.nl changed: What|Removed |Added Depends on||59405 -- 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
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 58863, which changed state. Bug 58863 Summary: FILEOPEN .xlsx: IF condition not calculated https://bugs.freedesktop.org/show_bug.cgi?id=58863 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- 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] .: vcl/unx
vcl/unx/generic/app/keysymnames.cxx | 36 1 file changed, 36 insertions(+) New commits: commit b35b7f8285b60271eeae257ea350a615523391a4 Author: Martin Srebotnjak mi...@filmsi.net Date: Tue Jan 22 13:21:46 2013 +0100 Translate keyboard shortcuts also for Linux Change-Id: I4d2f85106045a22be61c6b42fad941e4d4cf88d5 diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index 05c37d4..7fd127b 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -281,6 +281,41 @@ namespace vcl_sal { { SunXK_Cut, Cut }, }; +static const struct KeysymNameReplacement aImplReplacements_Slovenian[] = +{ +{ XK_Control_L, Krmilka }, +{ XK_Control_R, Krmilka }, +{ XK_Shift_L, Dvigalka }, +{ XK_Shift_R, Dvigalka }, +{ XK_Alt_L, Izmenjalka }, +{ XK_Alt_R, Desna izmenjalka }, +{ XK_Page_Up, PrejÅ¡nja stranf }, +{ XK_Page_Down, Naslednja stran }, +{ XK_End, Konec }, +{ XK_Home, ZaÄetek }, +{ XK_Insert, Vstavljalka }, +{ XK_Delete, Brisalka }, +{ XK_Escape, Ubežnica }, +{ XK_Right, Desno }, +{ XK_Left, Levo }, +{ XK_Up, Navzgor }, +{ XK_Down, Navzdol }, +{ XK_BackSpace, VraÄalka }, +{ XK_Return, VnaÅ¡alka }, +{ XK_slash, PoÅ¡evnica }, +{ XK_space, Preslednica }, +{ SunXK_Stop, Ustavi }, +{ SunXK_Again, Ponovi }, +{ SunXK_Props, Lastnosti }, +{ SunXK_Undo, Razveljavi }, +{ SunXK_Front, Ospredje }, +{ SunXK_Copy, Kopiraj }, +{ SunXK_Open, Odpri }, +{ SunXK_Paste, Prilepi }, +{ SunXK_Find, Najdi }, +{ SunXK_Cut, Izreži }, +}; + static const struct KeysymNameReplacement aImplReplacements_Spanish[] = { { XK_Shift_L, Mayús }, @@ -375,6 +410,7 @@ namespace vcl_sal { { { ca, aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) }, { de, aImplReplacements_German, SAL_N_ELEMENTS(aImplReplacements_German) }, +{ sl, aImplReplacements_Slovenian, SAL_N_ELEMENTS(aImplReplacements_Slovenian) }, { es, aImplReplacements_Spanish, SAL_N_ELEMENTS(aImplReplacements_Spanish) }, { et, aImplReplacements_Estonian, SAL_N_ELEMENTS(aImplReplacements_Estonian) }, { fr, aImplReplacements_French, SAL_N_ELEMENTS(aImplReplacements_French) }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - vcl/unx
vcl/unx/generic/app/keysymnames.cxx | 36 1 file changed, 36 insertions(+) New commits: commit a436b03bef9e69ad0385113608189452718ed6bb Author: Martin Srebotnjak mi...@filmsi.net Date: Tue Jan 22 13:21:46 2013 +0100 Translate keyboard shortcuts also for Linux Change-Id: I4d2f85106045a22be61c6b42fad941e4d4cf88d5 Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index 05c37d4..7fd127b 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -281,6 +281,41 @@ namespace vcl_sal { { SunXK_Cut, Cut }, }; +static const struct KeysymNameReplacement aImplReplacements_Slovenian[] = +{ +{ XK_Control_L, Krmilka }, +{ XK_Control_R, Krmilka }, +{ XK_Shift_L, Dvigalka }, +{ XK_Shift_R, Dvigalka }, +{ XK_Alt_L, Izmenjalka }, +{ XK_Alt_R, Desna izmenjalka }, +{ XK_Page_Up, PrejÅ¡nja stranf }, +{ XK_Page_Down, Naslednja stran }, +{ XK_End, Konec }, +{ XK_Home, ZaÄetek }, +{ XK_Insert, Vstavljalka }, +{ XK_Delete, Brisalka }, +{ XK_Escape, Ubežnica }, +{ XK_Right, Desno }, +{ XK_Left, Levo }, +{ XK_Up, Navzgor }, +{ XK_Down, Navzdol }, +{ XK_BackSpace, VraÄalka }, +{ XK_Return, VnaÅ¡alka }, +{ XK_slash, PoÅ¡evnica }, +{ XK_space, Preslednica }, +{ SunXK_Stop, Ustavi }, +{ SunXK_Again, Ponovi }, +{ SunXK_Props, Lastnosti }, +{ SunXK_Undo, Razveljavi }, +{ SunXK_Front, Ospredje }, +{ SunXK_Copy, Kopiraj }, +{ SunXK_Open, Odpri }, +{ SunXK_Paste, Prilepi }, +{ SunXK_Find, Najdi }, +{ SunXK_Cut, Izreži }, +}; + static const struct KeysymNameReplacement aImplReplacements_Spanish[] = { { XK_Shift_L, Mayús }, @@ -375,6 +410,7 @@ namespace vcl_sal { { { ca, aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) }, { de, aImplReplacements_German, SAL_N_ELEMENTS(aImplReplacements_German) }, +{ sl, aImplReplacements_Slovenian, SAL_N_ELEMENTS(aImplReplacements_Slovenian) }, { es, aImplReplacements_Spanish, SAL_N_ELEMENTS(aImplReplacements_Spanish) }, { et, aImplReplacements_Estonian, SAL_N_ELEMENTS(aImplReplacements_Estonian) }, { fr, aImplReplacements_French, SAL_N_ELEMENTS(aImplReplacements_French) }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - sd/inc sd/source solenv/bin svl/inc svl/Package_inc.mk svl/source svx/inc svx/source
sd/inc/stlpool.hxx |3 + sd/source/core/drawdoc3.cxx| 51 +++-- sd/source/core/stlpool.cxx | 18 +++ sd/source/core/stlsheet.cxx| 13 + solenv/bin/linkoo |2 svl/Package_inc.mk |1 svl/inc/svl/style.hxx |6 ++ svl/inc/svl/stylesheetuser.hxx | 38 +++ svl/source/items/style.cxx |5 ++ svx/inc/svx/sdr/properties/attributeproperties.hxx |5 +- svx/inc/svx/svdpage.hxx|5 +- svx/source/sdr/properties/attributeproperties.cxx | 12 svx/source/svdraw/svdpage.cxx |7 ++ 13 files changed, 150 insertions(+), 16 deletions(-) New commits: commit f8409911be702c988557903e44783e22a8029769 Author: David Tardon dtar...@redhat.com Date: Tue Jan 22 10:32:32 2013 +0100 do not second-guess which classes use a stylesheet Change-Id: I76b23bcdca2e7394fd5ab67e8341f4cdb46f8a64 diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index f013739..0756e6b 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -349,18 +349,9 @@ bool SdStyleSheet::IsUsed() const if( pListener == this ) continue; -// NULL-Pointer ist im Listener-Array erlaubt -if (pListener) -{ -if (pListener-ISA(sdr::properties::AttributeProperties)) -{ -bResult = true; -} -else if (pListener-ISA(SfxStyleSheet)) -{ -bResult = ((SfxStyleSheet*)pListener)-IsUsed(); -} -} +const svl::StyleSheetUser* const pUser(dynamic_castsvl::StyleSheetUser*(pListener)); +if (pUser) +bResult = pUser-isUsedByModel(); if (bResult) break; } diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk index e518219..5ac424d 100644 --- a/svl/Package_inc.mk +++ b/svl/Package_inc.mk @@ -97,6 +97,7 @@ $(eval $(call gb_Package_add_file,svl_inc,inc/svl/strmadpt.hxx,svl/strmadpt.hxx) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hrc,svl/style.hrc)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/style.hxx,svl/style.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylepool.hxx,svl/stylepool.hxx)) +$(eval $(call gb_Package_add_file,svl_inc,inc/svl/stylesheetuser.hxx,svl/stylesheetuser.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svdde.hxx,svl/svdde.hxx)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svl.hrc,svl/svl.hrc)) $(eval $(call gb_Package_add_file,svl_inc,inc/svl/svldllapi.h,svl/svldllapi.h)) diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 48557c5..18c0ceb 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -34,6 +34,7 @@ #include svl/lstner.hxx #include svl/brdcst.hxx #include svl/poolitem.hxx +#include svl/stylesheetuser.hxx #include svl/style.hrc @@ -267,7 +268,7 @@ public: //= class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase, - public SfxListener, public SfxBroadcaster + public SfxListener, public SfxBroadcaster, public svl::StyleSheetUser { public: TYPEINFO(); @@ -276,6 +277,9 @@ public: SfxStyleSheet( const SfxStyleSheet ); virtual voidNotify( SfxBroadcaster rBC, const SfxHint rHint ); + +virtual boolisUsedByModel() const; + virtual boolSetParent( const UniString ); protected: diff --git a/svl/inc/svl/stylesheetuser.hxx b/svl/inc/svl/stylesheetuser.hxx new file mode 100644 index 000..787263f --- /dev/null +++ b/svl/inc/svl/stylesheetuser.hxx @@ -0,0 +1,38 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef SVL_STYLESHEETUSER_HXX_INCLUDED +#define SVL_STYLESHEETUSER_HXX_INCLUDED + +namespace svl +{ + +/** Test whether object that uses a stylesheet is used itself. + + This interface should be implemented by all classes that use + a SfxStyleSheet (and listen on it). It can be queried by the stylesheet + to determine if it is really used. + */ +class StyleSheetUser +{ +public: +/** Test whether this object is used. + + @return true, if the object is used, false otherwise + */ +virtual bool isUsedByModel() const = 0; +protected: +~StyleSheetUser()
Resolves fdo#59117 fixes missing border of last column
Karthikeyan Krishnamurthi has abandoned this change. Change subject: Resolves fdo#59117 fixes missing border of last column .. Patch Set 1: Abandoned -- To view, visit https://gerrit.libreoffice.org/1805 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I3c9a95169ea1581d44c176ec260a9cbf818913ab Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Karthikeyan Krishnamurthi karthike...@kacst.edu.sa Gerrit-Reviewer: Ahmad Harthi aalhar...@kacst.edu.sa ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Python extension issue with LO 4 on Windows
Hi *, On Windows, LO 4 is unable to install this extension (written in Python): http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.9/lo-oo-ressources-linguistiques-fr-v4.9.oxt Here is the error I get: (com.sun.star.uno.RuntimeException) { { Message = class 'UnicodeDecodeError': 'charmap' codec can't decode byte 0x9d in position 3782: character maps to undefined, traceback follows\X000a C:\\Program Files (x86)\\LOdev 4.0\\program\\python-core-3.3.0\\lib\\encodings\\cp1252.py:23 in function decode() [return codecs.charmap_decode(input,self.errors,decoding_table)[0]]\X000a C:\\Program Files (x86)\\LOdev 4.0\\program\\pythonloader.py:94 in function getModuleFromUrl() [src = fileHandle.read().replace(\\\r\,\\)]\X000a C:\\Program Files (x86)\\LOdev 4.0\\program\\pythonloader.py:146 in function writeRegistryInfo() [mod = self.getModuleFromUrl( locationUrl )]\X000a\X000a, Context = (com.sun.star.uno.XInterface) @0 } } But it works properly on Linux. The code is useful to switch between the 4 different French dictionaries. Any idea? Should I create a bug report? Best regards, Olivier -- View this message in context: http://nabble.documentfoundation.org/Python-extension-issue-with-LO-4-on-Windows-tp4031038.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: odk/index.html odk/index_online.html
odk/index.html|7 +++ odk/index_online.html |7 +++ 2 files changed, 14 insertions(+) New commits: commit 664e559abd472bf2b427e2c01144ea39fb5bc02b Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 22 14:24:31 2013 +0100 Add link to additional sdk-examples Change-Id: Ifcc3594273de3507ec9b208e9e762bed0f969d72 diff --git a/odk/index.html b/odk/index.html index d3dfeb0..2a858f5 100644 --- a/odk/index.html +++ b/odk/index.html @@ -145,6 +145,13 @@ td class=content70A collection of examples in different programming languages (Java, Python, C++, Basic, OLE, CLI)./td /tr + tr valign=top +td class=content4img src=docs/images/arrow-1.gif/td +td colspan=2a href=https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=README;hb=HEAD; title=link to the git repository README fileAdditional Examples/a/td +td class=content70A git repository with additional examples + from various contributors: codegit clone + https://gerrit.libreoffice.org/sdk-examples/code/td + /tr tr valign=middle tdimg class=nothing10 src=docs/images/nada.gif/td td colspan=3img class=line src=docs/images/sdk_line-1.gif/td diff --git a/odk/index_online.html b/odk/index_online.html index 032b699..76e6985 100644 --- a/odk/index_online.html +++ b/odk/index_online.html @@ -67,6 +67,13 @@ td class=content70A collection of examples in different programming languages (Java, Python, C++, Basic, OLE, CLI)./td /tr + tr valign=top +td class=content4img src=docs/images/arrow-1.gif/td +td colspan=2a href=https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=README;hb=HEAD; title=link to the git repository README fileAdditional Examples/a/td +td class=content70A git repository with additional examples + from various contributors: codegit clone + https://gerrit.libreoffice.org/sdk-examples/code/td + /tr tr valign=middle tdimg class=nothing10 src=docs/images/nada.gif/td td colspan=3img class=line src=docs/images/sdk_line-1.gif/td ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 37361] LibreOffice 3.5 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=37361 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on|51232 | -- 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
[PATCH] Change in core[libreoffice-4-0]: Add link to additional sdk-examples
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1808 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/1808/1 Add link to additional sdk-examples Change-Id: Ifcc3594273de3507ec9b208e9e762bed0f969d72 (cherry picked from commit 664e559abd472bf2b427e2c01144ea39fb5bc02b) --- M odk/index.html M odk/index_online.html 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/odk/index.html b/odk/index.html index d3dfeb0..2a858f5 100644 --- a/odk/index.html +++ b/odk/index.html @@ -145,6 +145,13 @@ td class=content70A collection of examples in different programming languages (Java, Python, C++, Basic, OLE, CLI)./td /tr + tr valign=top +td class=content4img src=docs/images/arrow-1.gif/td +td colspan=2a href=https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=README;hb=HEAD; title=link to the git repository README fileAdditional Examples/a/td +td class=content70A git repository with additional examples + from various contributors: codegit clone + https://gerrit.libreoffice.org/sdk-examples/code/td + /tr tr valign=middle tdimg class=nothing10 src=docs/images/nada.gif/td td colspan=3img class=line src=docs/images/sdk_line-1.gif/td diff --git a/odk/index_online.html b/odk/index_online.html index 032b699..76e6985 100644 --- a/odk/index_online.html +++ b/odk/index_online.html @@ -67,6 +67,13 @@ td class=content70A collection of examples in different programming languages (Java, Python, C++, Basic, OLE, CLI)./td /tr + tr valign=top +td class=content4img src=docs/images/arrow-1.gif/td +td colspan=2a href=https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=README;hb=HEAD; title=link to the git repository README fileAdditional Examples/a/td +td class=content70A git repository with additional examples + from various contributors: codegit clone + https://gerrit.libreoffice.org/sdk-examples/code/td + /tr tr valign=middle tdimg class=nothing10 src=docs/images/nada.gif/td td colspan=3img class=line src=docs/images/sdk_line-1.gif/td -- To view, visit https://gerrit.libreoffice.org/1808 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifcc3594273de3507ec9b208e9e762bed0f969d72 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ 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 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||51232 --- Comment #86 from Rainer Bielefeld libreoff...@bielefeldundbuss.de --- I add Bug 51232 - EDITING: CRASH when paste in outline view after SLIDESHOW. It seems that not many users are affected, but a crash is crash! -- 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
[PATCH] Change in core[libreoffice-3-6]: Add link to additional sdk-examples
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1809 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/09/1809/1 Add link to additional sdk-examples (cherry picked from commit 664e559abd472bf2b427e2c01144ea39fb5bc02b) Conflicts: odk/index.html Change-Id: Ifcc3594273de3507ec9b208e9e762bed0f969d72 --- M odk/index.html M odk/index_online.html 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/odk/index.html b/odk/index.html index dd169c7..a524a81 100644 --- a/odk/index.html +++ b/odk/index.html @@ -127,6 +127,13 @@ td class=content70A collection of examples in different programming languages (Java, Python, C++, Basic, OLE, CLI)./td /tr + tr valign=top +td class=content4img src=docs/images/arrow-1.gif/td +td colspan=2a href=https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=README;hb=HEAD; title=link to the git repository README fileAdditional Examples/a/td +td class=content70A git repository with additional examples + from various contributors: codegit clone + https://gerrit.libreoffice.org/sdk-examples/code/td + /tr tr valign=middle tdimg class=nothing10 src=docs/images/nada.gif/td td colspan=3img class=line src=docs/images/sdk_line-1.gif/td diff --git a/odk/index_online.html b/odk/index_online.html index 032b699..76e6985 100644 --- a/odk/index_online.html +++ b/odk/index_online.html @@ -67,6 +67,13 @@ td class=content70A collection of examples in different programming languages (Java, Python, C++, Basic, OLE, CLI)./td /tr + tr valign=top +td class=content4img src=docs/images/arrow-1.gif/td +td colspan=2a href=https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=README;hb=HEAD; title=link to the git repository README fileAdditional Examples/a/td +td class=content70A git repository with additional examples + from various contributors: codegit clone + https://gerrit.libreoffice.org/sdk-examples/code/td + /tr tr valign=middle tdimg class=nothing10 src=docs/images/nada.gif/td td colspan=3img class=line src=docs/images/sdk_line-1.gif/td -- To view, visit https://gerrit.libreoffice.org/1809 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifcc3594273de3507ec9b208e9e762bed0f969d72 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-3-6 Gerrit-Owner: Stephan Bergmann sberg...@redhat.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'libreoffice-4-0-0'
New branch 'libreoffice-4-0-0' available with the following commits: commit 397ae750a5145fdf32be67e3211397fabb8914d2 Author: Petr Mladek pmla...@suse.cz Date: Tue Jan 22 14:39:13 2013 +0100 Branch libreoffice-4-0-0 This is 'libreoffice-4-0-0' - the stable branch for the 4.0.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0-0'
New branch 'libreoffice-4-0-0' available with the following commits: commit a4073f49c63f9885e4f2ae7cfa55a85c1d0c820c Author: Petr Mladek pmla...@suse.cz Date: Tue Jan 22 14:39:13 2013 +0100 Branch libreoffice-4-0-0 This is 'libreoffice-4-0-0' - the stable branch for the 4.0.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0-0'
New branch 'libreoffice-4-0-0' available with the following commits: commit f7b39220968a50441a3a62d1d1371b223cb710a6 Author: Petr Mladek pmla...@suse.cz Date: Tue Jan 22 14:39:13 2013 +0100 Branch libreoffice-4-0-0 This is 'libreoffice-4-0-0' - the stable branch for the 4.0.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'libreoffice-4-0-0'
New branch 'libreoffice-4-0-0' available with the following commits: commit c189f0de1c28a730dee79c2ae7b41f962c40cc81 Author: Petr Mladek pmla...@suse.cz Date: Tue Jan 22 14:40:47 2013 +0100 Branch libreoffice-4-0-0 This is 'libreoffice-4-0-0' - the stable branch for the 4.0.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 4.0.x release, please use the 'libreoffice-4-0' branch. If you want to build something cool, unstable, and risky, use master. Change-Id: I25162d9fb1fab12f48521f79084683b4ab004376 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-dev] - building difficulties with C++ extension, addIn
On 01/09/2013 11:28 AM, Stephan Bergmann wrote: Thank you for taking the trouble of making your Calc addin example work. The SDK is indeed an area that could benefit from more maintenance help, lots of the documentation goes stale over time etc. That said, I'm not sure we'll improve the overall situation by adding more examples directly to the SDK. The content of the SDK is backed by module odk in the core LO git repo, so the example code ends up in the core repo, where greps and wholesale code-cleaning activities (like some EasyHacks) stumble upon it, modify it, etc. But due to the awkward way the SDK needs to be set up for use (another area that would benefit from additional help), those examples do not routinely get tested (e.g., are not compiled and run during a build, not even a make check one). Therefore, I wonder whether it would not make more sense to have some place of its own for such additional examples to reside in, like in a wiki or some repository similar to LO's extensions and templates sites. I'll see to get that issue addressed and come back here. So we decided to create a new git repository sdk-examples to host any additional examples for the LO SDK. To check it out, use git clone https://gerrit.libreoffice.org/p/sdk-examples and see the top-level README file. I seeded the new repo with Neeraj's CalcAddinCpp example from this mail thread. Feel free to contribute many more. I also added a link to this new repo to the SDK's top-level index-html, and it should show up at http://api.libreoffice.org/ once we regenerate those HTML pages from more recent odk sources (which we should do for LO 4.0 anyway; see https://gerrit.libreoffice.org/#/c/1808/ and https://gerrit.libreoffice.org/#/c/1809/ for requests to backport that new link to libreoffice-4-0 and -3-6, resp.). Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 40 +-- solenv/inc/minor.mk |6 ++--- 2 files changed, 23 insertions(+), 23 deletions(-) New commits: commit ed865d72bfc09eac6a88bd77499ce9dff86744e9 Author: Petr Mladek pmla...@suse.cz Date: Tue Jan 22 14:49:31 2013 +0100 bump product version to 4.0.1.0+, release number to 0 Change-Id: I6d2553a4f695ebf49154a852fadeb552bb3d2b66 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 632ae20..0d78340 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -4,7 +4,7 @@ Globals { variables { -UREPACKAGEVERSION 4.0.0.1 +UREPACKAGEVERSION 4.0.1.0 URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 3.4 UNIXBASISROOTNAME libreoffice4.0 @@ -48,12 +48,12 @@ LibreOffice { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION .0.1 +PRODUCTEXTENSION .1.0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 -ABOUTBOXPRODUCTVERSION 4.0.0.1 +ABOUTBOXPRODUCTVERSION 4.0.1.0 ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 4.0 PCPFILENAME libreoffice.pcp @@ -63,7 +63,7 @@ LibreOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 -PACKAGEVERSION 4.0.0.1 +PACKAGEVERSION 4.0.1.0 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -98,13 +98,13 @@ LibreOffice_Dev { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION .0.1 +PRODUCTEXTENSION .1.0 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 4.0 USERDIRPRODUCTVERSION 4 -ABOUTBOXPRODUCTVERSION 4.0.0.1 +ABOUTBOXPRODUCTVERSION 4.0.1.0 ABOUTBOXPRODUCTVERSIONSUFFIX + BASEPRODUCTVERSION 4.0 DEVELOPMENTPRODUCT 1 @@ -119,7 +119,7 @@ LibreOffice_Dev FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 -PACKAGEVERSION 4.0.0.1 +PACKAGEVERSION 4.0.1.0 PACKAGEREVISION {buildid} LICENSENAME LGPL GLOBALFILEGID gid_File_Lib_Vcl @@ -157,9 +157,9 @@ URE { PRODUCTNAME URE PRODUCTVERSION 4.0 -PACKAGEVERSION 4.0.0.1 +PACKAGEVERSION 4.0.1.0 PACKAGEREVISION 1 -PRODUCTEXTENSION .0.1 +PRODUCTEXTENSION .1.0 BRANDPACKAGEVERSION 4.0 LICENSENAME LGPL NOVERSIONINDIRNAME 1 @@ -190,11 +190,11 @@ LibreOffice_SDK { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION .0.1 +PRODUCTEXTENSION .1.0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4.0 -PACKAGEVERSION 4.0.0.1 +PACKAGEVERSION 4.0.1.0 PACKAGEREVISION {buildid} PACK_INSTALLED 1 DMG_VOLUMEEXTENSION SDK @@ -229,12 +229,12 @@ LibreOffice_Dev_SDK { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION .0.1 +PRODUCTEXTENSION .1.0 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 4.0 -PACKAGEVERSION 4.0.0.1 +PACKAGEVERSION 4.0.1.0 PACKAGEREVISION {buildid} BASISPACKAGEPREFIX lodevbasis UREPACKAGEPREFIX lodev @@ -274,11 +274,11 @@ LibreOffice_Test { PRODUCTNAME LibreOffice PRODUCTVERSION 4.0 -PRODUCTEXTENSION .0.1 +PRODUCTEXTENSION .1.0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 4.0 -PACKAGEVERSION 4.0.0.1 +PACKAGEVERSION 4.0.1.0 PACKAGEREVISION {buildid} PACK_INSTALLED 1 DMG_VOLUMEEXTENSION TEST @@ -313,12 +313,12 @@ LibreOffice_Dev_Test { PRODUCTNAME LOdev PRODUCTVERSION 4.0 -PRODUCTEXTENSION .0.1 +PRODUCTEXTENSION .1.0 UNIXBASISROOTNAME lodev4.0 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 4.0 -PACKAGEVERSION 4.0.0.1 +
Re: Cppcheck: false positive in pptx-text.cxx ?
Hi Markus, On Sunday, 2013-01-20 19:55:17 +0100, Markus Mohrhard wrote: 1233 TextObj::TextObj( const TextObj rTextObj ) 1234 { 1235 mpImplTextObj = const_castTextObjamp;(rTextObj).mpImplTextObj; 1236 mpImplTextObj-mnRefCount++; 1237 } Someone implemented here manualy ref counting. If you want to remove the warning you can replace the raw pointer + the ref counting variable with a boost::shared_ptr. While boost::shared_ptr is of course cleaner code, for mass objects it may add a runtime performance penalty if they are passed around a lot. For example I wouldn't change formula tokens to shared_ptr ... Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. New GnuPG key 0x65632D3A : 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Old GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpU2oLNcUgXO.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/worksheethelper.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit df70e3fee18835303cff17294b1fd21b6dd9146e Author: Noel Power noel.po...@suse.com Date: Tue Jan 22 13:58:35 2013 + blind fix for wae on macos Change-Id: Ib14021a2253fffd4badbf13db1f49a2309e4bb14 diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index bfa7678..b993e34 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -69,6 +69,7 @@ #include scitems.hxx #include svl/stritem.hxx #include editutil.hxx +#include editeng/editobj.hxx namespace oox { namespace xls { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Python extension issue with LO 4 on Windows
On 01/22/2013 02:05 PM, Olivier R. wrote: On Windows, LO 4 is unable to install this extension (written in Python): http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.9/lo-oo-ressources-linguistiques-fr-v4.9.oxt Here is the error I get: (com.sun.star.uno.RuntimeException) { { Message = class 'UnicodeDecodeError': 'charmap' codec can't decode byte 0x9d in position 3782: character maps to undefined, traceback follows\X000a C:\\Program Files (x86)\\LOdev 4.0\\program\\python-core-3.3.0\\lib\\encodings\\cp1252.py:23 in function decode() [return codecs.charmap_decode(input,self.errors,decoding_table)[0]]\X000a C:\\Program Files (x86)\\LOdev 4.0\\program\\pythonloader.py:94 in function getModuleFromUrl() [src = fileHandle.read().replace(\\\r\,\\)]\X000a C:\\Program Files (x86)\\LOdev 4.0\\program\\pythonloader.py:146 in function writeRegistryInfo() [mod = self.getModuleFromUrl( locationUrl )]\X000a\X000a, Context = (com.sun.star.uno.XInterface) @0 } } But it works properly on Linux. The code is useful to switch between the 4 different French dictionaries. Any idea? Should I create a bug report? The file DictionarySwitcher.py included in http://extensions.libreoffice.org/extension-center/dictionnaires-francais/releases/4.9/lo-oo-ressources-linguistiques-fr-v4.9.oxt is apparently UTF-8 encoded and includes code unit sequences like E2 80 9D (representing U+201D RIGHT DOUBLE QUOTATION MARK) at offset 3780. The code at LO's pythonloader.py:94 src = fileHandle.read().replace(\r,) is obviously environment sensitive, in that it tries to treat the file as CP-1252 encoded (which fails: E2 and 80 happen to represent valid CP-1252 characters, but 9D does not) in your Windows environment, but likely treats it as UTF-8 (which succeeds) in your Linux environment. This environment-sensitive behavior of Python presumably changed for Python 3, so that this issue only starts to show with LO 4. So, for one, someone better versed in Python than me could fix that code in pythonloader.py to not be environment sensitive. (And you can file a LO bug about that.) And, for another, for maximum portability, it might be possible to change the content of that DictionarySwitcher.py to stick to plain ASCII source. (And you can contact the authors of that extension about that.) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: svl/source
svl/source/items/style.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 4ad425818402e96e526010ae00ee9a26d21c9ec3 Author: David Tardon dtar...@redhat.com Date: Tue Jan 22 15:24:29 2013 +0100 silence MacOS X tinderbox Change-Id: I53e2c5789c9d96187b13bb0d52da9d70f24b39b6 diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 812567c..9116640 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -872,7 +872,8 @@ SfxStyleSheet::SfxStyleSheet(const XubString rName, SfxStyleSheet::SfxStyleSheet(const SfxStyleSheet rStyle) : SfxStyleSheetBase(rStyle), SfxListener( rStyle ), -SfxBroadcaster( rStyle ) +SfxBroadcaster( rStyle ), +svl::StyleSheetUser() {} SfxStyleSheet::~SfxStyleSheet() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[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/1766 Approvals: Luboš Luňák: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1766 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3174c43d56d1ae359901bb8a13fe0096f2c74808 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 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.2'
Tag 'libreoffice-4.0.0.2' created by Petr Mladek pmla...@suse.cz at 2013-01-22 14:41 -0800 Tag libreoffice-4.0.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQ/qVOAAoJEPQ0oe+v7q6jjl0P/iBML2Ko/ZWFP23WMz8ycZu8 vDPbTgcwBMSV+5mArDrGfe2lc4XpxoUCtHWMW44qmiPdPgSyaT2ZtPJxlKBfjczs hs6kJ5nmR7hiJG/QZk6jJjms+LOrELzKVp/lRTRO9mbwyY7/pIk1ZxaNhOE2QKmo kUlNs2ZKViy5YN8FrBJjNZZGNblhlXdr+gBHUr/AqhkHQhnurRXlcK27PjIIXbSJ VXl548baH6VlL3dWSPAa/ZxikwbHZ0qi0XbOBpx1cgEvqZT4IsYnNWc0TNaE3ugO bKvmh6ebtod6lCxnu3qo7xnNZbP8KlUvcuWJFlEMDuhkyjGH1uh7oKyneqoUtdQc Na3jvtYDMtSPnE/rliFSBh16Lh4Y9R7iJjsdUHtiRCk6PuhvhhXPv1uMDjn/J9+2 MxsTsHlAzDqfB/0LGb5+i2NosSGAIwaCQUYbEN/8fosl6af+gH/yGdjnVCC3r4Dc 1azdb3Lj2fTg2QFuEUr1CVy3YMSLDIWt9urWz2QmHn78VdzJSppj4AlxBZy9rJ0l rMwGnvALPuE/aQbxN/s245DnrrTBoLbas2yKtczebFgrWntm1VeZ4iCXuGQf1D1y tHQkBHyR6U0rmLILTIKqSyg5lQNM8RZ0mHi8+ZwYb/RMIl1PWb0z1YVVeD39FGoq utKnZWkGQboAYLWa6EPC =jj61 -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-8: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.2'
Tag 'libreoffice-4.0.0.2' created by Petr Mladek pmla...@suse.cz at 2013-01-22 14:42 -0800 Tag libreoffice-4.0.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQ/qZxAAoJEPQ0oe+v7q6j+sEP/2/AdCVKWElRkZRQLGDJ9Pzr ab6egMXczY2dAjjDt7BJL9WoHfg1eMrTe65CXoMoV95Cd7M3i5r2onjIRzNDF+/L zmnoIrwVSHlwUG+FHsXgbTuQJpZ96kxcjJ8098Jq1cPIKb+pP69tbzBxpkmmWzT8 uBQmYCrnpSWWPqqomhuyGfwg3MDVLTx8Fe6kkC93aiO/CDlrDrn+dLmEZfP1PLMg r40/v+0eTDDhJc+BIkemsKKM9gd7BV7sP2Lmllj2eZfnGkn5euRtkz2OWUM/FEqt FLS3Q00FSeeA/lELT1jZwhiY+d6u9PgbVDgYgqWeKnUeg4KUNq1gqvG/133aCTI7 0x6HLhyE3DcLC3YGHyCBO/vMnCkCYVQ9JPxBnujUflrSas/81JUeBFW+DNXrZdAu h+7lwCf7hyOehoGLzhRXR7B1nmmUhc3ZpRYw8D6skDYPo/OPz3I2v8EJlWK21iH8 CE5JF6DGkXQtTBETwS7/sCl2XNK/4RZ3OUloL/4mBzR2dY2r8cN36JrOsrhe6e2Y TYsZZdLRzvVVg5BfSY8/8Tk1cNENvpSsEWzvJN70JpqVWO+bzPZSFOMN0YxEyH8r ulZueH/hXP9zzFvKycQ4P2uo4+8m3eqlbQYgp6L/KdxSKXnRTkpZ58Lch9bwNnCO +KnzSzLmQ+BBZQDS11fD =NaZP -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-12: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.2'
Tag 'libreoffice-4.0.0.2' created by Petr Mladek pmla...@suse.cz at 2013-01-22 14:47 -0800 Tag libreoffice-4.0.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQ/qZ/AAoJEPQ0oe+v7q6jjIIP/jNv8ySEA77CAW/whgByvVU1 vNh41i5NuZCILtpHwd2e+1LS+hFa/fF3d/1NQbhSv6v1RGvcH2ZfUusLZEkb5woK 2KaNZn4rrWI+yuCZjEY1zy1nGCdP8lVtk98YXuzzcFQST70ZNC0P6ITjOnxOYNer LsKnga518YMFi5LJGsIuSwVc5wBFN5DmH2JpmaeEei4tIIlyCAg3jpqrNxzhd0Sb kYsAvkgsryOWG/r1FTHLUSd7nTQtK2Yk45YutTlj/4sqgT6GIaFN/YRH0egzugRS gq2B98a1Rq98KAnQTlEXC1uZQbGLPpjijrtclMhuFjORc5cDXW6JLxjhE7QzepYs Di35lSvT9ERfCtVyKBBiHgmw3CkA0hXjuUyeiBzEY9g1j8ny5BNr4gtGTHF4DoK4 uO8/Q+qJ3o7S6yl8EBF9qB+nXXBSv073yQCMIVjLHPqcnMIuCyb/g52oz8Owyr9r rmq2BGPdgXCXBOL775H8Q/peHBPOUTrVevs15/9d0I/oehW2EL4Aogb7WcM7hRYS ZpWcOOuds2gHqy96g/jhf8uDtkwdJetaAvug79c3BBryuZ9QHnj1OVGcOXSNc6Mh EiTT0Knce6FNdr6aD4+7a4h/XNmXu077Qlnuui59rieDFspnKJnCa95cQoWSgMaW lupUP5CjeC6EyfMjCF2Z =b7Fn -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-13: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-4.0.0.2'
Tag 'libreoffice-4.0.0.2' created by Petr Mladek pmla...@suse.cz at 2013-01-22 14:47 -0800 Tag libreoffice-4.0.0.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJQ/qaNAAoJEPQ0oe+v7q6jYkUQAMuDYfnX1yj93zgdbCxYoYt8 6fU0Y6Tvik1wDP4oR2H7jOEvhVSFFCS1pKVdNsudbVKwkwCRrhhR8PJtdgBgCW5M XMb1s93BhVZz8CdC42jmCWr1x+PvJtZdlE1oww4MiD7nACcb5fhEWYzlLk2Vvd0q SWtSqyusqJb/1RxWR+56zzy/4kglV/1xV09RpLNIX/i9vSlKSe52c5mXDicaRkzG SFoYTewiPFJOxJBM3eJEpYZxTkCeTCPCQTJOa3tAPWkX2YQgX/afRNhvQesEC6PJ Eb8aNcP/PbJwmmTPOzfdYWb/ruRJ1nsZhW1NBOfDnv8mzhdh5kHyBYBR7yWuHl+1 LGikFSxrAdNj7ELKybaT/X0lmLgZT1d+Y88EKtDpkjqyv2BPLBt1bfSFz3abNuph akJyhCn5O9OqS1yh8XEQW+05oe9PknRWDdyY0bzZpAhbf6HMvE9sKiDlUcuq2suD JkfVQmp3jMhGpYekBDyNovgfZvp0eHsrIYXWagGK4GFHRXoYYb+BLcrjpSc5r99+ didSWtZO5anruRBmhWQx8LaMGSgEDlwpQ4DqCTN5PlLtavFcGRx3Zk61whb/QkAd mq1UvQ97KNVvkPnn2/hr7eFEeudnKDEwdAuaDerpPUNHDjfmQiB2yJZtp+T1pnXy wkPcKynDk5Ca2dedd+pl =o0da -END PGP SIGNATURE- Changes since libreoffice-4-0-branch-point-598: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[REVIEW: 4-0 3-6] impress doesn't copy custom styles
Hi all, when a slide that uses custom styles is copied to another presentation, the styles are not copied, possibly breaking the slide's layout. Commit 24578b804007d8c3201e5ed32b8485e1725c33c1 fixes that. I would like to get it into 3.6 and 4.0 (AFAICS it has never worked, so it is not a regression). How to test: 1. create a presentation 2. open styles formatting window 3. switch to graphic styles 4. create a new style (change text color or something similar easily visible) 5. insert a text box and write something 6. apply the style to the text 7. copy the slide to clipboard 8. create another presentation 9. paste the slide into it D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] Branch libreoffice-4-0-0 created
Hi all, there have been created the libreoffice-4-0-0 branch. It will be used for fine tuning of the 4.0.0 release. The following rules apply: + preferably just translation or blocker fixes + only cherry-picking from libreoffice-4-0 branch + 2 additional reviews needed; 2nd reviewer pushes + no regular merges back to anything The 'libreoffice-4-0' branch is still active and will be used for the 4.0.1 bugfix release. Please read more at http://wiki.documentfoundation.org/ReleasePlan http://wiki.documentfoundation.org/Development/Branches Now, if you want to switch your clone to the branch, please do: ./g pull -r ./g checkout -b libreoffice-4-0-0 origin/libreoffice-4-0-0 Hopefully it will work for you :-) Most probably, you will also want to do (if you haven't done it yet): git config --global push.default tracking When you do git push with this, git will push only the branch you are on; e.g. libreoffice-4-0-0 when you have switched to it. This will save you some git shouting at you. Happy hacking, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] Use SAL_INFO instead of home-grown msgs_debug
On 01/19/2013 10:42 AM, Libreoffice Gerrit user wrote: commit fcf7f3596054f24bebf767f9cabfc96dfa577480 Author: Tor Lillqvist t...@iki.fi Date: Sat Jan 19 10:44:33 2013 +0200 Use SAL_INFO instead of home-grown msgs_debug If there is a need to optionally get a thread identifier or the function name into logging output (as msgs_debug did), we should figure out a way to do that in some elegant fashion in the sal logging macros instead of using some local solution in just one place in the code. Note that SAL_INFO/WARN do include both a process ID and a thread ID in their output. Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 4 commits - sw/qa sw/source
sw/qa/extras/ooxmlexport/data/textframe-borders.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 20 ++ sw/source/filter/ww8/docxattributeoutput.cxx | 59 ++- 3 files changed, 76 insertions(+), 3 deletions(-) New commits: commit 77479d619b3d22fc521be87a98587f031382b156 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jan 22 16:04:29 2013 +0100 sw: DOCX export of TextFrame border/shadow testcase Change-Id: I26be6fbd5f0cd95218cdd7235e1fc10eeafb6704 diff --git a/sw/qa/extras/ooxmlexport/data/textframe-borders.docx b/sw/qa/extras/ooxmlexport/data/textframe-borders.docx new file mode 100755 index 000..424ed2a Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/textframe-borders.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index c1fd412..4ff3f98 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -35,6 +35,7 @@ #include com/sun/star/style/ParagraphAdjust.hpp #include com/sun/star/view/XSelectionSupplier.hpp #include com/sun/star/table/BorderLine2.hpp +#include com/sun/star/table/ShadowFormat.hpp #include com/sun/star/text/XPageCursor.hpp #include unotools/tempfile.hxx @@ -69,6 +70,7 @@ public: void testN789482(); void test1Table1Page(); void testTextFrames(); +void testTextFrameBorders(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) !defined(WNT) @@ -109,6 +111,7 @@ void Test::run() {n789482.docx, Test::testN789482}, // {1-table-1-page.docx, Test::test1Table1Page}, // doesn't work on openSUSE12.2 at least {textframes.odt, Test::testTextFrames}, +{textframe-borders.docx, Test::testTextFrameBorders} }; // Don't test the first import of these, for some reason those tests fail const char* aBlacklist[] = { @@ -519,6 +522,23 @@ void Test::testTextFrames() CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xIndexAccess-getCount()); } +void Test::testTextFrameBorders() +{ +uno::Referencetext::XTextFramesSupplier xTextFramesSupplier(mxComponent, uno::UNO_QUERY); +uno::Referencecontainer::XIndexAccess xIndexAccess(xTextFramesSupplier-getTextFrames(), uno::UNO_QUERY); +uno::Referencebeans::XPropertySet xFrame(xIndexAccess-getByIndex(0), uno::UNO_QUERY); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xD99594), getPropertysal_Int32(xFrame, BackColor)); + +table::BorderLine2 aBorder = getPropertytable::BorderLine2(xFrame, TopBorder); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0xC0504D), aBorder.Color); +CPPUNIT_ASSERT_EQUAL(sal_uInt32(35), aBorder.LineWidth); + +table::ShadowFormat aShadowFormat = getPropertytable::ShadowFormat(xFrame, ShadowFormat); +CPPUNIT_ASSERT_EQUAL(table::ShadowLocation_BOTTOM_RIGHT, aShadowFormat.Location); +CPPUNIT_ASSERT_EQUAL(sal_Int16(48), aShadowFormat.ShadowWidth); +CPPUNIT_ASSERT_EQUAL(sal_Int32(0x622423), aShadowFormat.Color); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); commit d0fcf8340d5319524dd0f9d8fb24666229d5fd92 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jan 22 13:20:57 2013 +0100 sw: DOCX export of TextFrame shadow Change-Id: Ia095a3adee271cf7235fb7c13824d7f265658897 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 9cb2c33..0e82f7f 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -188,6 +188,7 @@ class FieldMarkParamsHelper return bResult; } }; +static OString impl_ConvertColor( const Color rColor ); void DocxAttributeOutput::RTLAndCJKState( bool bIsRTL, sal_uInt16 /*nScript*/ ) { if (bIsRTL) @@ -251,6 +252,35 @@ void DocxAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pText m_bParagraphOpened = true; } +void lcl_TextFrameShadow(FSHelperPtr pSerializer, const SwFrmFmt rFrmFmt) +{ +SvxShadowItem aShadowItem = rFrmFmt.GetShadow(); +if (aShadowItem.GetLocation() == SVX_SHADOW_NONE) +return; + +OString aShadowWidth( OString::valueOf( double( aShadowItem.GetWidth() ) / 20) + pt); +OString aOffset; +switch (aShadowItem.GetLocation()) +{ +case SVX_SHADOW_TOPLEFT: aOffset = - + aShadowWidth + ,- + aShadowWidth; break; +case SVX_SHADOW_TOPRIGHT: aOffset = aShadowWidth + ,- + aShadowWidth; break; +case SVX_SHADOW_BOTTOMLEFT: aOffset = - + aShadowWidth + , + aShadowWidth; break; +case SVX_SHADOW_BOTTOMRIGHT: aOffset = aShadowWidth + , + aShadowWidth; break; +case SVX_SHADOW_NONE: +case SVX_SHADOW_END: +break; +} +if (aOffset.isEmpty()) +return; + +OString aShadowColor = impl_ConvertColor(aShadowItem.GetColor()); +pSerializer-singleElementNS(XML_v, XML_shadow, +XML_on, t, +XML_color, # + aShadowColor, +XML_offset, aOffset, +
Re: [Libreoffice-commits] Use SAL_INFO instead of home-grown msgs_debug
Note that SAL_INFO/WARN do include both a process ID and a thread ID in their output. Ah, indeed, I hadn't realized that the thread id is there already, There was even less reason then for the msgs_debug stuff. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sd/source
sd/source/filter/eppt/pptx-text.cxx | 57 +--- sd/source/filter/eppt/text.hxx | 45 ++-- 2 files changed, 50 insertions(+), 52 deletions(-) New commits: commit ec8ff9ff68622a510319c404f4745a336e65d314 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Jan 22 16:12:03 2013 +0100 replace manual ref count with shared_ptr Change-Id: I11dbebe78f6945afd0b88b53e482dea47ddd192d diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx index 481666b..ff5532c 100644 --- a/sd/source/filter/eppt/pptx-text.cxx +++ b/sd/source/filter/eppt/pptx-text.cxx @@ -1180,10 +1180,21 @@ ParagraphObj ParagraphObj::operator=( const ParagraphObj rParagraphObj ) return *this; } +struct ImplTextObj +{ +sal_uInt32 mnTextSize; +int mnInstance; +std::vectorParagraphObj* maList; +sal_BoolmbHasExtendedBullets; +sal_BoolmbFixedCellHeightUsed; + +ImplTextObj( int nInstance ); +~ImplTextObj(); +}; + ImplTextObj::ImplTextObj( int nInstance ) : maList() { -mnRefCount = 1; mnTextSize = 0; mnInstance = nInstance; mbHasExtendedBullets = sal_False; @@ -1197,10 +1208,9 @@ ImplTextObj::~ImplTextObj() } TextObj::TextObj( ::com::sun::star::uno::Reference ::com::sun::star::text::XSimpleText rXTextRef, -int nInstance, FontCollection rFontCollection, PPTExBulletProvider rProv ) +int nInstance, FontCollection rFontCollection, PPTExBulletProvider rProv ): +mpImplTextObj(new ImplTextObj(nInstance)) { -mpImplTextObj = new ImplTextObj( nInstance ); - ::com::sun::star::uno::Reference ::com::sun::star::container::XEnumerationAccess aXTextParagraphEA( rXTextRef, ::com::sun::star::uno::UNO_QUERY ); @@ -1230,35 +1240,36 @@ TextObj::TextObj( ::com::sun::star::uno::Reference ::com::sun::star::text::XSim ImplCalculateTextPositions(); } -TextObj::TextObj( const TextObj rTextObj ) +void TextObj::ImplCalculateTextPositions() { -mpImplTextObj = const_castTextObj(rTextObj).mpImplTextObj; -mpImplTextObj-mnRefCount++; +mpImplTextObj-mnTextSize = 0; +for ( sal_uInt32 i = 0; i ParagraphCount(); ++i ) +mpImplTextObj-mnTextSize += GetParagraph(i)-ImplCalculateTextPositions( mpImplTextObj-mnTextSize ); } -TextObj::~TextObj() +ParagraphObj* TextObj::GetParagraph(int idx) { -if ( ! ( --mpImplTextObj-mnRefCount ) ) -delete mpImplTextObj; +return mpImplTextObj-maList[idx]; } -void TextObj::ImplCalculateTextPositions() +sal_uInt32 TextObj::ParagraphCount() const { -mpImplTextObj-mnTextSize = 0; -for ( sal_uInt32 i = 0; i ParagraphCount(); ++i ) -mpImplTextObj-mnTextSize += GetParagraph(i)-ImplCalculateTextPositions( mpImplTextObj-mnTextSize ); +return mpImplTextObj-maList.size(); } -TextObj TextObj::operator=( TextObj rTextObj ) +sal_uInt32 TextObj::Count() const { -if ( this != rTextObj ) -{ -if ( ! ( --mpImplTextObj-mnRefCount ) ) -delete mpImplTextObj; -mpImplTextObj = rTextObj.mpImplTextObj; -mpImplTextObj-mnRefCount++; -} -return *this; +return mpImplTextObj-mnTextSize; +} + +int TextObj::GetInstance() const +{ +return mpImplTextObj-mnInstance; +} + +sal_Bool TextObj::HasExtendedBullets() +{ +return mpImplTextObj-mbHasExtendedBullets; } FontCollectionEntry::~FontCollectionEntry() diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index e690238..feb291a 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -27,6 +27,8 @@ #include com/sun/star/awt/FontDescriptor.hpp #include com/sun/star/lang/Locale.hpp +#include boost/shared_ptr.hpp + namespace com { namespace sun { namespace star { namespace awt { struct FontDescriptor; } namespace beans { class XPropertyState; } @@ -219,38 +221,23 @@ class ParagraphObj : public std::vectorPortionObj*, public PropStateValue, pub ParagraphObj operator=( const ParagraphObj rParagraphObj ); }; -struct ImplTextObj -{ -sal_uInt32 mnRefCount; -sal_uInt32 mnTextSize; -int mnInstance; -std::vectorParagraphObj* maList; -sal_BoolmbHasExtendedBullets; -sal_BoolmbFixedCellHeightUsed; - -ImplTextObj( int nInstance ); -~ImplTextObj(); -}; +struct ImplTextObj; class TextObj { -ImplTextObj*mpImplTextObj; -voidImplCalculateTextPositions(); - -public : -TextObj( ::com::sun::star::uno::Reference ::com::sun::star::text::XSimpleText -rXText, int nInstance, FontCollection rFontCollection, PPTExBulletProvider rBuProv ); -TextObj( const TextObj rTextObj ); -~TextObj(); - -ParagraphObj* GetParagraph(int idx)
Re: Cppcheck: false positive in pptx-text.cxx ?
I'll do this one. You can see then how it works. You should maybe read http://www.boost.org/doc/libs/1_52_0/libs/smart_ptr/shared_ptr.htm or some other resource about shared_ptr. See http://cgit.freedesktop.org/libreoffice/core/commit/?id=ec8ff9ff68622a510319c404f4745a336e65d314 for an example. Please note that I did some additional clean-up. The important parts are that in this case operator= and the copy c'tor are no longer needed. The remaining parts are mainly stylistic and moving the Impl class from the header file into the source file. If you try to change additional places please inspect them very carefully. As I and Eike already mentioned, shared_ptr comes with a performance penalty that may or may not be a problem. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: -Wsign-promo (Re: [BUILD FAILS DEBUG MODE] with test_strings_valuex.cxx)
On Sat, 2013-01-19 at 11:28 +0100, Lubos Lunak wrote: it incidentally triggers when passing bool to SvStream, because it doesn't have any overload for operator(bool), and int is chosen over unsigned char AKA sal_Bool , so Caolan added it in e8bbb76827dd7a0e30d7d1db34a812a84d85f390 - if SvStream gets overload for bool, the warning can be dumped Or am I missing something there? Yeah, IIRC I just wanted to see if there were more cases of bools being streamed out. Should have tweaked the stream class instead. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] Minutes - QA Call 01/11/2013
On 01/21/2013 10:13 PM, Rainer Bielefeld wrote: Joel Madero schrieb: -Status clarification (New vs. Reopened) **Agreed: *Reopened should only be used if the bug is assigned *Because of this agreement, modifications have to be made to our current workflow -*Agreed: *NEEDINFO: Used only if most the information Hi all, just stumbled upon these minutes. Most of these decisions are changes of proceeding negotiated in the past, and so the Wiki should be amended to these changes. With some results I agree, may some fine tuning still is possible. So I agree that it's appropriate to mark a report INVALID if nearby no useful info is included (as stated in the minutes). For a NEEDINFO I do not believe that Most necessary info has to be included. For me a promising start seems enough reason to keep a bug open with NEEDINFO. May be we can find and write down some indications for promising, but most is a matter or instinct to decide whether there is hope Concerning the rest, to be honest, with current knowledge I don't understand most of that what I read because I nowhere see a because What were the problems that should be solved with the decisions? I am afraid that the new definitions will no longer allow reliable queries. An example: In this http://www.bugzilla.org/docs/3.6/en/html/lifecycle.html graph, what was base of former decisions, NEW meant all necessary has been gained, QA work is done, developers can start their work. So no need for me to have a look. I think that was a useful usage of Status NEW. Due to agreed items now NEW should be selected immediately if someone who is more or less reliable has reported or confirmed a real bug. I saw Joel changing Status of several bugs I reported from UNCONFIRMED to NEW without any additional contribution of information. Thank you for trusting my reports, but I have good reasons NOT to use NEW at once: I think that additional information should be added, may be I want to do further research, may be I would like to see whether the problem is limited to my OS The result of the new proceeding is that nobody can know whether more info is necessary or at least might be useful (Other OS? Particular conditions / settings / Desktop integration / ...? Where did that problem start? Are there relations to other bugs what should be checked?). There are good reasons to follow the 2 man rule http://en.wikipedia.org/wiki/Two-man_rule, it's not only a matter of confirmation, the reviewer should add information from his point of view. I'm sorry, to me that looks a little helter skelter. A more promising way to develop the proceedings would be to list existing problems and suggestions for solutions on the wiki discussion pages like https://wiki.documentfoundation.org/Talk:QA/BugTriage and then to improve the proceeding rules step by step with parallel discussion on qa-list. CU Rainer There are quite a few issues with these new rules, mostly due to limitations with FDO but also because of situations we hadn't considered. All of this will be discussed on Friday and we'll hopefully have a final procedure down. One of the main issues is that FDO doesn't allow you to go from RESOLVED - WORKSFORME back to UNCONFIRMED. This is quite a large problem as our QA team is using WFM quite a bit more these days as we work through UNCONFIRMED bugs but then a user says no no no it's still a problem! and then opens it back up as REOPENED, this is incorrect as REOPENED should only be used when a developer is assigned and has said a patch fixed something and then a user says no that patch didn't fix my problem. Any bug that is unassigned but set to REOPENED is incorrectly marked -- and we're discussing how to handle these. This being said, there may be two options: 1) Ask Tollef to enable us to use UNVERIFIED after a bug is set to REOPENED 2) Ask use to change to NEEDINFO and then to UNVERIFIED - hassle 3) Something else that I haven't thought about The current procedure is definitely in need of further update. Thanks for the feedback. Best Regards, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Weird localization
On Sat, 2013-01-19 at 20:23 -0500, James Cloos wrote: I'm not sure whether this is an upstream bug or Gentoo-specific, so it seemed best to talk about it here before I open a bugz report on it. I have lo 4.0.0.1 on an amd64 Gentoo box. The UI is, as it should be, in English except that one toolbar in draw, which identifies itself as Gdmath Addon if I move the bar to its own X window (via d-n-d) has tooltips auf Deutsch and the tools pop up dialogs where are all en Français. I don't think I've seen a bug quite like this one before -- it can't even decide *which* fremdsprach to use. :-/ Now that I see that this is an addon, is there a more-specific place to post a bug report? The toolbar was default on so I had presumed it to be (a new) part of the main release. As far as I know gdmath is not part of the usual build, nor does it appear to be an optional-to-bundle part of the normal build tree. So it either is an additional gentoo dependency or was installed as an add-on in some other way. Probably need to identify where it came from. unopkg list unopkg list --bundled unopkg list --shared might help with that. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Help required
Hello , I am trying to solve the bug : https://bugs.freedesktop.org/show_bug.cgi?id=55846 and I have already gone through the files : http://opengrok.libreoffice.org/search?q=project=coredefs=FontSizeBox , http://opengrok.libreoffice.org/xref/core/svx/source/tbxctrls/tbunocontroller.cxx and other files related to the toolbox as well : http://opengrok.libreoffice.org/xref/core/vcl/source/window/toolbox.cxx , http://opengrok.libreoffice.org/xref/core/vcl/source/window/toolbox2.cxx . I am adopting the following approach : 1) If the toolbar is docked vertically , i.e. if(!bHorz) or the values are such : meAlign = WINDOWALIGN_LEFT || meAlign = WINDOWALIGN_RIGHT , then the FontSizeBox's representation as a MetricBox is converted to an image , can you please tell me how do I get the ItemId of the image . 2) After getting the ItemId of the image in the vertical Toolbar , I want to attach a handler to the image which creates a drop-down box as it does for the FontSizeBox : http://opengrok.libreoffice.org/xref/core/svx/source/tbxctrls/tbunocontroller.cxx . I would like to ask about how and where do I attach the drop-down handler to the fontsizebox image in the vertical toolbar ? Any sort of help is appreciated :-) Regards , Rushi ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/filter/ww8/docxattributeoutput.cxx | 17 - sw/source/filter/ww8/docxattributeoutput.hxx |2 +- 2 files changed, 13 insertions(+), 6 deletions(-) New commits: commit f88c296212ac39055d2179ecf6e19f9f3848a032 Author: Pierre-Eric Pelloux-Prayer pierre-e...@lanedo.com Date: Tue Jan 22 17:20:02 2013 +0100 docx export: fix table 'tblInd' attribute computation Change-Id: I3980ad8e372290973ed89488eb540267136af491 diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 0e82f7f..89a72bb 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1833,6 +1833,16 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t else pJcVal = start; nIndent = sal_Int32( pTblFmt-GetLRSpace( ).GetLeft( ) ); +// Table indentation has different meaning in Word, depending if the table is nested or not. +// If nested, tblInd is added to parent table's left spacing and defines left edge position +// If not nested, text position of left-most cell must be at absolute X = tblInd +// so, table_spacing + table_spacing_to_content = tblInd +if (m_nTableDepth == 0) +{ +const SwTableBox * pTabBox = pTableTextNodeInfoInner-getTableBox(); +const SwFrmFmt * pFrmFmt = pTabBox-GetFrmFmt(); +nIndent += sal_Int32( pFrmFmt-GetBox( ).GetDistance( BOX_LINE_LEFT ) ); +} break; } } @@ -1844,7 +1854,7 @@ void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t TableDefaultBorders( pTableTextNodeInfoInner ); // Output the default cell margins -TableDefaultCellMargins( pTableTextNodeInfoInner, nIndent ); +TableDefaultCellMargins( pTableTextNodeInfoInner ); TableBidi( pTableTextNodeInfoInner ); @@ -1886,7 +1896,7 @@ void DocxAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Point impl_pageBorders( m_pSerializer, pFrmFmt-GetBox( ), XML_tblBorders, !bEcma, true ); } -void DocxAttributeOutput::TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_Int32 tblIndent ) +void DocxAttributeOutput::TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { const SwTableBox * pTabBox = pTableTextNodeInfoInner-getTableBox(); const SwFrmFmt * pFrmFmt = pTabBox-GetFrmFmt(); @@ -1894,9 +1904,6 @@ void DocxAttributeOutput::TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::P const bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT; impl_cellMargins(m_pSerializer, rBox, XML_tblCellMar, !bEcma); - -// add table cell left margin to tblIndent -tblIndent += sal_Int32( rBox.GetDistance( BOX_LINE_LEFT ) ); } void DocxAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 26b43ac..91539b5 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -148,7 +148,7 @@ public: virtual void TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); -virtual void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner, sal_Int32 tblIndent ); +virtual void TableDefaultCellMargins( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableHeight( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); virtual void TableCanSplit( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: librelogo/source
librelogo/source/LibreLogo/LibreLogo.py | 35 ++-- 1 file changed, 25 insertions(+), 10 deletions(-) New commits: commit e9b0e18b4f5b14e29d9ddf3bef0c8030fba1cdb4 Author: László Németh nem...@numbertext.org Date: Tue Jan 22 16:56:13 2013 +0100 librelogo: start selected text; am, eo transl. sup. diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py index df5bdc0..556837d 100644 --- a/librelogo/source/LibreLogo/LibreLogo.py +++ b/librelogo/source/LibreLogo/LibreLogo.py @@ -25,7 +25,7 @@ else: __lngpath__ = unohelper.fileUrlToSystemPath(re.sub(program/(fundamental.ini|fundamentalrc)$, , urebootstrap)) __lngpath__ = __lngpath__ + share/Scripts/python/LibreLogo/.replace(/, os.sep) -__translang__ = ca|cs|de|dk|el|en|es|et|fr|hu|it|nl|no|pl|pt|ro|ru|se|sl # FIXME supported languages for language guessing, expand this list, according to the localizations +__translang__ = am|ca|cs|de|dk|el|en|eo|es|et|fr|hu|it|ja|nl|no|pl|pt|ro|ru|se|sl # FIXME supported languages for language guessing, expand this list, according to the localizations __lng__ = {} __docs__ = {} __prevcode__ = None @@ -568,16 +568,29 @@ def run(arg=None, arg2 = -1): with __lock__: __thread__ = 1 try: -__initialize__() -__setlang__() +__getdocument__() if arg2 == -1: -arg2 = _.doc.getText().getString() +try: +_.cursor = _.doc.getCurrentController().getViewCursor().getText().createTextCursor() # copy selection + _.cursor.gotoRange(_.doc.getCurrentController().getViewCursor(), False) +1/len(_.cursor.getString()) # exception, if zero length +except: +_.cursor = _.doc.getText().createTextCursorByRange(_.doc.getText().getStart()) +_.cursor.gotoEnd(True) +c = _.doc.Text.createTextCursor() # go to the first page +c.gotoStart(False) +_.doc.CurrentController.getViewCursor().gotoRange(c, False) +__initialize__() +__setlang__() +arg2 = _.cursor.getString() if len(arg2) 2: if MessageBox(_.doc.CurrentController.Frame.ContainerWindow, __l12n__(_.lng)['ERR_NOTAPROGRAM'], __l12n__(_.lng)['LIBRELOGO'], querybox, __YES_NO_CANCEL__) != 2: with __lock__: __thread__ = None return None -__gotoline__(1) +else: +__initialize__() +__setlang__() if __prevcode__ and __prevcode__ == arg2 and __prevlang__ == _.lng: __thread__ = LogoProgram(__prevcompiledcode__) else: @@ -1430,12 +1443,14 @@ def __compil__(s): return to_ascii(globs) + \n + result def __gotoline__(n): -__dispatcher__(.uno:Escape) -c = _.doc.Text.createTextCursor() -c.gotoStart(False) +_.cursor.collapseToStart() for i in range(1, n): -c.gotoNextParagraph(False) -_.doc.CurrentController.getViewCursor().gotoRange(c, False) +_.cursor.gotoNextParagraph(False) +try: +_.doc.CurrentController.getViewCursor().gotoRange(_.cursor, False) +except: +__dispatcher__(.uno:Escape) +_.doc.CurrentController.getViewCursor().gotoRange(_.cursor.getStart(), False) g_exportedScripts = left, right, goforward, gobackward, run, stop, home, clearscreen, commandline, __translate__ g_ImplementationHelper = unohelper.ImplementationHelper() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2e013ec4e97c7071e3299eeb285c14727d1b8daa Author: Andras Timar ati...@suse.com Date: Tue Jan 22 17:31:04 2013 +0100 Updated core Project: dictionaries c41681db324e6693e7730ac0f2c5de843d7c78cb diff --git a/dictionaries b/dictionaries index 7d469f3..c41681d 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 7d469f332804f6ed3efcdfd5f7217703aded1e35 +Subproject commit c41681db324e6693e7730ac0f2c5de843d7c78cb ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/app/keysymnames.cxx | 37 1 file changed, 37 insertions(+) New commits: commit 67eaa6c9f1cb599c158df008ccb75afb60bb8bef Author: Aurimas FiÅ¡eras auri...@members.fsf.org Date: Sat Jan 19 22:08:10 2013 +0200 Add Lithuanian translations of keyboard shortcuts (related to fdo#50415) Change-Id: Ie5df8819c59135625f504f7d5b6736ddab7aab53 Reviewed-on: https://gerrit.libreoffice.org/1774 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx index 7fd127b..b733c73 100644 --- a/vcl/unx/generic/app/keysymnames.cxx +++ b/vcl/unx/generic/app/keysymnames.cxx @@ -406,6 +406,42 @@ namespace vcl_sal { { SunXK_Cut, Retalla }, }; +static const struct KeysymNameReplacement aImplReplacements_Lithuanian[] = +{ +{ XK_Control_L, Vald }, +{ XK_Control_R, Vald }, +{ XK_Shift_L, Lyg2 }, +{ XK_Shift_R, Lyg2 }, +{ XK_Alt_L, Alt }, +{ XK_Alt_R, Lyg3 }, +{ XK_Page_Up, Pslâ }, +{ XK_Page_Down, Pslâ }, +{ XK_End, Pab }, +{ XK_Home, Prad }, +{ XK_Insert, Ä®terpti }, +{ XK_Delete, Å al }, +{ XK_Escape, Gr }, +{ XK_Right, DeÅ¡inÄn }, +{ XK_Left, KairÄn }, +{ XK_Up, AukÅ¡tyn }, +{ XK_Down, Žemyn }, +{ XK_BackSpace, Naikinti }, +{ XK_Return, Ä®vesti }, +{ XK_asterisk, ŽvaigždutÄ }, +{ XK_slash, DeÅ¡ininis brÅ«kÅ¡nys }, +{ XK_space, Tarpas }, +{ SunXK_Stop, Stabdyti }, +{ SunXK_Again, Kartoti }, +{ SunXK_Props, SavybÄs }, +{ SunXK_Undo, AtÅ¡aukti }, +{ SunXK_Front, Priekinis planas }, +{ SunXK_Copy, Kopijuoti }, +{ SunXK_Open, Atverti }, +{ SunXK_Paste, Ä®dÄti }, +{ SunXK_Find, IeÅ¡koti }, +{ SunXK_Cut, IÅ¡kirpti }, +}; + static const struct KeyboardReplacements aKeyboards[] = { { ca, aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) }, @@ -415,6 +451,7 @@ namespace vcl_sal { { et, aImplReplacements_Estonian, SAL_N_ELEMENTS(aImplReplacements_Estonian) }, { fr, aImplReplacements_French, SAL_N_ELEMENTS(aImplReplacements_French) }, { it, aImplReplacements_Italian, SAL_N_ELEMENTS(aImplReplacements_Italian) }, +{ lt, aImplReplacements_Lithuanian, SAL_N_ELEMENTS(aImplReplacements_Lithuanian) }, { nl, aImplReplacements_Dutch, SAL_N_ELEMENTS(aImplReplacements_Dutch) }, { no, aImplReplacements_Norwegian, SAL_N_ELEMENTS(aImplReplacements_Norwegian) }, { pt, aImplReplacements_Portuguese, SAL_N_ELEMENTS(aImplReplacements_Portuguese) }, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Add Lithuanian translations of keyboard shortcuts (related t...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1774 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1774 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5df8819c59135625f504f7d5b6736ddab7aab53 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aurimas Fišeras auri...@members.fsf.org Gerrit-Reviewer: Aurimas Fišeras auri...@members.fsf.org Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/win
vcl/win/source/window/keynames.cxx | 22 ++ 1 file changed, 22 insertions(+) New commits: commit c9b89297b34051e115d9c5587ae5b80641c1c6b4 Author: Aurimas FiÅ¡eras auri...@members.fsf.org Date: Sat Jan 19 22:08:52 2013 +0200 Add Lithuanian translations of keyboard shortcuts (related to fdo#54165) Change-Id: I0e9460adeebb2e2a46ca3cd0e683cd4f0026916b Reviewed-on: https://gerrit.libreoffice.org/1775 Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/vcl/win/source/window/keynames.cxx b/vcl/win/source/window/keynames.cxx index eb73b5f..0d53261 100755 --- a/vcl/win/source/window/keynames.cxx +++ b/vcl/win/source/window/keynames.cxx @@ -112,6 +112,27 @@ namespace vcl_sal { { KEY_SPACEBAR, Tühik }, }; +static const struct KeysNameReplacement aImplReplacements_Lithuanian[] = +{ +{ KEY_ESC, Gr }, +{ KEY_BACK, Naikinti }, +{ KEY_ENTER, Ä®vesti }, +{ KEY_SPACEBAR, Tarpas }, +{ KEY_HOME, Prad }, +{ KEY_UP, AukÅ¡tyn }, +{ KEY_PAGEUP, Pslâ }, +{ KEY_LEFT, KairÄn }, +{ KEY_RIGHT, DeÅ¡inÄn }, +{ KEY_END, Pab }, +{ KEY_DOWN, Žemyn }, +{ KEY_PAGEDOWN, Pslâ }, +{ KEY_INSERT, Ä®terpti }, +{ KEY_DELETE, Å al }, +{ KEY_CONTROL, Vald }, +{ KEY_SHIFT, Lyg2 }, +{ KEY_ALT, Alt }, +}; + static const struct KeysNameReplacement aImplReplacements_Slovenian[] = { { KEY_ESC, Ubežnica }, @@ -156,6 +177,7 @@ namespace vcl_sal { { ast,aImplReplacements_Asturian, SAL_N_ELEMENTS(aImplReplacements_Asturian) }, { ca, aImplReplacements_Catalan, SAL_N_ELEMENTS(aImplReplacements_Catalan) }, { et, aImplReplacements_Estonian, SAL_N_ELEMENTS(aImplReplacements_Estonian) }, +{ lt, aImplReplacements_Lithuanian, SAL_N_ELEMENTS(aImplReplacements_Lithuanian) }, { sl, aImplReplacements_Slovenian, SAL_N_ELEMENTS(aImplReplacements_Slovenian) }, { es, aImplReplacements_Spanish, SAL_N_ELEMENTS(aImplReplacements_Spanish) }, }; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Add Lithuanian translations of keyboard shortcuts (related t...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1775 Approvals: Petr Mladek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1775 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e9460adeebb2e2a46ca3cd0e683cd4f0026916b Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Aurimas Fišeras auri...@members.fsf.org Gerrit-Reviewer: Aurimas Fišeras auri...@members.fsf.org Gerrit-Reviewer: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
allow a system python = 2.6 with --enable-python=system
Caolán McNamara has abandoned this change. Change subject: allow a system python = 2.6 with --enable-python=system .. Patch Set 2: Abandoned lets drop it, I just wanted to make sure that the mailmerge stuff worked with 2.6 as well as 3.X. -- To view, visit https://gerrit.libreoffice.org/1714 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I861b1740e0cd5057570da91cbc0aca88333155b3 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Caolán McNamara caol...@redhat.com Gerrit-Reviewer: Lionel Elie Mamane lio...@mamane.lu Gerrit-Reviewer: Michael Stahl mst...@redhat.com Gerrit-Reviewer: Rene Engelhard r...@debian.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: scp2/source setup_native/source
scp2/source/ooo/common_brand.scp|5 + scp2/source/ooo/file_ooo.scp|9 + scp2/source/ooo/module_ooo.scp | 11 +++ scp2/source/ooo/module_ooo.ulf |6 ++ setup_native/source/packinfo/packinfo_office.txt| 15 +++ setup_native/source/packinfo/spellchecker_selection.txt |1 + 6 files changed, 47 insertions(+) New commits: commit efddbb9409554d713616b32e8fafa5b4b913ed54 Author: Andras Timar ati...@suse.com Date: Tue Jan 22 17:48:32 2013 +0100 fdo#59713 add Bosnian Hunspell dictionary Change-Id: I84a561fe081040a56acd394b789e2ce1cb488457 diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index b84ed29..33e745b 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -208,6 +208,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Br DosName = dict-br; End +Directory gid_Brand_Dir_Share_Extensions_Dict_Bs +ParentID = gid_Brand_Dir_Share_Extensions; +DosName = dict-bs; +End + Directory gid_Brand_Dir_Share_Extensions_Dict_Ca ParentID = gid_Brand_Dir_Share_Extensions; DosName = dict-ca; diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a6a066b..6b672d0 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -1345,6 +1345,15 @@ End #endif #if defined WITH_MYSPELL_DICTS +File gid_File_Extension_Dictionary_Bs + Dir = gid_Brand_Dir_Share_Extensions_Dict_Bs; + Name = dict-bs.oxt; + Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE); + UnixRights = 444; +End +#endif + +#if defined WITH_MYSPELL_DICTS File gid_File_Extension_Dictionary_Ca Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca; Name = dict-ca.oxt; diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 2ae3e41..dfa8391 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -132,6 +132,17 @@ Module gid_Module_Root_Extension_Dictionary_Br Styles = (); End +Module gid_Module_Root_Extension_Dictionary_Bs +MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BS ); +Files = (gid_File_Extension_Dictionary_Bs); +InstallOrder = 2000; +Sortkey = 517; +Spellcheckerlanguage = bs; +PackageInfo = packinfo_office.txt; +ParentID = gid_Module_Dictionaries; +Styles = (); +End + Module gid_Module_Root_Extension_Dictionary_Ca MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CA ); Files = (gid_File_Extension_Dictionary_Ca); diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf index 6809206..7463ab6 100644 --- a/scp2/source/ooo/module_ooo.ulf +++ b/scp2/source/ooo/module_ooo.ulf @@ -91,6 +91,12 @@ en-US = Breton [STR_DESC_MODULE_EXTENSION_DICTIONARY_BR] en-US = Breton spelling dictionary +[STR_NAME_MODULE_EXTENSION_DICTIONARY_BS] +en-US = Bosnian + +[STR_DESC_MODULE_EXTENSION_DICTIONARY_BS] +en-US = Bosnian spelling dictionary + [STR_NAME_MODULE_EXTENSION_DICTIONARY_CA] en-US = Catalan diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 5ace658..3e8c89e 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -599,6 +599,21 @@ packageversion = %PACKAGEVERSION End Start +module = gid_Module_Root_Extension_Dictionary_Bs +solarispackagename = %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-bs +solarisrequires = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION +packagename = %UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-bs +requires = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%PRODUCTVERSION-core01,%BASISPACKAGEPREFIX%PRODUCTVERSION-core02,%BASISPACKAGEPREFIX%PRODUCTVERSION-core03,%BASISPACKAGEPREFIX%PRODUCTVERSION-core04,%BASISPACKAGEPREFIX%PRODUCTVERSION-core05,%BASISPACKAGEPREFIX%PRODUCTVERSION-core06,%BASISPACKAGEPREFIX%PRODUCTVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION +linuxpatchrequires = +copyright = 2013 by Vedran LjuboviÄ +solariscopyright = solariscopyrightfile +vendor = Vedran LjuboviÄ +description = Bs dictionary for %PRODUCTNAME %PRODUCTVERSION +destpath = /opt +packageversion = %PACKAGEVERSION +End + +Start module = gid_Module_Root_Extension_Dictionary_Ca solarispackagename = %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ca solarisrequires =
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/data/org/openoffice/Office/Addons.xcu |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2db08bf5b2e860ef884134acf7afdcc87ba6a7ec Author: László Németh nem...@numbertext.org Date: Tue Jan 22 17:54:12 2013 +0100 librelogo toolbar: better tooltips diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu index 8c08f53..2e8144b 100644 --- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu @@ -77,7 +77,7 @@ valuevnd.sun.star.script:LibreLogo|LibreLogo.py$run?language=Pythonamp;location=share/value /prop prop oor:name=Title oor:type=xs:string -value xml:lang=en-USStart (the program in the Writer document)/value +value xml:lang=en-USStart Logo program (text or selected text of the document)/value /prop prop oor:name=Target oor:type=xs:string value_self/value @@ -130,7 +130,7 @@ valuevnd.sun.star.script:LibreLogo|LibreLogo.py$commandline?language=Pythonamp;location=share/value /prop prop oor:name=Title oor:type=xs:string -value xml:lang=en-USLogo command line (press F1 here for help)/value +value xml:lang=en-USLogo command line (press Enter for command execution or F1 for help)/value /prop prop oor:name=Target oor:type=xs:string value_self/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 9 commits - svx/source svx/uiconfig svx/UI_svx.mk
svx/UI_svx.mk |1 svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src | 81 --- svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx | 45 - svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc | 34 - svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx | 18 svx/source/unodialogs/textconversiondlgs/resids.hrc|1 svx/uiconfig/ui/chineseconversiondialog.ui | 251 ++ 7 files changed, 276 insertions(+), 155 deletions(-) New commits: commit 805433ed483b62dbb1bef3301e26bd28ca544c35 Author: Caolán McNamara caol...@redhat.com Date: Tue Jan 22 14:19:34 2013 + Tutorial step #8 clean unused .src|.hrc remainders 1. Remove the DLG_CHINESETRANSLATION dialog from the .src 1.1. Remove the .src from AllLangResTarget_module.mk if that that .src is now empty. 1.2. Remove from any .hrc files any defines which are now unused due to removing that .src hunk 1.3. Remove any .hrc files which are now empty and remove any #includes of those Change-Id: I872f97e4d3ec7404f4d8978c32e397bb20e96783 diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src index 288208f..1ca4753 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src @@ -17,7 +17,6 @@ */ #include chinese_dictionarydialog.hrc -#include chinese_translationdialog.hrc #include svtools/controldims.hrc @@ -193,83 +192,3 @@ ModalDialog DLG_CHINESEDICTIONARY BUTTONS_OK_CANCEL_HELP_ABREAST( FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, ROW_8 ) }; - -//- -//defines for positions and sizes: - -#define T_FULL_WIDTH (220) -#define T_FULL_HEIGHT (120) -#define T_EDITBUTTON_WIDTH (75) - -#define T_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) -#define T_COL_2 (T_COL_1+RSC_SP_FLGR_SPACE_X) -#define T_COL_3 (T_COL_2+RSC_SP_CHK_TEXTINDENT) -#define T_COL_4 (T_FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-T_EDITBUTTON_WIDTH) - -#define T_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) -#define T_ROW_2 (T_ROW_1+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define T_ROW_3 (T_ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) -#define T_ROW_4 (T_ROW_3+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) -#define T_ROW_5 (T_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y) -#define T_ROW_6 (T_ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y) - -#define T_ROW_8 (T_FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT) -#define T_ROW_7 (T_ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2) - -//- - -ModalDialog DLG_CHINESETRANSLATION -{ -HelpID = svx:ModalDialog:DLG_CHINESETRANSLATION; -//HelpId = ; -Size = MAP_APPFONT( T_FULL_WIDTH, T_FULL_HEIGHT ); -OutputSize = TRUE; -Closeable = TRUE ; -Moveable = TRUE ; -SVLook = TRUE; - -Text [ en-US ] = Chinese Conversion; - -FixedLine FL_DIRECTION -{ -Pos = MAP_APPFONT ( T_COL_1 , T_ROW_1 ) ; -Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; -Text [ en-US ] = Conversion direction; -}; - -DIRECTION_RADIOBUTTONS( T_COL_2, T_ROW_2, (T_FULL_WIDTH - T_COL_2 - RSC_SP_DLG_INNERBORDER_RIGHT) ) - -FixedLine FL_COMMONTERMS -{ -Pos = MAP_APPFONT ( T_COL_1 , T_ROW_5 ) ; -Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; -Text [ en-US ] = Common terms; -}; - -CheckBox CB_TRANSLATE_COMMONTERMS -{ -HelpID = svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS; -Pos = MAP_APPFONT( T_COL_2, T_ROW_6 ); -Size = MAP_APPFONT ( T_COL_4 - T_COL_2, RSC_CD_CHECKBOX_HEIGHT ) ; - -Text [ en-US ] = Translate ~common terms; -}; - -PushButton PB_EDITTERMS -{ -HelpID = svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS; -Pos = MAP_APPFONT( T_COL_4, T_ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 ); -Size = MAP_APPFONT( T_EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); - -Text [ en-US ] = ~Edit Terms...; -}; - -FixedLine T_FL_BOTTOMLINE -{ -Pos = MAP_APPFONT ( 0 , T_ROW_7 ) ; -Size = MAP_APPFONT ( T_FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ; -}; - -BUTTONS_OK_CANCEL_HELP_ABREAST( T_FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, T_ROW_8 ) -}; - diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 34c11fa..d38eab3 100644 ---
[Libreoffice-commits] .: bin/lo-pack-sources
bin/lo-pack-sources | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit ffd2cc342f4ba54feeecbd3d31632131b45886ef Author: Petr Mladek pmla...@suse.cz Date: Tue Jan 22 17:35:46 2013 +0100 lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of autoreconf autogen.sh runs the needed tools with the right include paths Change-Id: Ia253b19566eeda31a1190a4fa7c543f7ffb63bfb diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources index 5341af5..de6a4be 100755 --- a/bin/lo-pack-sources +++ b/bin/lo-pack-sources @@ -131,15 +131,15 @@ sub generate_lo_module_changelog($$$) die Error: generating failed: $!\n; } -sub run_autoreconf($$) +sub run_autogen($$) { my ($dir, $module) = @_; -print Running autoreconf for $module...\n; +print Running autogen for $module...\n; system (cd $dir . -autoreconf -f -i . +NOCONFIGURE=1 ./autogen.sh . rm -rf autom4te.cache . -cd - /dev/null 21) die Error: autoreconf failed: $!\n; +cd - /dev/null 21) die Error: autogen failed: $!\n; } sub generate_sources_version_file($$) @@ -266,7 +266,7 @@ sub prepare_module_sources() # prepare sources my $temp_dir = copy_lo_module_to_tempdir($source_dir, $module, $lo_topdir_name); generate_lo_module_changelog($source_dir, $temp_dir/$lo_topdir_name, $module); -run_autoreconf($temp_dir/$lo_topdir_name, $module) if ($module eq 'core'); +run_autogen($temp_dir/$lo_topdir_name, $module) if ($module eq 'core'); generate_sources_version_file($temp_dir/$lo_topdir_name, $release_version) if ($module eq 'core'); return $temp_dir; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[ANNOUNCE] libreoffice-4.0.0.2 tag created
Hi, there have been created the libreoffice-4.0.0.2 tag (aka rc2). The corresponding official builds will be available within next few days. IMPORTANT: The deadline for 4.0.0.3 (rc3) is the following Monday, January 28, 2013. It is supposed to be the last release candidate for 4.0.0 release. See the attached list of changes against 4.0.0.1. See also http://wiki.documentfoundation.org/ReleaseNotes/4.0 Now, you might switch your current 4-0 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-4.0.0.2 libreoffice-4.0.0.2 Linux distro packages might find source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They will be available from the official page together with the builds. See also the schedule at http://wiki.documentfoundation.org/ReleasePlan#4.0_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Best Regards, Petr bnc#791985 automatically rotate chart labels (if overlapping). [Muthu Subramanian] bnc#792778 DOCX import: parse group shapes in oox only [Miklos Vajna] bnc#793408 fix cell border line properties [Radek Doulik] bnc#793999 PPTX Export - background image fit to slide. [Muthu Subramanian] bnc#794350 [PPTX] Flip gradient fill as well. [Muthu Subramanian] fdo#36057 Docs don't mention that time format using [] is needed to show hours non-modulo 24 [Michael Meeks] fdo#37449 Crash when previewing the Pgtextje.ttf font in the font list [Caolán McNamara] fdo#38606 UI: Under Style and Formatting, clicking Apply always resets to initial tab [Caolán McNamara] fdo#40465 changing zoom in Writer makes the display jump to wrong page [Winfried Donkers] fdo#46460 Missing Circles and Ovals toolbar. [Rob Snelders] fdo#52286 FILESAVE as .RTF will show subscript and superscript with normal font height instead of reduced height [Miklos Vajna] fdo#53009 Large UserInstallation's user/extensions/bundled/ tree [Stephan Bergmann] fdo#53487 [Notes] Weird interaction of notes/comments with undo. Insert/Comment is grayed out. [Miklos Vajna] fdo#54165 Unable to localize key names [Jesús Corrius] fdo#55974 CRASH: segfault while closing an Impress file [Caolán McNamara] fdo#56124 add calc functions IFERROR and IFNA as in ODFF1.2 [Eike Rathke] fdo#57465 : Calc sorts columns incorrectly [Markus Mohrhard] fdo#57938 First character before ranged comment cannot be edited or removed [Miklos Vajna] fdo#58026 Localization problem for GoogleDocs extension [Andras Timar] fdo#58069 FILESAVE in different path structure destroys relative hyperlinks [Kohei Yoshida] fdo#58242 Introspection on Anchor of TextTable crashes LO [Michael Stahl, Noel Power] fdo#58301 Controls in dialog Data Sort invisible after starting [Caolán McNamara] fdo#58324 VIEWING: In Libreoffice 4.0 Beta1, Writer fail to find other fonts for displaying unicode characters. [Caolán McNamara] fdo#58327 Paste Special cells As RTF from Calc immediately undone [Michael Stahl] fdo#58328 FILESAVE: Creating a new document version no longer working [Cédric Bosdonnat] fdo#58415 CRASH with option - general - USE DIALOG BOX Libo if folder contains a file with Pipe car. [Stephan Bergmann] fdo#58503 Options-Writing Aids doesn't list the available bundled language modules [Eike Rathke] fdo#58531 FILEOPEN: Reload no longer refreshes external links in 4.0 [Kohei Yoshida] fdo#58539 documents that crash Libreoffice Calc master from 18.12.2012 [Kohei Yoshida] fdo#58562 EDITING: copy and paste of CHART from Calc looses Y values [Kohei Yoshida] fdo#58589 UI: program crash/file recovery dialog looks unfinished [Caolán McNamara] fdo#58609 FORMATTING: Condition type dropdown box is too small [Markus Mohrhard] fdo#58610 FORMATTING: IconSet not working correctly [Markus Mohrhard] fdo#58712 Terms necessary for the translate are not available [Andras Timar] fdo#58730 paragraph styles line spacing does not stick when also specifying non-zero left and right margins [Caolán McNamara] fdo#58778 FORMATTING: conditional formats can easily be created without a specified range (especially iconset) [Markus Mohrhard] fdo#58793 FILEOPEN: Crash when trying to open attachment fdo#58277 [Michael Stahl] fdo#58854 Button not localized [Andras Timar] fdo#58893 [CRASH] FILEOPEN : master document with linked template modified [Michael Stahl] fdo#58909 Extension upgrade fails with error Cannot create folder [Stephan Bergmann] fdo#58933 FILEOPEN: RTF-filter; Addition of empty paragraphs in table’s cells [Miklos Vajna] fdo#58988 Copy and paste chart fails if the source sheet does not have the default name [Kohei Yoshida] fdo#58998 duplicated sections [Caolán McNamara] fdo#59084 PIVOTTABLE refreshing with date group field crashes [Kohei Yoshida] fdo#59112 resizing sort dialog breaks scollbar and disables all entries [Caolán McNamara] fdo#59131 Crash on opening Properties from print dialog second time [Caolán McNamara] fdo#59158 site link is wrong [Andras Timar] fdo#59159 Styles only used in CONDITIONAL FORMATTING not copied with sheet to new
[Libreoffice-commits] .: oox/inc oox/source sd/source sw/source
oox/inc/oox/export/drawingml.hxx |6 +- oox/inc/oox/export/utils.hxx |1 oox/source/export/chartexport.cxx| 68 +-- oox/source/export/drawingml.cxx | 28 +-- oox/source/export/shapes.cxx | 30 +-- sd/source/filter/eppt/epptbase.hxx |4 - sd/source/filter/eppt/epptso.cxx |6 +- sd/source/filter/eppt/pptx-epptooxml.cxx |6 +- sd/source/filter/eppt/text.hxx |2 sw/source/filter/ww8/docxattributeoutput.cxx |4 - 10 files changed, 77 insertions(+), 78 deletions(-) New commits: commit 4ceba05995b9fafdc00896e3253f405299ff1066 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jan 22 18:14:51 2013 +0100 oox: kill no longer needed S() macro Change-Id: If3f1bb787d6debaa63e3bed3a48e44b5e34c27b7 diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx index a355ac4..486d792 100644 --- a/oox/inc/oox/export/drawingml.hxx +++ b/oox/inc/oox/export/drawingml.hxx @@ -76,7 +76,7 @@ protected: ::sax_fastparser::FSHelperPtr mpFS; ::oox::core::XmlFilterBase* mpFB; -bool GetProperty( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet, String aName ); +bool GetProperty( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet, OUString aName ); bool GetPropertyAndState( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet, ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertyState rXPropState, String aName, ::com::sun::star::beans::PropertyState eState ); @@ -104,8 +104,8 @@ public: void WriteSolidFill( sal_uInt32 nColor ); void WriteSolidFill( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet ); 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, String sURLPropName, sal_Int32 nXmlNamespace ); -void WriteBlipFill( ::com::sun::star::uno::Reference ::com::sun::star::beans::XPropertySet rXPropSet, String sURLPropName ); +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 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/inc/oox/export/utils.hxx b/oox/inc/oox/export/utils.hxx index d39d5f7..f43faca 100644 --- a/oox/inc/oox/export/utils.hxx +++ b/oox/inc/oox/export/utils.hxx @@ -20,7 +20,6 @@ #ifndef _OOX_EXPORT_UTILS_HXX_ #define _OOX_EXPORT_UTILS_HXX_ -#define S(x) String( RTL_CONSTASCII_USTRINGPARAM( x ) ) #define US(x) rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x )) #define I32S(x) rtl::OString::valueOf( (sal_Int32) x ).getStr() #define I64S(x) rtl::OString::valueOf( (sal_Int64) x ).getStr() diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index dcd4be1..6b53159 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -524,7 +524,7 @@ ChartExport ChartExport::WriteChartObj( const Reference XShape xShape, sal_ pFS-startElementNS( mnXmlNamespace, XML_nvGraphicFramePr, FSEND ); // TODO: get the correct chart name chart id -OUString sName = S(Object 1); +OUString sName = Object 1; Reference XNamed xNamed( xShape, UNO_QUERY ); if (xNamed.is()) sName = xNamed-getName(); @@ -1138,7 +1138,7 @@ void ChartExport::exportBarChart( Reference chart2::XChartType xChartType ) // bar direction sal_Bool bVertical = sal_False; Reference XPropertySet xPropSet( mxDiagram , uno::UNO_QUERY); -if( GetProperty( xPropSet, S( Vertical ) ) ) +if( GetProperty( xPropSet, Vertical ) ) mAny = bVertical; const char* bardir = bVertical? bar:col; @@ -1156,7 +1156,7 @@ void ChartExport::exportBarChart( Reference chart2::XChartType xChartType ) // Shape namespace cssc = ::com::sun::star::chart; sal_Int32 nGeom3d = cssc::ChartSolidType::RECTANGULAR_SOLID; -if( xPropSet.is() GetProperty( xPropSet, S(SolidType) ) ) +if( xPropSet.is() GetProperty( xPropSet, SolidType) ) mAny = nGeom3d; const char* sShapeType = NULL; switch( nGeom3d ) @@ -1180,7 +1180,7 @@ void ChartExport::exportBarChart( Reference chart2::XChartType xChartType ) } //overlap -if( xTypeProp.is() GetProperty( xTypeProp,
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - oox/inc
oox/inc/oox/vml/vmltextbox.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 610821d4733c11496e05b7bfa0c83327913c38b7 Author: LuboÅ¡ LuÅák l.lu...@suse.cz Date: Tue Dec 18 00:25:31 2012 +0100 class vs struct mismatch Apparently this was enough to cause a linking error with oox::vml::TextBox::TextBox on Windows. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/oox/inc/oox/vml/vmltextbox.hxx b/oox/inc/oox/vml/vmltextbox.hxx index 4981443..1dc30ab 100644 --- a/oox/inc/oox/vml/vmltextbox.hxx +++ b/oox/inc/oox/vml/vmltextbox.hxx @@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star { namespace oox { namespace vml { -class ShapeTypeModel; +struct ShapeTypeModel; // ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - idlc/CustomTarget_parser_test.mk idlc/Module_idlc.mk idlc/source idlc/test
idlc/CustomTarget_parser_test.mk | 74 idlc/Module_idlc.mk |1 idlc/source/parser.y | 20 +--- idlc/test/parser/constant.tests | 88 +++ idlc/test/parser/makefile.mk | 46 idlc/test/parser/published.tests | 69 +- 6 files changed, 127 insertions(+), 171 deletions(-) New commits: commit 3b269d6d2d679536e9cbabc5b2d2339ef4bd75d2 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 22 17:53:33 2013 +0100 API CHANGE: Remove support for individual constants from UNOIDL ...i.e., const X = N; declarations outside of constant groups. This appears to be unused in practice, and removing it will allow to simplify future code related to UNO type information. This removes the definition of constant-decl, and the branch mentioning constant-decl from the definition of declaration at http://wiki.openoffice.org/w/index.php?title=Documentation/DevGuide/AppendixD/UNOIDL_Syntax_Specificationoldid=137490. Change-Id: I218626f02ebd46ee438bf5453ca1510c9ed8e5f0 diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 2b5997d..629c2f2 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -361,7 +361,7 @@ bool includes(AstDeclaration const * type1, AstDeclaration const * type2) { /* * These are production names: */ -%type dclval type_dcl const_dcl +%type dclval type_dcl %type dclval array_declarator %type dclval exception_name %type cdclval array_type constructed_type_spec enum_type op_type_spec @@ -448,14 +448,6 @@ publishable_definition: { idlc()-setParseState(PS_NoState); } - | const_dcl - { - idlc()-setParseState(PS_ConstantDeclSeen); - } - ';' - { - idlc()-setParseState(PS_NoState); - } | exception_dcl { idlc()-setParseState(PS_ExceptionDeclSeen); @@ -1288,13 +1280,6 @@ constants_exports : ; constants_export : - const_dcl - { - idlc()-setParseState(PS_ConstantDeclSeen); - } - ';' {}; - -const_dcl : IDL_CONST { idlc()-setParseState(PS_ConstSeen); @@ -1331,7 +1316,10 @@ const_dcl : } } delete $5; + + idlc()-setParseState(PS_ConstantDeclSeen); } + ';' {}; ; constants_dcl : diff --git a/idlc/test/parser/constant.tests b/idlc/test/parser/constant.tests index 4d4f5f2..505a8c2 100644 --- a/idlc/test/parser/constant.tests +++ b/idlc/test/parser/constant.tests @@ -31,7 +31,7 @@ constants C { }; -EXPECT SUCCESS constant.tests 2: +EXPECT FAILURE constant.tests 2: module m { const boolean C1 = FALSE; const byte C2 = 0; @@ -75,7 +75,7 @@ constants C {}; EXPECT SUCCESS constant.tests 8: -module m { +constants C { const byte C1 = -128; const byte C2 = -0200; const byte C3 = -0x80; @@ -119,168 +119,168 @@ module m { EXPECT FAILURE constant.tests 9: -module m { const byte C = -129; }; +constants C { const byte C1 = -129; }; EXPECT FAILURE constant.tests 10: -module m { const byte C = -0201; }; +constants C { const byte C1 = -0201; }; EXPECT FAILURE constant.tests 11: -module m { const byte C = -0x81; }; +constants C { const byte C1 = -0x81; }; EXPECT FAILURE constant.tests 12: -module m { const byte C = 256; }; +constants C { const byte C1 = 256; }; EXPECT FAILURE constant.tests 13: -module m { const byte C = 0400; }; +constants C { const byte C1 = 0400; }; EXPECT FAILURE constant.tests 14: -module m { const byte C = 0x100; }; +constants C { const byte C1 = 0x100; }; EXPECT FAILURE constant.tests 15: -module m { const short C = -32769; }; +constants C { const short C1 = -32769; }; EXPECT FAILURE constant.tests 16: -module m { const short C = -011; }; +constants C { const short C1 = -011; }; EXPECT FAILURE constant.tests 17: -module m { const short C = -0x8001; }; +constants C { const short C1 = -0x8001; }; EXPECT FAILURE constant.tests 18: -module m { const short C = 32768; }; +constants C { const short C1 = 32768; }; EXPECT FAILURE constant.tests 19: -module m { const short C = 010; }; +constants C { const short C1 = 010; }; EXPECT FAILURE constant.tests 20: -module m { const short C = 0x8000; }; +constants C { const short C1 = 0x8000; }; EXPECT FAILURE constant.tests 21: -module m { const unsigned short C = -1; }; +constants C { const unsigned short C1 = -1; }; EXPECT FAILURE constant.tests 22: -module m { const unsigned short C = -01; }; +constants C { const unsigned short C1 = -01; }; EXPECT FAILURE constant.tests 23: -module m { const unsigned short C = -0x1; }; +constants C { const unsigned short C1 = -0x1; }; EXPECT FAILURE constant.tests 24: -module m {
[PATCH] Change in core[libreoffice-4-0]: lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of a...
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1810 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/10/1810/1 lo-pack-sources: run NOCONFIGURE=1 ./autogen.sh instead of autoreconf autogen.sh runs the needed tools with the right include paths Change-Id: Ia253b19566eeda31a1190a4fa7c543f7ffb63bfb --- M bin/lo-pack-sources 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources index 5341af5..de6a4be 100755 --- a/bin/lo-pack-sources +++ b/bin/lo-pack-sources @@ -131,15 +131,15 @@ die Error: generating failed: $!\n; } -sub run_autoreconf($$) +sub run_autogen($$) { my ($dir, $module) = @_; -print Running autoreconf for $module...\n; +print Running autogen for $module...\n; system (cd $dir . -autoreconf -f -i . +NOCONFIGURE=1 ./autogen.sh . rm -rf autom4te.cache . -cd - /dev/null 21) die Error: autoreconf failed: $!\n; +cd - /dev/null 21) die Error: autogen failed: $!\n; } sub generate_sources_version_file($$) @@ -266,7 +266,7 @@ # prepare sources my $temp_dir = copy_lo_module_to_tempdir($source_dir, $module, $lo_topdir_name); generate_lo_module_changelog($source_dir, $temp_dir/$lo_topdir_name, $module); -run_autoreconf($temp_dir/$lo_topdir_name, $module) if ($module eq 'core'); +run_autogen($temp_dir/$lo_topdir_name, $module) if ($module eq 'core'); generate_sources_version_file($temp_dir/$lo_topdir_name, $release_version) if ($module eq 'core'); return $temp_dir; -- To view, visit https://gerrit.libreoffice.org/1810 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia253b19566eeda31a1190a4fa7c543f7ffb63bfb Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Petr Mladek pmla...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/filter/inc/richstring.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ca3859e781c1d63bde74fa21366b0fbde79c8ea7 Author: Michael Stahl mst...@redhat.com Date: Tue Jan 22 18:45:15 2013 +0100 warning C4099: type name first seen using 'struct' now seen using 'class' Change-Id: I19cc56b0ab48435f1e20e03f23ed1bb0d984871d diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index 4815fa2..a0f8761 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -24,7 +24,7 @@ #include stylesbuffer.hxx class EditTextObject; -class ESelection; +struct ESelection; class ScEditEngineDefaulter; namespace com { namespace sun { namespace star { ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Python extension issue with LO 4 on Windows
-- View this message in context: http://nabble.documentfoundation.org/Python-extension-issue-with-LO-4-on-Windows-tp4031038p4031115.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Python extension issue with LO 4 on Windows
Hi, Stephan Bergmann-2 wrote And you can file a LO bug about that. Thanks for your answer. Here it is: https://bugs.freedesktop.org/show_bug.cgi?id=59728 Best regards, Olivier -- View this message in context: http://nabble.documentfoundation.org/Python-extension-issue-with-LO-4-on-Windows-tp4031038p4031116.html Sent from the Dev mailing list archive at Nabble.com. ___ 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 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on|58943 | -- 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
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||59724 -- 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
[PATCH] Remove fprintf usage from vcl/builder
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/1813 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/1813/1 Remove fprintf usage from vcl/builder Change-Id: I185cedfaff30063fe0d0deb64eecff8796ac1ff9 --- M vcl/source/window/builder.cxx 1 file changed, 0 insertions(+), 2 deletions(-) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index e564823..4596a2c 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1636,8 +1636,6 @@ pWindow-set_property(rKey.copy(RTL_CONSTASCII_LENGTH(AtkObject::)), rValue); else SAL_WARN(vcl.layout, unhandled atk prop: rKey.getStr()); - -fprintf(stderr, setting atk props on %p\n, pWindow); } } -- To view, visit https://gerrit.libreoffice.org/1813 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I185cedfaff30063fe0d0deb64eecff8796ac1ff9 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: vcl/source
vcl/source/window/builder.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 593e6ed34f89c8abba41a771d5de05aebd600fb3 Author: Arnaud Versini arnaud.vers...@gmail.com Date: Tue Jan 22 19:57:21 2013 +0100 Remove fprintf usage from vcl/builder Change-Id: I185cedfaff30063fe0d0deb64eecff8796ac1ff9 Reviewed-on: https://gerrit.libreoffice.org/1813 Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index e564823..4596a2c 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1636,8 +1636,6 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader reader, const OString rI pWindow-set_property(rKey.copy(RTL_CONSTASCII_LENGTH(AtkObject::)), rValue); else SAL_WARN(vcl.layout, unhandled atk prop: rKey.getStr()); - -fprintf(stderr, setting atk props on %p\n, pWindow); } } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-4-0' - odk/index.html odk/index_online.html
odk/index.html|7 +++ odk/index_online.html |7 +++ 2 files changed, 14 insertions(+) New commits: commit 61ec20794324fc6d9c533f1347dbf1ababf38036 Author: Stephan Bergmann sberg...@redhat.com Date: Tue Jan 22 14:24:31 2013 +0100 Add link to additional sdk-examples Change-Id: Ifcc3594273de3507ec9b208e9e762bed0f969d72 (cherry picked from commit 664e559abd472bf2b427e2c01144ea39fb5bc02b) Reviewed-on: https://gerrit.libreoffice.org/1808 Reviewed-by: Andras Timar ati...@suse.com Tested-by: Andras Timar ati...@suse.com diff --git a/odk/index.html b/odk/index.html index d3dfeb0..2a858f5 100644 --- a/odk/index.html +++ b/odk/index.html @@ -145,6 +145,13 @@ td class=content70A collection of examples in different programming languages (Java, Python, C++, Basic, OLE, CLI)./td /tr + tr valign=top +td class=content4img src=docs/images/arrow-1.gif/td +td colspan=2a href=https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=README;hb=HEAD; title=link to the git repository README fileAdditional Examples/a/td +td class=content70A git repository with additional examples + from various contributors: codegit clone + https://gerrit.libreoffice.org/sdk-examples/code/td + /tr tr valign=middle tdimg class=nothing10 src=docs/images/nada.gif/td td colspan=3img class=line src=docs/images/sdk_line-1.gif/td diff --git a/odk/index_online.html b/odk/index_online.html index 032b699..76e6985 100644 --- a/odk/index_online.html +++ b/odk/index_online.html @@ -67,6 +67,13 @@ td class=content70A collection of examples in different programming languages (Java, Python, C++, Basic, OLE, CLI)./td /tr + tr valign=top +td class=content4img src=docs/images/arrow-1.gif/td +td colspan=2a href=https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=README;hb=HEAD; title=link to the git repository README fileAdditional Examples/a/td +td class=content70A git repository with additional examples + from various contributors: codegit clone + https://gerrit.libreoffice.org/sdk-examples/code/td + /tr tr valign=middle tdimg class=nothing10 src=docs/images/nada.gif/td td colspan=3img class=line src=docs/images/sdk_line-1.gif/td ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits