[Libreoffice-commits] .: instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |3 +++ 1 file changed, 3 insertions(+) New commits: commit ddbc61d871368d751f5162e49ac6f843b69ec841 Author: Andras Timar ati...@suse.com Date: Tue Jun 26 09:32:28 2012 +0200 switch on QuickStarter from installer, UI text added Change-Id: I3a2f937603d8804ce2b9d46632b80a74e811324c diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index d2a473b..d240ff7 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -666,3 +666,6 @@ en-US = Create a start link on desktop [OOO_CONTROL_320] en-US = Support assistive technology tools + +[OOO_CONTROL_321] +en-US = Load [ProductName] during system start-up ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - instsetoo_native/inc_openoffice
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |3 +++ 1 file changed, 3 insertions(+) New commits: commit 1b303bf27cfd8a3185c1ec876a5eb872b6fb7fb2 Author: Andras Timar ati...@suse.com Date: Tue Jun 26 09:32:28 2012 +0200 switch on QuickStarter from installer, UI text added Change-Id: I3a2f937603d8804ce2b9d46632b80a74e811324c diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index d2a473b..d240ff7 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -666,3 +666,6 @@ en-US = Create a start link on desktop [OOO_CONTROL_320] en-US = Support assistive technology tools + +[OOO_CONTROL_321] +en-US = Load [ProductName] during system start-up ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc
oox/inc/oox/ole/vbacontrol.hxx | 36 ++-- oox/inc/oox/ole/vbamodule.hxx |4 ++-- oox/inc/oox/ole/vbaproject.hxx | 14 +++--- 3 files changed, 27 insertions(+), 27 deletions(-) New commits: commit a1263c2e160acfaba4ea205b9135606f49d03af6 Author: Miklos Vajna vmik...@suse.cz Date: Tue Jun 26 09:43:30 2012 +0200 oox: fix remaining vba doxygen errors Change-Id: Ic7816065fd5fda640ce85ab25514df76be098b12 diff --git a/oox/inc/oox/ole/vbacontrol.hxx b/oox/inc/oox/ole/vbacontrol.hxx index b4d2afb..bbe5373 100644 --- a/oox/inc/oox/ole/vbacontrol.hxx +++ b/oox/inc/oox/ole/vbacontrol.hxx @@ -90,20 +90,20 @@ public: const ControlConverter rConv ) const; protected: -::rtl::OUString maName; /// Name of the control. -::rtl::OUString maTag; /// User defined tag. -::rtl::OUString maToolTip; /// Tool tip for the control. -::rtl::OUString maControlSource;/// Linked cell for the control value in a spreadsheet. -::rtl::OUString maRowSource;/// Source data for the control in a spreadsheet. - -AxPairData maPos; /// Position in parent container. -sal_Int32 mnId; /// Control identifier. -sal_Int32 mnHelpContextId;/// Help context identifier. -sal_uInt32 mnFlags;/// Various flags. -sal_uInt32 mnStreamLen;/// Size of control stream data. -sal_Int16 mnTabIndex; /// Tab order index. -sal_uInt16 mnClassIdOrCache; /// Class name identifier or GUID cache index. -sal_uInt16 mnGroupId; /// Group identifier for grouped controls. +::rtl::OUString maName; /// Name of the control. +::rtl::OUString maTag; /// User defined tag. +::rtl::OUString maToolTip; /// Tool tip for the control. +::rtl::OUString maControlSource;/// Linked cell for the control value in a spreadsheet. +::rtl::OUString maRowSource;/// Source data for the control in a spreadsheet. + +AxPairData maPos; /// Position in parent container. +sal_Int32 mnId; /// Control identifier. +sal_Int32 mnHelpContextId;/// Help context identifier. +sal_uInt32 mnFlags;/// Various flags. +sal_uInt32 mnStreamLen;/// Size of control stream data. +sal_Int16 mnTabIndex; /// Tab order index. +sal_uInt16 mnClassIdOrCache; /// Class name identifier or GUID cache index. +sal_uInt16 mnGroupId; /// Group identifier for grouped controls. }; typedef ::boost::shared_ptr VbaSiteModel VbaSiteModelRef; @@ -173,12 +173,12 @@ private: static bool compareByTabIndex( const VbaFormControlRef rxLeft, const VbaFormControlRef rxRight ); protected: -VbaSiteModelRef mxSiteModel;/// Common control properties. -ControlModelRef mxCtrlModel;/// Specific control properties. +VbaSiteModelRef mxSiteModel;/// Common control properties. +ControlModelRef mxCtrlModel;/// Specific control properties. private: -VbaFormControlVector maControls;/// All embedded form controls. -AxClassTable maClassTable; /// Class identifiers for exotic embedded controls. +VbaFormControlVector maControls;/// All embedded form controls. +AxClassTable maClassTable; /// Class identifiers for exotic embedded controls. }; // diff --git a/oox/inc/oox/ole/vbamodule.hxx b/oox/inc/oox/ole/vbamodule.hxx index 2e83b3e..5e1725d 100644 --- a/oox/inc/oox/ole/vbamodule.hxx +++ b/oox/inc/oox/ole/vbamodule.hxx @@ -100,9 +100,9 @@ private: private: ::com::sun::star::uno::Reference ::com::sun::star::uno::XComponentContext -mxContext; /// Component context with service manager. +mxContext; /// Component context with service manager. ::com::sun::star::uno::Reference ::com::sun::star::frame::XModel -mxDocModel; /// Document model used to import/export the VBA project. +mxDocModel; /// Document model used to import/export the VBA project. ::rtl::OUString maName; ::rtl::OUString maStreamName; ::rtl::OUString maDocString; diff --git a/oox/inc/oox/ole/vbaproject.hxx b/oox/inc/oox/ole/vbaproject.hxx index cb1ee4f..febc0ba 100644 --- a/oox/inc/oox/ole/vbaproject.hxx +++ b/oox/inc/oox/ole/vbaproject.hxx @@ -191,16 +191,16 @@ private: typedef ::std::map ::rtl::OUString, sal_Int32 DummyModuleMap; ::com::sun::star::uno::Reference
[REVIEW:3-5] fdo#50831 fix RTF export of direct run formatting for empty paragraphs
Hi,
See
http://cgit.freedesktop.org/libreoffice/core/commit/?id=7f916b9
Backport attached; also on gerrit: https://gerrit.libreoffice.org/237
Thanks,
Miklos
From 814500d0e93a7141a0dbcf32c57709c9563330bd Mon Sep 17 00:00:00 2001
From: Miklos Vajna vmik...@suse.cz
Date: Fri, 22 Jun 2012 15:41:37 +0200
Subject: [PATCH] fdo#50831 fix RTF export of direct run formatting for empty
paragraphs
Change-Id: I5f0e7aefdea80bbb9cf61b991c5b706bd2023dfa
---
sw/source/filter/ww8/attributeoutputbase.hxx |2 +-
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 12
sw/source/filter/ww8/rtfattributeoutput.hxx |5 -
sw/source/filter/ww8/wrtw8nds.cxx|7 ---
sw/source/filter/ww8/ww8atr.cxx |2 +-
sw/source/filter/ww8/ww8attributeoutput.hxx |2 +-
8 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx b/sw/source/filter/ww8/attributeoutputbase.hxx
index 4b08cbf..c257a02 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -159,7 +159,7 @@ public:
virtual void EmptyParagraph() = 0;
/// Start of the text run.
-virtual void StartRun( const SwRedlineData* pRedlineData ) = 0;
+virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false ) = 0;
/// End of the text run.
virtual void EndRun() = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0ea06b7..f8615c6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -499,7 +499,7 @@ void DocxAttributeOutput::EndParagraphProperties()
m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND );
}
-void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
+void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool /*bSingleEmptyRun*/ )
{
// if there is some redlining in the document, output it
StartRedline( pRedlineData );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx
index 79c8b02..12a87d4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -90,7 +90,7 @@ public:
virtual void EndParagraphProperties();
/// Start of the text run.
-virtual void StartRun( const SwRedlineData* pRedlineData );
+virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false );
/// End of the text run.
virtual void EndRun();
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5019a40..0c3533b 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -374,11 +374,13 @@ void RtfAttributeOutput::EndParagraphProperties()
m_rExport.Strm() m_aStyles.makeStringAndClear().getStr();
}
-void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
+void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun )
{
OSL_TRACE(%s, OSL_THIS_FUNC);
-m_aRun.append('{');
+m_bSingleEmptyRun = bSingleEmptyRun;
+if (!m_bSingleEmptyRun)
+m_aRun.append('{');
// if there is some redlining in the document, output it
Redline( pRedlineData );
@@ -391,7 +393,8 @@ void RtfAttributeOutput::EndRun()
OSL_TRACE(%s, OSL_THIS_FUNC);
m_aRun.append(m_rExport.sNewLine);
m_aRun.append(m_aRunText.makeStringAndClear());
-m_aRun.append('}');
+if (!m_bSingleEmptyRun)
+m_aRun.append('}');
}
void RtfAttributeOutput::StartRunProperties()
@@ -3020,7 +3023,8 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport rExport )
m_bWroteCellInfo( false ),
m_bHadFieldResult( false ),
m_bTableRowEnded( false ),
-m_aCells()
+m_aCells(),
+m_bSingleEmptyRun(false)
{
OSL_TRACE(%s, OSL_THIS_FUNC);
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx
index eea4b8c..406f063 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -63,7 +63,7 @@ public:
virtual void EndParagraphProperties();
/// Start of the text run.
-virtual void StartRun( const SwRedlineData* pRedlineData );
+virtual void StartRun( const SwRedlineData* pRedlineData, bool bSingleEmptyRun = false );
/// End of the text run.
virtual void EndRun();
@@ -539,6 +539,9 @@ private:
/// Number of cells from the table definition, by depth.
std::mapsal_uInt32,sal_uInt32 m_aCells;
+
+/// If we're in a paragraph that has a single empty run only.
+bool m_bSingleEmptyRun;
public:
RtfAttributeOutput( RtfExport
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #5
Hi Marco, you wrote: Ported all transition tables that describe how an animation can pass from one state to another. Added support for the repeatCount attribute for time containers. yay - good work indeed, we were missing that since years! :) Implemented support to the rewind option for the JavaScript engine. Is that working satisfactory already? If yes, I wouldn't mind you merging svg-export into master again. Created two Easy hacks for shape transitions and slide transitions. The goal of such easy hacks is to add support for more shape and slide transitions to the JavaScript presentation engine. Excellent - that would be fdo#51358 and fdo#51357 for the bystanders wanting to poke. ;) Unfortunately I could not do more because I was knocked out by a gastrointestinal virus. I need to pay more attention to what I eat. Really sorry to hear - get well soon! Cheers, -- Thorsten pgpuDJjVCVVZ0.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - sc/inc sc/source
sc/inc/attarray.hxx|2 +-
sc/inc/column.hxx |2 +-
sc/inc/document.hxx|1 -
sc/inc/table.hxx |2 +-
sc/source/core/data/attarray.cxx |4 ++--
sc/source/core/data/column2.cxx|4 ++--
sc/source/core/data/document.cxx | 13 -
sc/source/core/data/table1.cxx |4 ++--
sc/source/filter/excel/xetable.cxx |2 +-
9 files changed, 10 insertions(+), 24 deletions(-)
New commits:
commit 6a6cee1af26e68c7a5479f2eff5a33d483ff54ed
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 26 11:16:59 2012 +0200
Revert export all style information to xls/xlsx, fdo#46738
It caused huge slow down and even errors when exporting XLS (fdo#49582).
The original problem was less serious because it was old regression
from LO-3.3. There is not easy fix.
= reverting is the best solution according to Markus.
This reverts commit 6c6a4ed070acc0b106e951864fa5d20927f5c1e0.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 27a086e..b58472e 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -175,7 +175,7 @@ public:
boolIsEmpty() const;
boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool
bFullFormattedArea = false ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const;
boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
boolIsVisibleEqual( const ScAttrArray rOther,
SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 313dcd6..f86bf9b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -183,7 +183,7 @@ public:
boolHasSelectionMatrixFragment(const ScMarkData rMark) const;
boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, bool bFullFormattedArea =
false ) const;
+boolGetLastVisibleAttr( SCROW rLastRow ) const;
boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
boolIsVisibleAttrEqual( const ScColumn rCol, SCROW nStartRow = 0,
SCROW nEndRow = MAXROW ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6167634..50bcd27 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -940,7 +940,6 @@ public:
SCCOL rEndCol, SCROW rEndRow, bool
bIncludeOld, bool bOnlyDown ) const;
SC_DLLPUBLIC bool GetCellArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow ) const;
SC_DLLPUBLIC bool GetTableArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow ) const;
-SC_DLLPUBLIC void GetFormattedAndUsedArea( SCTAB nTab, SCCOL
rEndCol, SCROW rEndRow ) const;
SC_DLLPUBLIC bool GetPrintArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow,
bool bNotes = true ) const;
SC_DLLPUBLIC bool GetPrintAreaHor( SCTAB nTab, SCROW nStartRow,
SCROW nEndRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 10775e2..4f1fe38 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -405,7 +405,7 @@ public:
boolGetCellArea( SCCOL rEndCol, SCROW rEndRow ) const;
// FALSE = empty
boolGetTableArea( SCCOL rEndCol, SCROW rEndRow ) const;
-boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes,
bool bFullFormattedArea = false ) const;
+boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes )
const;
boolGetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
SCCOL rEndCol, bool bNotes ) const;
boolGetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 5714e7c..2aa660a 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1831,7 +1831,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW rFirstRow )
const
const SCROW SC_VISATTR_STOP = 84;
-bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool
bFullFormattedArea ) const
+bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const
{
// #i30830# changed behavior:
// ignore all attributes starting with the first run of SC_VISATTR_STOP
equal rows
@@ -1862,7 +1862,7 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow,
SCROW nLastData, bool bFu
if ( nAttrStartRow = nLastData )
nAttrStartRow = nLastData + 1;
SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow;
-if ( nAttrSize = SC_VISATTR_STOP !bFullFormattedArea )
+if ( nAttrSize = SC_VISATTR_STOP )
{
bFound = false;// ignore this range and below
}
diff --git
Re: libicudata in non-standard directory linking issues.
On Mon, Jun 25, 2012 at 4:48 PM, Michael Stahl mst...@redhat.com wrote: On 22 June 2012 09:57, Jonathan Adams t12nsloo...@gmail.com wrote: i'm not sure if adding a defined(__IBMC__) etc. is the right approach but if it doesn't break anything... they added that line for z/OS ... which, I may be wrong, I believe to be an IBM system ... looking around wikipedia; I found references to what defines are set when compiling on z/OS ... hmmm z/OS is apparently why that was initially added, but you never know what later happened to develop a dependency on this setting... FYI __IBMC__ is defined on z/OS but also on AIX when using IBM's xlc compiler. Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] ODS Row height import
Hi, On Tuesday, 2012-06-26 03:46:47 +0200, Markus Mohrhard wrote: ScXMLImport::endDocument() did use ScMyTables::UpdateRowHeights() which used ScTable::SetOptimalHeightOnly() to set the row heights for the visible sheet and any sheets with tabs. I removed the call to this method, and I removed the method itself since nothing else was using it. Turns out that the row height was already being imported using UNO. ScXMLTableRowContext::EndElement() uses XMLTableStyleContext::FillPropertySet() which uses ScDocument::SetRowHeightOnly() to set the row height to the imported row height values. This remains. There's a big difference between ScTable::SetRowHeightOnly() and ScTable::SetOptimalHeightOnly(), the latter as a side effect also recalculates formula results if the cell is marked dirty. Just keept that in mind when removing the call.. if a formula result stored in the file differs from the actual result (i.e. because some generator updated only the result or only the formula) row height may be different when recalculated. Do you think there is something I am missing here? For example, will there ever be a case where row height is not specified, requiring us to calculate the row height? That may be possible, the style:row-height attribute is optional in ODF, so while we write it out even when style:use-optimal-row-height is set, other implementations may not. I'm not sure if we need to recalculate the row height in case of style:use-optimal-row-height but that is something we can figure out later. Except for this case I currently see no reason why we would need to calculate row height but Kohei or Eike may have an idea. I'm Cc'ing also Noel here, he lately tuned row heights for Excel import/export and might have some insights to share. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgp4tpdflh8g3.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: README.cross
README.cross |1 + 1 file changed, 1 insertion(+) New commits: commit cce51e4fd334415d4ebcd13b6da46828970897f6 Author: Jan Holesovsky ke...@suse.cz Date: Tue Jun 26 11:38:13 2012 +0200 mingw32-python is now necessary too. Change-Id: I7b7bbc555b599e411859ca00ddd3988aa52f433f diff --git a/README.cross b/README.cross index e1074ca..ee0b0f7 100644 --- a/README.cross +++ b/README.cross @@ -78,6 +78,7 @@ where your_os is one of SLE_11, SLE_11_SP1, openSUSE_11.3, openSUSE_11.4 or openSUSE_Factory. zypper in mingw32-cross-gcc mingw32-cross-gcc-c++ mingw32-python-devel \ +mingw32-python \ mingw32-libexpat-devel mingw32-libexpat mingw32-boost-devel \ mingw32-libhyphen-devel mingw32-libhyphen mingw32-hyphen-en \ mingw32-liblpsolve mingw32-liblpsolve-devel \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [GSOC] ODS Row height import
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Em 26-06-2012 06:35, Eike Rathke escreveu: Hi, On Tuesday, 2012-06-26 03:46:47 +0200, Markus Mohrhard wrote: ScXMLImport::endDocument() did use ScMyTables::UpdateRowHeights() which used ScTable::SetOptimalHeightOnly() to set the row heights for the visible sheet and any sheets with tabs. I removed the call to this method, and I removed the method itself since nothing else was using it. Turns out that the row height was already being imported using UNO. ScXMLTableRowContext::EndElement() uses XMLTableStyleContext::FillPropertySet() which uses ScDocument::SetRowHeightOnly() to set the row height to the imported row height values. This remains. There's a big difference between ScTable::SetRowHeightOnly() and ScTable::SetOptimalHeightOnly(), the latter as a side effect also recalculates formula results if the cell is marked dirty. Just keept that in mind when removing the call.. if a formula result stored in the file differs from the actual result (i.e. because some generator updated only the result or only the formula) row height may be different when recalculated. Do you think there is something I am missing here? For example, will there ever be a case where row height is not specified, requiring us to calculate the row height? That may be possible, the style:row-height attribute is optional in ODF, so while we write it out even when style:use-optimal-row-height is set, other implementations may not. I'm not sure if we need to recalculate the row height in case of style:use-optimal-row-height but that is something we can figure out later. Except for this case I currently see no reason why we would need to calculate row height but Kohei or Eike may have an idea. I'm Cc'ing also Noel here, he lately tuned row heights for Excel import/export and might have some insights to share. Eike ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice Sorry if I distract you from the issue but this may be correlated: http://www.libreoffice.org/bugzilla/show_bug.cgi?id=40645 FORMATTING: Calc looses row height on reopening the file Regards - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Fundação responsável civilmente, de acordo com o direito civil Detalhes Legais: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQEcBAEBAgAGBQJP6YRUAAoJEJp3R7nH3vLxon0H/2KKVByIrXCpzNuozKtsU+J8 AobO/cD4BTjTGA+TwwBwpHfRSrtsQfqqqBZssZi9f+gOTvA5AgwoA9SpPbmYgTRQ 1lKt1fIYXDj3SvcgOEa2ldk0BXlEy/PaCkQMUiAATjQ02NFqm9iPadjyhtbZh7Qz u3glRzHDacA1uIR7luYpQUCQ82MRbkaIBI3NF7809Atmtlc2Av4bhGi+OpugtZgu ZaK4CfYSPVmS2vLJzU0OgepRxokpeLQ1YleP13bqWzEY8yPdG0fcKeWsrduMxD/1 gfzudj1Kre6cOjnIy5saTHiPp7Jf80j8nqKdAWrIYe2OfGADrSObpIm2aVmGG3o= =MIno -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Can #32260 and 51135 be closed? -- both: Request for account
On Tue, 2012-06-26 at 01:55 +0200, Muhammad Haggag wrote: On 06/25/2012 05:56 PM, Philipp Riemer wrote: (2) Also Muhammad Haggag's request https://bugs.freedesktop.org/show_bug.cgi?id=51135 from 2012-06-15 is in UNCONFIRMED state. But here the situation seems to be different since I can only find three mails in total from him in Feb 2012 on the I'm actually interested :) Oh drat - did I really not create that ! Let me close these both out today - thanks for the heads up Philipp :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sdext/CppunitTest_pdfimport.mk solenv/gbuild
sdext/CppunitTest_pdfimport.mk |2 ++ solenv/gbuild/CppunitTest.mk |4 solenv/gbuild/Extension.mk |7 ++- 3 files changed, 12 insertions(+), 1 deletion(-) New commits: commit 0d4cd11c74cf90cd3b987f628031d02fe3af47b4 Author: Michael Stahl mst...@redhat.com Date: Tue Jun 26 12:01:09 2012 +0200 gbuild: add gb_CppunitTest_use_executable and use it in sdext/CppunitTest_pdfimport.mk, which could fail previously in a parallel build. Change-Id: I3f251c945f5841c277a71a19fd411ecd77dec3b5 diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index 7c3dd32..26f6835 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -66,6 +66,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\ sdext/source/pdfimport/test/tests \ )) +$(eval $(call gb_CppunitTest_use_executable,sdext_pdfimport,xpdfimport)) + $(eval $(call gb_CppunitTest_use_ure,sdext_pdfimport)) $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index b8b8672..bc522be 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -307,6 +307,10 @@ $(foreach extra,$(2),$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(extr endef +define gb_CppunitTest_use_executable +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2)) +endef + define gb_CppunitTest__forward_to_Linktarget gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3),CppunitTest_$$(1)) commit e818f8fa1f79c2eb2d647678333b8d12599dda69 Author: Michael Stahl mst...@redhat.com Date: Tue Jun 26 11:44:43 2012 +0200 fdo#51115: gb_Extension_add_file: fix Windows build: The DLL is not actually a make target, but is handled via the AUXTARGETS mechanism in LinkTarget.mk; add an ugly hack here to hopefully make adding libraries to extensions work. Change-Id: I85ee891fe8b7d470e09d9cb1d5a48d8b11b50d6e diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 86c1366..be486be 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -136,12 +136,15 @@ endef # adding a file creates a dependency to it # file is copied to $(WORKDIR) +# $(3) is the target of the copied file, and $(4) can be used to override that +# with a different actual file, which is needed in gb_Extension_add_library +# to make it work on Windows where the DLL doesn't have a gbuild target... define gb_Extension_add_file $(call gb_Extension_get_target,$(1)) : FILES += $(2) $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) mkdir -p $$(dir $$@) \ - cp -f $$ $$@ + cp -f $(if $(4),$(4),$(3)) $$@ endef @@ -159,6 +162,7 @@ endef # add a library from the solver; DO NOT use gb_Library_get_target define gb_Extension_add_library $(call gb_Extension_add_file,$(1),$(call gb_Library_get_runtime_filename,$(2)),\ + $(call gb_Library_get_target,$(2)),\ $(gb_Helper_OUTDIRLIBDIR)/$(call gb_Library_get_runtime_filename,$(2))) endef @@ -169,6 +173,7 @@ endef # add an executable from the solver define gb_Extension_add_executable $(call gb_Extension_add_file,$(1),$(notdir $(call gb_Executable_get_target,$(2))),\ + $(call gb_Executable_get_target,$(2)),\ $(call gb_Executable_get_target,$(2))) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-5-5] proposal of a patch to solve a crasher when saving a spreadsheet with track-change
Eike Rathke píše v Pá 22. 06. 2012 v 12:26 +0200: On Thursday, 2012-06-21 20:16:24 +0200, Markus Mohrhard wrote: Anyway pushed to 3-5 with my sign-off. If you want it in 3-5-5 you need to write a new mail with correct subject and 2 more sign-offs. Please also use REVIEW-3-5 in the future. Count my review in, so one more needed for 3-5-5 Just to close the thread. I see this pushed in 3-5-5 by Lionel as http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5-5id=3e6d34e4afa67d01a40804e93b6d3f94b09dcc5e Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sdext/CppunitTest_pdfimport.mk solenv/gbuild
sdext/CppunitTest_pdfimport.mk |2 ++ solenv/gbuild/CppunitTest.mk |4 solenv/gbuild/Extension.mk |7 ++- 3 files changed, 12 insertions(+), 1 deletion(-) New commits: commit 1d179e2ccfd93c711386007e24828959d38c9c22 Author: Michael Stahl mst...@redhat.com Date: Tue Jun 26 11:44:43 2012 +0200 fdo#51115: gb_Extension_add_file: fix Windows build: The DLL is not actually a make target, but is handled via the AUXTARGETS mechanism in LinkTarget.mk; add an ugly hack here to hopefully make adding libraries to extensions work. Change-Id: I85ee891fe8b7d470e09d9cb1d5a48d8b11b50d6e (cherry picked from commit e818f8fa1f79c2eb2d647678333b8d12599dda69) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 86c1366..be486be 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -136,12 +136,15 @@ endef # adding a file creates a dependency to it # file is copied to $(WORKDIR) +# $(3) is the target of the copied file, and $(4) can be used to override that +# with a different actual file, which is needed in gb_Extension_add_library +# to make it work on Windows where the DLL doesn't have a gbuild target... define gb_Extension_add_file $(call gb_Extension_get_target,$(1)) : FILES += $(2) $(call gb_Extension_get_target,$(1)) : $(call gb_Extension_get_rootdir,$(1))/$(2) $(call gb_Extension_get_rootdir,$(1))/$(2) : $(3) mkdir -p $$(dir $$@) \ - cp -f $$ $$@ + cp -f $(if $(4),$(4),$(3)) $$@ endef @@ -159,6 +162,7 @@ endef # add a library from the solver; DO NOT use gb_Library_get_target define gb_Extension_add_library $(call gb_Extension_add_file,$(1),$(call gb_Library_get_runtime_filename,$(2)),\ + $(call gb_Library_get_target,$(2)),\ $(gb_Helper_OUTDIRLIBDIR)/$(call gb_Library_get_runtime_filename,$(2))) endef @@ -169,6 +173,7 @@ endef # add an executable from the solver define gb_Extension_add_executable $(call gb_Extension_add_file,$(1),$(notdir $(call gb_Executable_get_target,$(2))),\ + $(call gb_Executable_get_target,$(2)),\ $(call gb_Executable_get_target,$(2))) endef commit a57a3587250eb7219391ad858fcb8a2141bf075d Author: Michael Stahl mst...@redhat.com Date: Tue Jun 26 12:01:09 2012 +0200 gbuild: add gb_CppunitTest_use_executable and use it in sdext/CppunitTest_pdfimport.mk, which could fail previously in a parallel build. Change-Id: I3f251c945f5841c277a71a19fd411ecd77dec3b5 (cherry picked from commit 0d4cd11c74cf90cd3b987f628031d02fe3af47b4) Signed-off-by: Michael Stahl mst...@redhat.com diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk index fd0ebda..5dca559 100644 --- a/sdext/CppunitTest_pdfimport.mk +++ b/sdext/CppunitTest_pdfimport.mk @@ -65,6 +65,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sdext_pdfimport,\ sdext/source/pdfimport/test/tests \ )) +$(eval $(call gb_CppunitTest_use_executable,sdext_pdfimport,xpdfimport)) + $(eval $(call gb_CppunitTest_use_ure,sdext_pdfimport)) $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\ diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index b8b8672..bc522be 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -307,6 +307,10 @@ $(foreach extra,$(2),$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(extr endef +define gb_CppunitTest_use_executable +$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2)) +endef + define gb_CppunitTest__forward_to_Linktarget gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3),CppunitTest_$$(1)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: where are extras/source/templates/wizard/bitmap used ?
On Mon, 2012-06-25 at 16:29 +0100, Caolán McNamara wrote: Aha! From that Schedule thing I see a bunch of LocalHolidays macros with country names that nearly match the country graphics except that they all show a picture of the US in practice. Presumably that's where they were meant to be used. ... So I removed it :-) Lol :-) I love it. Nice cleanup, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [GSOC] ODS Row height import
On 26/06/12 10:35, Eike Rathke wrote: I'm not sure if we need to recalculate the row height in case of style:use-optimal-row-height but that is something we can figure out later. Except for this case I currently see no reason why we would need to calculate row height but Kohei or Eike may have an idea. I'm Cc'ing also Noel here, he lately tuned row heights for Excel import/export and might have some insights to share. unfortunately not, for the xlsx import is was simply a case of mimicing the binary import for Excel where we inhibit the Automatic row height during import ( as it results in differing row heights between orig imported document ), for export iirc it just was plain broken ( but don't remember any specific issue with optimal row heights ) I wish I had something more constructive to add :-( sorry Noel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - writerfilter/source
writerfilter/source/dmapper/DomainMapperTableManager.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 6b989477dc3d4b1c3296f65e18028090669cf9f2
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Jun 12 19:50:23 2012 +0200
Resolves: fdo#49178 CRASH when FILEOPEN particular RTF
(cherry picked from commit 104badf31c8a39994cadc460561bfa01e428b67b)
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Petr Mladek pmla...@suse.cz
Change-Id: Idd938980b91ec8b822a92dfd7013a20fe5b6f498
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index b4aaf3d..7403b42 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -486,8 +486,9 @@ void DomainMapperTableManager::endOfRowAction()
sal_Int16 nSum = 0;
sal_uInt32 nPos = 0;
+sal_uInt32 nSizeTableGrid = pTableGrid-size();
// Ignoring the i=0 case means we assume that the width of the last
cell matches the table width
-for (int i = m_nCell; i 1; i--)
+for (sal_uInt32 i = m_nCell; i 1 nSizeTableGrid = i; i--)
{
nSum += (*pTableGrid.get())[pTableGrid-size() - i]; // Size of
the current cell
pSeparators[nPos].Position = nSum * nFullWidthRelative /
nFullWidth; // Relative position
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 40 +++
1 file changed, 40 insertions(+)
New commits:
commit 89f208c0f634f3e6fb909c6f1510b0e4c31871f7
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 26 12:36:32 2012 +0200
n#766487 dmapper: FirstLineIndent should be always inherited from numbering
Change-Id: I1eb5946d23cd3ff635d436adbd59bf007333aa60
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 45dd5d3..5ecceba 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1043,8 +1043,44 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
case NS_ooxml::LN_CT_Ind_start:
case NS_ooxml::LN_CT_Ind_left:
if (m_pImpl-GetTopContext())
+{
+// Word inherits FirstLineIndent property of the numbering,
even if ParaLeftMargin is set, Writer does not.
+// So copy it explicitly, if necessary.
+PropertyMapPtr pContext = m_pImpl-GetTopContext();
+sal_Int32 nFirstLineIndent = 0;
+
+// See if we have a FirstLineIndent
+PropertyMap::iterator it = pContext-find(PropertyDefinition(
PROP_NUMBERING_RULES, true ) );
+uno::Referencecontainer::XIndexAccess xNumberingRules;
+if (it != pContext-end())
+xNumberingRules.set(it-second, uno::UNO_QUERY);
+it = pContext-find(PropertyDefinition( PROP_NUMBERING_LEVEL,
true ) );
+sal_Int32 nNumberingLevel = -1;
+if (it != pContext-end())
+it-second = nNumberingLevel;
+if (xNumberingRules.is() nNumberingLevel != -1)
+{
+uno::Sequencebeans::PropertyValue aProps;
+xNumberingRules-getByIndex(nNumberingLevel) = aProps;
+for (int i = 0; i aProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aProps[i];
+
+if (rProp.Name == FirstLineIndent)
+{
+rProp.Value = nFirstLineIndent;
+break;
+}
+}
+}
+
+// Then copy it over.
+if (nFirstLineIndent != 0)
+
m_pImpl-GetTopContext()-Insert(PROP_PARA_FIRST_LINE_INDENT, true,
uno::makeAny(nFirstLineIndent));
+
m_pImpl-GetTopContext()-Insert(
PROP_PARA_LEFT_MARGIN, true, uno::makeAny(
ConversionHelper::convertTwipToMM100(nIntValue ) ));
+}
break;
case NS_ooxml::LN_CT_Ind_end:
case NS_ooxml::LN_CT_Ind_right:
commit 6f93ad70a850e4a993565b9d02599d57ac06b8ec
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 26 10:58:27 2012 +0200
n#766487 dmapper: sprmCHpsBi should affect sprmCHps, if the later is not set
Change-Id: Ia6e097f9f93bcfe14392f5ef0245994752001f6c
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c11935d..45dd5d3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2059,7 +2059,11 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
double fVal = double(nIntValue) / 2.;
uno::Any aVal = uno::makeAny( fVal );
if( NS_sprm::LN_CHpsBi == nSprmId )
+{
rContext-Insert( PROP_CHAR_HEIGHT_COMPLEX, true, aVal );
+// Also set Western, but don't overwrite it.
+rContext-Insert( PROP_CHAR_HEIGHT, true, aVal, false );
+}
else
{
//Asian get the same value as Western
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED 3-5-5] Re: [PATCH] fix proposed for fdo#49178
Caolán McNamara píše v Po 25. 06. 2012 v 14:35 +0100: On Thu, 2012-06-21 at 15:13 -0700, julien2412 wrote: Sorry for having forgotten review tag :-( http://cgit.freedesktop.org/libreoffice/core/commit/?id=7588fa7a534a217e3949013b7c373fbb5503d466g=libreoffice-3-5 We might have missed the boat on this, but sure, +1 from me, and with the assumption that Miklos's push to 3-5 is an implicit +1 for 3-5-5, one more +1 is required for inclusion in 3-5-5. Heh, the code around is a bit curious. If nSizeTableGrid = i fails, the whole for cycle is skipped because it iterates via i--. It means that aSeparators is not initialized and some default values are used. I am not sure that we want it. Well, the patch solves the crasher. The test documents look reasonable with the fix = it is better than the current state = pushed into 3-5-5. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - libcmis/makefile.mk ooo.lst.in ucb/source
libcmis/makefile.mk |7
ooo.lst.in |2
ucb/source/ucp/cmis/cmis_content.cxx | 462 +++
ucb/source/ucp/cmis/cmis_content.hxx |2
4 files changed, 261 insertions(+), 212 deletions(-)
New commits:
commit 11066aca8ff0b0d4b84169f8d79b465579dbe616
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Tue Jun 26 12:49:09 2012 +0200
cmisucp: catch the exception when getting CMIS object
Fixes crashers like the one when cancelling authentication request.
The error message are still not meaningful for the user, but this would
require libcmis API changes.
Change-Id: I22afbf4d39522a2b0dbd043a68dfef2b9308dcec
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx
b/ucb/source/ucp/cmis/cmis_content.cxx
index 9159c64..bb6e1a0 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -209,25 +209,18 @@ namespace cmis
{
}
-libcmis::ObjectPtr Content::getObject( )
+libcmis::ObjectPtr Content::getObject( ) throw ( libcmis::Exception )
{
-try
+if ( !m_pObject.get() )
{
-if ( !m_pObject.get() )
+if ( !m_sObjectPath.isEmpty( ) )
+m_pObject = m_pSession-getObjectByPath( OUSTR_TO_STDSTR(
m_sObjectPath ) );
+else
{
-if ( !m_sObjectPath.isEmpty( ) )
-m_pObject = m_pSession-getObjectByPath( OUSTR_TO_STDSTR(
m_sObjectPath ) );
-else
-{
-m_pObject = m_pSession-getRootFolder( );
-m_sObjectPath = /;
-}
+m_pObject = m_pSession-getRootFolder( );
+m_sObjectPath = /;
}
}
-catch ( const libcmis::Exception e )
-{
-SAL_INFO( cmisucp, Unexpected exception: e.what() );
-}
return m_pObject;
}
@@ -240,8 +233,21 @@ namespace cmis
bool Content::isFolder(const uno::Reference ucb::XCommandEnvironment
xEnv )
{
-resetAuthProvider( xEnv );
-return getObject( )-getBaseType( ) == cmis:folder;
+bool bIsFolder = false;
+try
+{
+resetAuthProvider( xEnv );
+bIsFolder = getObject( )-getBaseType( ) == cmis:folder;
+}
+catch ( const libcmis::Exception e )
+{
+ucbhelper::cancelCommandExecution(
+ucb::IOErrorCode_GENERAL,
+uno::Sequence uno::Any ( 0 ),
+xEnv,
+rtl::OUString::createFromAscii( e.what() ) );
+}
+return bIsFolder;
}
uno::Any Content::getBadArgExcept()
@@ -267,111 +273,122 @@ namespace cmis
for( sal_Int32 n = 0; n nProps; ++n )
{
-const beans::Property rProp = pProps[ n ];
-
-if ( rProp.Name == IsDocument )
-{
-if ( getObject( ).get( ) )
-xRow-appendBoolean( rProp, getObject()-getBaseType( ) ==
cmis:document );
-else if ( m_pObjectType.get( ) )
-xRow-appendBoolean( rProp,
m_pObjectType-getBaseType()-getId( ) == cmis:document );
-else
-xRow-appendVoid( rProp );
-}
-else if ( rProp.Name == IsFolder )
-{
-if ( getObject( ).get( ) )
-xRow-appendBoolean( rProp, getObject()-getBaseType( ) ==
cmis:folder );
-else if ( m_pObjectType.get( ) )
-xRow-appendBoolean( rProp,
m_pObjectType-getBaseType()-getId( ) == cmis:folder );
-else
-xRow-appendVoid( rProp );
-}
-else if ( rProp.Name == Title )
+try
{
-rtl::OUString sTitle;
-if ( getObject().get() )
-sTitle = rtl::OUString::createFromAscii(
getObject()-getName().c_str( ) );
-else if ( m_pObjectProps.size() 0 )
+const beans::Property rProp = pProps[ n ];
+
+if ( rProp.Name == IsDocument )
{
-map string, libcmis::PropertyPtr ::iterator it =
m_pObjectProps.find( cmis:name );
-if ( it != m_pObjectProps.end( ) )
+if ( getObject( ).get( ) )
+xRow-appendBoolean( rProp, getObject()-getBaseType(
) == cmis:document );
+else if ( m_pObjectType.get( ) )
+xRow-appendBoolean( rProp,
m_pObjectType-getBaseType()-getId( ) == cmis:document );
+else
+xRow-appendVoid( rProp );
+}
+else if ( rProp.Name == IsFolder )
+{
+if ( getObject( ).get( ) )
+
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/filter/ww8/attributeoutputbase.hxx |2 +-
sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
sw/source/filter/ww8/docxattributeoutput.hxx |2 +-
sw/source/filter/ww8/rtfattributeoutput.cxx | 12
sw/source/filter/ww8/rtfattributeoutput.hxx |5 -
sw/source/filter/ww8/wrtw8nds.cxx|7 ---
sw/source/filter/ww8/ww8atr.cxx |2 +-
sw/source/filter/ww8/ww8attributeoutput.hxx |2 +-
8 files changed, 21 insertions(+), 13 deletions(-)
New commits:
commit d4069372484f18b242a42a1996767f57b031fff6
Author: Miklos Vajna vmik...@suse.cz
Date: Fri Jun 22 15:41:37 2012 +0200
fdo#50831 fix RTF export of direct run formatting for empty paragraphs
Change-Id: I5f0e7aefdea80bbb9cf61b991c5b706bd2023dfa
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 4b08cbf..c257a02 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -159,7 +159,7 @@ public:
virtual void EmptyParagraph() = 0;
/// Start of the text run.
-virtual void StartRun( const SwRedlineData* pRedlineData ) = 0;
+virtual void StartRun( const SwRedlineData* pRedlineData, bool
bSingleEmptyRun = false ) = 0;
/// End of the text run.
virtual void EndRun() = 0;
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0ea06b7..f8615c6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -499,7 +499,7 @@ void DocxAttributeOutput::EndParagraphProperties()
m_pSerializer-mergeTopMarks( sax_fastparser::MERGE_MARKS_PREPEND );
}
-void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
+void DocxAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool
/*bSingleEmptyRun*/ )
{
// if there is some redlining in the document, output it
StartRedline( pRedlineData );
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx
b/sw/source/filter/ww8/docxattributeoutput.hxx
index 79c8b02..12a87d4 100644
--- a/sw/source/filter/ww8/docxattributeoutput.hxx
+++ b/sw/source/filter/ww8/docxattributeoutput.hxx
@@ -90,7 +90,7 @@ public:
virtual void EndParagraphProperties();
/// Start of the text run.
-virtual void StartRun( const SwRedlineData* pRedlineData );
+virtual void StartRun( const SwRedlineData* pRedlineData, bool
bSingleEmptyRun = false );
/// End of the text run.
virtual void EndRun();
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 5019a40..0c3533b 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -374,11 +374,13 @@ void RtfAttributeOutput::EndParagraphProperties()
m_rExport.Strm() m_aStyles.makeStringAndClear().getStr();
}
-void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData )
+void RtfAttributeOutput::StartRun( const SwRedlineData* pRedlineData, bool
bSingleEmptyRun )
{
OSL_TRACE(%s, OSL_THIS_FUNC);
-m_aRun.append('{');
+m_bSingleEmptyRun = bSingleEmptyRun;
+if (!m_bSingleEmptyRun)
+m_aRun.append('{');
// if there is some redlining in the document, output it
Redline( pRedlineData );
@@ -391,7 +393,8 @@ void RtfAttributeOutput::EndRun()
OSL_TRACE(%s, OSL_THIS_FUNC);
m_aRun.append(m_rExport.sNewLine);
m_aRun.append(m_aRunText.makeStringAndClear());
-m_aRun.append('}');
+if (!m_bSingleEmptyRun)
+m_aRun.append('}');
}
void RtfAttributeOutput::StartRunProperties()
@@ -3020,7 +3023,8 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport
rExport )
m_bWroteCellInfo( false ),
m_bHadFieldResult( false ),
m_bTableRowEnded( false ),
-m_aCells()
+m_aCells(),
+m_bSingleEmptyRun(false)
{
OSL_TRACE(%s, OSL_THIS_FUNC);
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index eea4b8c..406f063 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -63,7 +63,7 @@ public:
virtual void EndParagraphProperties();
/// Start of the text run.
-virtual void StartRun( const SwRedlineData* pRedlineData );
+virtual void StartRun( const SwRedlineData* pRedlineData, bool
bSingleEmptyRun = false );
/// End of the text run.
virtual void EndRun();
@@ -539,6 +539,9 @@ private:
/// Number of cells from the table definition, by depth.
std::mapsal_uInt32,sal_uInt32 m_aCells;
+
+/// If we're in a paragraph that has a single empty run only.
+bool m_bSingleEmptyRun;
public:
RtfAttributeOutput( RtfExport rExport );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx
b/sw/source/filter/ww8/wrtw8nds.cxx
index
[PUSHED:3-5] fdo#50831 fix RTF export of direct run formatting for empty paragraphs
On Tue, 2012-06-26 at 10:00 +0200, Miklos Vajna wrote: Backport attached; also on gerrit: https://gerrit.libreoffice.org/237 Looks reasonable to me :-) Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sc/source
sc/source/core/tool/interpr1.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit e559fb28bbe65d98a7dcb4160db152d606332faa Author: Eike Rathke er...@redhat.com Date: Tue Jun 26 12:44:01 2012 +0200 resolved fdo#47222 in N() pop string constant before pushing result Change-Id: Ifd3313e45b838b3d9ab4dc8d0b4887f4836bb013 diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index fd44da1..42f6457 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2970,6 +2970,7 @@ void ScInterpreter::ScN() return; } case svString: +PopError(); PushDouble(0); return; default: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - sc/source
sc/source/core/tool/interpr1.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 483bba422442ba8a370d3b14d378d5d385d7dda2 Author: Eike Rathke er...@redhat.com Date: Tue Jun 26 12:44:01 2012 +0200 resolved fdo#47222 in N() pop string constant before pushing result Change-Id: Ifd3313e45b838b3d9ab4dc8d0b4887f4836bb013 (cherry picked from commit e559fb28bbe65d98a7dcb4160db152d606332faa) diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 34675c9..8177136 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -2871,6 +2871,7 @@ void ScInterpreter::ScN() return; } case svString: +PopError(); PushDouble(0); return; default: ___ 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 Bug 37361 depends on bug 49582, which changed state. Bug 49582 Summary: FILESAVE: Long delays saving in XP .XLS format https://bugs.freedesktop.org/show_bug.cgi?id=49582 What|Old Value |New Value Resolution||FIXED Status|UNCONFIRMED |RESOLVED -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
Re: Can #32260 and 51135 be closed? -- both: Request for account
On Tue, Jun 26, 2012 at 10:59:05AM +0100, Michael Meeks wrote: On Tue, 2012-06-26 at 01:55 +0200, Muhammad Haggag wrote: On 06/25/2012 05:56 PM, Philipp Riemer wrote: (2) Also Muhammad Haggag's request https://bugs.freedesktop.org/show_bug.cgi?id=51135 from 2012-06-15 is in UNCONFIRMED state. But here the situation seems to be different since I can only find three mails in total from him in Feb 2012 on the I'm actually interested :) Oh drat - did I really not create that ! Let me close these both out today - thanks for the heads up Philipp :-) And as penality you can review/cherry-pick Muhammads patch at: https://gerrit.libreoffice.org/#/c/236/ j/k ;) Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[REVIEW-3-5] revert http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=6c6a4ed070acc0b106e951864fa5d20927f5c1e0
Hey, we need to revert http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=6c6a4ed070acc0b106e951864fa5d20927f5c1e0 in 3-5. The patch is correct and does the right thing but sadly our cell export code is insane and therefore this patch makes our export incredibly slow if we have a whole formatted column. After looking into the code and my profiling results I see no easy solution for this problem and think that the performance problem is much worse than the bug this patch fixed. See fdo#49582 for a bug which is caused by this commit. I will also revert this commit in master and 3-6 because we will not be able to fix the underlying problem with a bit of refactoring of the export code. Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: shell/source
shell/source/unix/misc/senddoc.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 60845a6d213f7e84857608f828dbbfd5d1c69e58 Author: Peter Tillemans p...@snamellit.com Date: Tue Jun 26 12:20:36 2012 +0100 enable gnome-mail and xdg-mail Change-Id: Iba47ee76328aeb4734dbeb46322a9516b0ea9f7a diff --git a/shell/source/unix/misc/senddoc.sh b/shell/source/unix/misc/senddoc.sh index a18562b..f75e51d 100755 --- a/shell/source/unix/misc/senddoc.sh +++ b/shell/source/unix/misc/senddoc.sh @@ -208,7 +208,7 @@ case `basename $MAILER | sed 's/-.*$//'` in rm -f $BODY ;; -evolution) +evolution | gnome | xdg) # NB. shortened from the dash on while [ $1 != ]; do case $1 in ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] - Add support for gnome-mail to send documents from file menu.
Hi Peter, On Fri, 2012-06-15 at 23:40 +0200, Peter Tillemans wrote: Something like this : http://lists.freedesktop.org/archives/libreoffice/2012-June/033525.html Yes ! :-) Sorry for the delay, I just got around to merging that add you to the wiki in abit. it'd be nice to default to that too. Defaults live in officecfg/ and/or come from some system detection logic somewhere - keys to git grep for might be ExternalMailer, CommandProfile etc. I am trying to wrap my head around the default configuration. As it seems on Linux xdg-email works on all common desktop environments, at least the ones which also have a libreoffice autodetect driver. Then the autodetect can be shortcircuited and xdg-email used as default. Yep - sounds sensible. However I am going to need some more study to change the default. Any progress there ? :-) If you can change the setting in the UI; then storing your ~/.config/libreoffice before and after, and doing a diff -ur (perhaps with some xmllint --format magic) can often help pinpoint the exact place in officecfg/ to poke at. Thanks ! Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: libcmis/boost-win.patch
libcmis/boost-win.patch | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) New commits: commit 4f25eb2c4eb7b5ce265eefe25a5ab84a39daf574 Author: Cédric Bosdonnat cedric.bosdon...@free.fr Date: Tue Jun 26 13:29:53 2012 +0200 libcmis: forgot to update windows patch for 0.2.3 Change-Id: I7ea63acbe2f75f1e53611d75a6adc14c2bcac887 diff --git a/libcmis/boost-win.patch b/libcmis/boost-win.patch index fde29df..b794787 100644 --- a/libcmis/boost-win.patch +++ b/libcmis/boost-win.patch @@ -1,5 +1,5 @@ misc/libcmis-0.2.2/src/libcmis/atom-object.cxx 2012-06-01 07:44:26.0 -0600 -+++ misc/build/libcmis-0.2.2/src/libcmis/atom-object.cxx 2012-06-04 07:52:24.131190200 -0600 +--- misc/libcmis-0.2.3/src/libcmis/atom-object.cxx 2012-06-01 07:44:26.0 -0600 misc/build/libcmis-0.2.3/src/libcmis/atom-object.cxx 2012-06-04 07:52:24.131190200 -0600 @@ -29,6 +29,9 @@ #include algorithm #include sstream @@ -10,8 +10,8 @@ #include boost/date_time/posix_time/posix_time.hpp #include atom-object.hxx misc/libcmis-0.2.2/src/libcmis/object.hxx 2012-06-01 07:38:36.0 -0600 -+++ misc/build/libcmis-0.2.2/src/libcmis/object.hxx2012-06-04 07:52:21.900386200 -0600 +--- misc/libcmis-0.2.3/src/libcmis/object.hxx 2012-06-01 07:38:36.0 -0600 misc/build/libcmis-0.2.3/src/libcmis/object.hxx2012-06-04 07:52:21.900386200 -0600 @@ -32,6 +32,9 @@ #include map #include string @@ -22,8 +22,8 @@ #include boost/date_time.hpp #include boost/shared_ptr.hpp misc/libcmis-0.2.2/src/libcmis/property-type.hxx 2012-02-17 08:00:50.0 -0700 -+++ misc/build/libcmis-0.2.2/src/libcmis/property-type.hxx 2012-06-04 07:52:17.157977900 -0600 +--- misc/libcmis-0.2.3/src/libcmis/property-type.hxx 2012-02-17 08:00:50.0 -0700 misc/build/libcmis-0.2.3/src/libcmis/property-type.hxx 2012-06-04 07:52:17.157977900 -0600 @@ -28,6 +28,9 @@ #ifndef _PROPERTY_TYPE_HXX_ #define _PROPERTY_TYPE_HXX_ @@ -34,8 +34,8 @@ #include boost/date_time.hpp #include libxml/tree.h misc/libcmis-0.2.2/src/libcmis/property.hxx2012-02-17 06:38:33.0 -0700 -+++ misc/build/libcmis-0.2.2/src/libcmis/property.hxx 2012-06-04 07:52:19.388781800 -0600 +--- misc/libcmis-0.2.3/src/libcmis/property.hxx2012-02-17 06:38:33.0 -0700 misc/build/libcmis-0.2.3/src/libcmis/property.hxx 2012-06-04 07:52:19.388781800 -0600 @@ -31,6 +31,9 @@ #include libxml/tree.h #include libxml/xmlwriter.h @@ -46,8 +46,8 @@ #include boost/date_time.hpp #include boost/shared_ptr.hpp misc/libcmis-0.2.2/src/libcmis/xml-utils.hxx 2012-05-30 06:17:12.0 -0600 -+++ misc/build/libcmis-0.2.2/src/libcmis/xml-utils.hxx 2012-06-04 07:52:10.621566400 -0600 +--- misc/libcmis-0.2.3/src/libcmis/xml-utils.hxx 2012-05-30 06:17:12.0 -0600 misc/build/libcmis-0.2.3/src/libcmis/xml-utils.hxx 2012-06-04 07:52:10.621566400 -0600 @@ -30,6 +30,9 @@ #include string ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gerrit review patch query helper...
Hi, sorry for shameless self-plugs but I think this tool has become really useful now: querrit can perform easy queries and code review. It provides shortcuts and convenience features. For example: gerrit query mine lists all open review requests that were submitted by me. (achieved by putting [shortcuts] mine = status:open project:core sebast...@sspaeth.de into ~/.config/querrit.conf) gerrit query writer You can easily do similar things for easy monitoring requests for specific git branches, where you have been CC'd etc... A typical review looks like: gerrit review 2a34e2 +2 -m looks good to me See the README for the full documentation https://gitorious.org/querrit/querrit/blobs/master/README The code is at git://gitorious.org/querrit/querrit.git and requires Python3 or Python 2.7. Sebastian pgpqA7IGUfq6Q.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5-5] Re: [PATCH] fix proposed for fdo#49178
Petr Mladek wrote Heh, the code around is a bit curious. If nSizeTableGrid = i fails, the whole for cycle is skipped because it iterates via i--. It means that aSeparators is not initialized and some default values are used. I am not sure that we want it. ... Petr you must be right, I thought about the fact it could be just a workaround but wasn't sure, see http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-49178-tp3989525p3989716.html If you have an idea about the real fix, don't hesitate. I recognize I've got no idea what it could be :-( Julien -- View this message in context: http://nabble.documentfoundation.org/PATCH-fix-proposed-for-fdo-49178-tp3989525p3992335.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: Gerrit review patch query helper...
Sebastian Spaeth sebast...@sspaeth.de writes: querrit can perform easy queries and code review. It provides shortcuts and convenience features. For example: got my examples wrong. Obviously gerrit query mine -- querrit query mine While at it, one last example that is nice (all open patches mentioning fdo#35673 in the commit message): gerrit query MAB3.4 [shortcuts] MAB3.4 = status:open project:core message:fdo.35673 new_unrev = status:open age:1d not is:reviewed pgpIw4eFiyZIy.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - extensions/source
extensions/source/abpilot/typeselectionpage.cxx | 49 +++-
1 file changed, 32 insertions(+), 17 deletions(-)
New commits:
commit a8687f47793afbf4b6a837e769ef2de31c3f0b36
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 26 13:31:16 2012 +0100
Resolves: fdo#50967 Address DataSource dialog fails on throws
e.g. kde3 address book support is built in, but loaded
on system without kde3 libs
Change-Id: I0be27eeab3fce8f26fca203d61c67693b880fb3b
diff --git a/extensions/source/abpilot/typeselectionpage.cxx
b/extensions/source/abpilot/typeselectionpage.cxx
index aee5219..065c11b 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -67,34 +67,49 @@ namespace abp
aItemSize.Width() = GetOutputSizePixel().Width() - 30;
bool bWithMozilla = true, bUnx = true;
-bool bHaveEvolution = true, bHaveKab = true;
-bool bHaveMacab = true;
+bool bHaveEvolution = false, bHaveKab = false;
+bool bHaveMacab = false;
#if !defined WITH_MOZILLA || defined MACOSX
bWithMozilla = false;
#endif
#ifndef UNX
bUnx = false;
-bHaveEvolution = false;
-bHaveKab = false;
-bHaveMacab = false;
#else
Reference XDriverAccess
xManager(_pParent-getORB()-createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(com.sun.star.sdbc.DriverManager))),
UNO_QUERY);
-// check whether Evolution is available
-Reference XDriver xDriver(
xManager-getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdbc:address:evolution:local)))
);
-if ( !xDriver.is() )
-bHaveEvolution = false;
+try
+{
+// check whether Evolution is available
+Reference XDriver xDriver(
xManager-getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdbc:address:evolution:local)))
);
+if ( xDriver.is() )
+bHaveEvolution = true;
+}
+catch (...)
+{
+}
// check whether KDE address book is available
-xDriver =
xManager-getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdbc:address:kab)));
-if ( !xDriver.is() )
-bHaveKab = false;
-
-// check whether Mac OS X address book is available
-xDriver =
xManager-getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdbc:address:macab)));
-if ( !xDriver.is() )
-bHaveMacab = false;
+try
+{
+Reference XDriver xDriver(
xManager-getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdbc:address:kab)))
);
+if ( xDriver.is() )
+bHaveKab = true;
+}
+catch (...)
+{
+}
+
+try
+{
+// check whether Mac OS X address book is available
+Reference XDriver xDriver(
xManager-getDriverByURL(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(sdbc:address:macab)))
);
+if ( xDriver.is() )
+bHaveMacab = true;
+}
+catch(...)
+{
+}
#endif
// Items are displayed in list order
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - writerfilter/source
writerfilter/source/dmapper/DomainMapper.cxx | 40 +++
1 file changed, 40 insertions(+)
New commits:
commit 81390a6e8c17dc1a48a34e57ab3b7e1b16a10a94
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 26 12:36:32 2012 +0200
n#766487 dmapper: FirstLineIndent should be always inherited from numbering
Change-Id: I1eb5946d23cd3ff635d436adbd59bf007333aa60
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 45dd5d3..5ecceba 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1043,8 +1043,44 @@ void DomainMapper::lcl_attribute(Id nName, Value val)
case NS_ooxml::LN_CT_Ind_start:
case NS_ooxml::LN_CT_Ind_left:
if (m_pImpl-GetTopContext())
+{
+// Word inherits FirstLineIndent property of the numbering,
even if ParaLeftMargin is set, Writer does not.
+// So copy it explicitly, if necessary.
+PropertyMapPtr pContext = m_pImpl-GetTopContext();
+sal_Int32 nFirstLineIndent = 0;
+
+// See if we have a FirstLineIndent
+PropertyMap::iterator it = pContext-find(PropertyDefinition(
PROP_NUMBERING_RULES, true ) );
+uno::Referencecontainer::XIndexAccess xNumberingRules;
+if (it != pContext-end())
+xNumberingRules.set(it-second, uno::UNO_QUERY);
+it = pContext-find(PropertyDefinition( PROP_NUMBERING_LEVEL,
true ) );
+sal_Int32 nNumberingLevel = -1;
+if (it != pContext-end())
+it-second = nNumberingLevel;
+if (xNumberingRules.is() nNumberingLevel != -1)
+{
+uno::Sequencebeans::PropertyValue aProps;
+xNumberingRules-getByIndex(nNumberingLevel) = aProps;
+for (int i = 0; i aProps.getLength(); ++i)
+{
+const beans::PropertyValue rProp = aProps[i];
+
+if (rProp.Name == FirstLineIndent)
+{
+rProp.Value = nFirstLineIndent;
+break;
+}
+}
+}
+
+// Then copy it over.
+if (nFirstLineIndent != 0)
+
m_pImpl-GetTopContext()-Insert(PROP_PARA_FIRST_LINE_INDENT, true,
uno::makeAny(nFirstLineIndent));
+
m_pImpl-GetTopContext()-Insert(
PROP_PARA_LEFT_MARGIN, true, uno::makeAny(
ConversionHelper::convertTwipToMM100(nIntValue ) ));
+}
break;
case NS_ooxml::LN_CT_Ind_end:
case NS_ooxml::LN_CT_Ind_right:
commit 2869ff93a839c0aa6a9972c550d70a7cd364501b
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 26 10:58:27 2012 +0200
n#766487 dmapper: sprmCHpsBi should affect sprmCHps, if the later is not set
Change-Id: Ia6e097f9f93bcfe14392f5ef0245994752001f6c
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index c11935d..45dd5d3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2059,7 +2059,11 @@ void DomainMapper::sprmWithProps( Sprm rSprm,
PropertyMapPtr rContext, SprmType
double fVal = double(nIntValue) / 2.;
uno::Any aVal = uno::makeAny( fVal );
if( NS_sprm::LN_CHpsBi == nSprmId )
+{
rContext-Insert( PROP_CHAR_HEIGHT_COMPLEX, true, aVal );
+// Also set Western, but don't overwrite it.
+rContext-Insert( PROP_CHAR_HEIGHT, true, aVal, false );
+}
else
{
//Asian get the same value as Western
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/source
vcl/source/window/menu.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit e09b973aa21fcdc85edf94ce17a94559ccfadceb
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 26 13:32:24 2012 +0200
Fix more bugs in ImplgetTopDockingAreaHeight().
- fixed infinite loop (calling next in an 'else' is a bad idea)
- there may be more top docking areas, pick the one with != 0 height
Change-Id: I4892a655e25efff4d7282c5106ba238f94586374
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 0fff3c3..3b4ac0d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -875,15 +875,18 @@ static int ImplGetTopDockingAreaHeight( Window *pWindow )
if ( pChildWin-GetType() == WINDOW_DOCKINGAREA )
pDockingArea = static_cast DockingAreaWindow* (
pChildWin );
-if( pDockingArea pDockingArea-GetAlign() ==
WINDOWALIGN_TOP pDockingArea-IsVisible() )
+if( pDockingArea pDockingArea-GetAlign() ==
WINDOWALIGN_TOP
+pDockingArea-IsVisible()
pDockingArea-GetOutputSizePixel().Height() != 0 )
+{
return pDockingArea-GetOutputSizePixel().Height();
-else
-pChildWin = pChildWin-GetWindow( WINDOW_NEXT );
//mpWindowImpl-mpNext;
+}
+
+pChildWin = pChildWin-GetWindow( WINDOW_NEXT );
//mpWindowImpl-mpNext;
}
}
-else
-pWin = pWin-GetWindow( WINDOW_NEXT ); //mpWindowImpl-mpNext;
+
+pWin = pWin-GetWindow( WINDOW_NEXT ); //mpWindowImpl-mpNext;
}
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/source
vcl/source/window/menu.cxx | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 76ec145c75790b8c6407959fda962626c1b963dc
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 26 13:32:24 2012 +0200
Fix more bugs in ImplgetTopDockingAreaHeight().
- fixed infinite loop (calling next in an 'else' is a bad idea)
- there may be more top docking areas, pick the one with != 0 height
Change-Id: I4892a655e25efff4d7282c5106ba238f94586374
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 0fff3c3..3b4ac0d 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -875,15 +875,18 @@ static int ImplGetTopDockingAreaHeight( Window *pWindow )
if ( pChildWin-GetType() == WINDOW_DOCKINGAREA )
pDockingArea = static_cast DockingAreaWindow* (
pChildWin );
-if( pDockingArea pDockingArea-GetAlign() ==
WINDOWALIGN_TOP pDockingArea-IsVisible() )
+if( pDockingArea pDockingArea-GetAlign() ==
WINDOWALIGN_TOP
+pDockingArea-IsVisible()
pDockingArea-GetOutputSizePixel().Height() != 0 )
+{
return pDockingArea-GetOutputSizePixel().Height();
-else
-pChildWin = pChildWin-GetWindow( WINDOW_NEXT );
//mpWindowImpl-mpNext;
+}
+
+pChildWin = pChildWin-GetWindow( WINDOW_NEXT );
//mpWindowImpl-mpNext;
}
}
-else
-pWin = pWin-GetWindow( WINDOW_NEXT ); //mpWindowImpl-mpNext;
+
+pWin = pWin-GetWindow( WINDOW_NEXT ); //mpWindowImpl-mpNext;
}
}
return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED partial][PATCH] Prevent print settings dialog to show help button when it's called from help window
Hello,
0003 : some rewriting of SfxViewShell::ExecPrint_Impl ; add some
comments, prevent a segfault (NULL pointer dereferencing ; add return
after rReq.SetReturnValue(SfxBoolItem(0,sal_False))
0004 : Prevent the printer settings dialog to show help button when it's
called from a help window.
I guess we'll leave the other two until your updated patches. Right ?,
or is 0004 still valid ?
Here is the a new 0003 and 0004 without the bug.
Regards
--
Maxime de Roucy
Groupe LINAGORA - OSSA
80 rue Roque de Fillol
92800 PUTEAUX
Tel. : 0033(0)642004909
Le lundi 25 juin 2012 à 16:56 +0100, Caolán McNamara a écrit :
On Tue, 2012-06-19 at 16:05 +0200, Maxime de Roucy wrote:
Hello,
Here is some patchs :
0001 : one line, code simplification.
I've pushed this one anyway.
0002 : explicite NULL or 0 comparison in if. I don't know if LibreOffice
have a coding standard about that type of comparison ?
meh, I don't think we have any coding standards around it. But I'd skip
this one as in the absence of a coding standard I don't see the value in
swapping from one equally valid syntax to another.
0003 : some rewriting of SfxViewShell::ExecPrint_Impl ; add some
comments, prevent a segfault (NULL pointer dereferencing ; add return
after rReq.SetReturnValue(SfxBoolItem(0,sal_False))
0004 : Prevent the printer settings dialog to show help button when it's
called from a help window.
I guess we'll leave the other two until your updated patches. Right ?,
or is 0004 still valid ?
C.
From 221450ef23f6984a87c7a6ac4ddcc85a7a622c63 Mon Sep 17 00:00:00 2001
From: Maxime de Roucy mdero...@linagora.com
Date: Tue, 26 Jun 2012 15:00:38 +0200
Subject: [PATCH 1/2] Some rewriting in SfxViewShell::ExecPrint_Impl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* add comments
* reorganise if statement
* use of the IsAPI function
* prevent segfault (NULL pointer dereferencing)
Change-Id: Ib26399b297aa991e37825f0b3d31574ff1253d4f
---
sfx2/source/view/viewprn.cxx | 85
1 file changed, 47 insertions(+), 38 deletions(-)
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index a8c19a2..fb3b9fd 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -137,7 +137,7 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptrPrinter i_
// initialize extra ui options
if( mxRenderable.is() )
{
-for (sal_Int32 nProp=0; nProprProps.getLength(); nProp++)
+for (sal_Int32 nProp=0; nProp rProps.getLength(); nProp++)
setValue( rProps[nProp].Name, rProps[nProp].Value );
Sequence beans::PropertyValue aRenderOptions( 3 );
@@ -654,15 +654,21 @@ Printer* SfxViewShell::GetActivePrinter() const
void SfxViewShell::ExecPrint_Impl( SfxRequest rReq )
{
-sal_uInt16 nDialogRet = RET_CANCEL;
+sal_uInt16 nDialogRet = RET_CANCEL;
SfxPrinter* pPrinter = 0;
SfxDialogExecutor_Impl* pExecutor = 0;
boolbSilent = false;
-sal_Bool bIsAPI = rReq.GetArgs() rReq.GetArgs()-Count();
+
+// does the function have been called by the user interface or by an API call
+sal_Bool bIsAPI = rReq.IsAPI();
if ( bIsAPI )
{
+// the function have been called by the API
+
+// Should it be visible on the user interface,
+// should it launch popup dialogue ?
SFX_REQUEST_ARG(rReq, pSilentItem, SfxBoolItem, SID_SILENT, sal_False);
-bSilent = pSilentItem pSilentItem-GetValue();
+bSilent = ( pSilentItem != NULL pSilentItem-GetValue() );
}
//FIXME: how to transport bPrintOnHelp?
@@ -678,27 +684,20 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest rReq )
const sal_uInt16 nId = rReq.GetSlot();
switch( nId )
{
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-case SID_PRINTDOC:
-case SID_PRINTDOCDIRECT:
+case SID_PRINTDOC: // display the printer selection and properties dialogue : File Print…
+case SID_PRINTDOCDIRECT: // Print the document directly, without displaying the dialogue
{
SfxObjectShell* pDoc = GetObjectShell();
// derived class may decide to abort this
-if( !pDoc-QuerySlotExecutable( nId ) )
+if( pDoc == NULL || !pDoc-QuerySlotExecutable( nId ) )
{
rReq.SetReturnValue( SfxBoolItem( 0, sal_False ) );
return;
}
-bool bDetectHidden = ( !bSilent pDoc );
-if ( bDetectHidden pDoc-QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES )
-break;
-
-SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, sal_False);
-sal_Bool bSelection = pSelectItem pSelectItem-GetValue();
-if( pSelectItem
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/file_library_ooo.scp | 62 +-- 1 file changed, 31 insertions(+), 31 deletions(-) New commits: commit 13b6a02ed34e469faa2530537b1595e7f06459d3 Author: Caolán McNamara caol...@redhat.com Date: Tue Jun 26 14:08:16 2012 +0100 move the nss stuff in scp2 to be dependent on xmlsec Change-Id: Icb6d5cbc00135559b2e7b85a3c627dad974834a5 diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 117f6d6..b1c38c3 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1326,37 +1326,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) #endif #endif -#ifndef SYSTEM_NSS -SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3) -SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3) -SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4) -SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3) -SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3) -SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi) -SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4) -SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4) -SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3) -SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3) -#ifdef WNT -SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) -#else -/* - For MacOSX = 10.6 we can apparently use the system sqlite. - - For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration - of the build to avoid #i106132#. Now we need to put it into the program dir of - the install. -*/ -#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED 1060) -File gid_File_Lib_Sqlite3 -Name = sqlite/ SPECIAL_NAME(sqlite3); -PACKED_LIB_FILE_BODY; -End -#endif -#endif -SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) -#endif - SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1) @@ -1497,6 +1466,37 @@ File gid_File_Lib_XSec_XmlSec Styles = (PACKED); End +#ifndef SYSTEM_NSS +SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3) +SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3) +SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4) +SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3) +SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3) +SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi) +SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4) +SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4) +SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3) +SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3) +#ifdef WNT +SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) +#else +/* + For MacOSX = 10.6 we can apparently use the system sqlite. + + For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration + of the build to avoid #i106132#. Now we need to put it into the program dir of + the install. +*/ +#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED 1060) +File gid_File_Lib_Sqlite3 +Name = sqlite/ SPECIAL_NAME(sqlite3); +PACKED_LIB_FILE_BODY; +End +#endif +#endif +SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) +#endif + #ifdef WNT File gid_File_Lib_LibXMLSec_xmlseccore LIB_FILE_BODY; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/qa
sw/qa/extras/ooxmltok/data/n766487.docx |binary
sw/qa/extras/ooxmltok/ooxmltok.cxx | 35
2 files changed, 35 insertions(+)
New commits:
commit b776233cba128bd7610834691da612b2b1a438a0
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 26 15:07:38 2012 +0200
n#766487 testcases
Change-Id: I75c7913141461b354e85889faa6d43a1033680ef
diff --git a/sw/qa/extras/ooxmltok/data/n766487.docx
b/sw/qa/extras/ooxmltok/data/n766487.docx
new file mode 100644
index 000..85eda0e
Binary files /dev/null and b/sw/qa/extras/ooxmltok/data/n766487.docx differ
diff --git a/sw/qa/extras/ooxmltok/ooxmltok.cxx
b/sw/qa/extras/ooxmltok/ooxmltok.cxx
index 1d1bbb1..ce4a911 100644
--- a/sw/qa/extras/ooxmltok/ooxmltok.cxx
+++ b/sw/qa/extras/ooxmltok/ooxmltok.cxx
@@ -46,6 +46,8 @@
#include vcl/svapp.hxx
+#define TWIP_TO_MM100(TWIP) ((TWIP) = 0 ? (((TWIP)*127L+36L)/72L) :
(((TWIP)*127L-36L)/72L))
+
using rtl::OString;
using rtl::OUString;
using rtl::OUStringBuffer;
@@ -72,6 +74,7 @@ public:
void testN766477();
void testN758883();
void testN766481();
+void testN766487();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -94,6 +97,7 @@ public:
CPPUNIT_TEST(testN766477);
CPPUNIT_TEST(testN758883);
CPPUNIT_TEST(testN766481);
+CPPUNIT_TEST(testN766487);
#endif
CPPUNIT_TEST_SUITE_END();
@@ -626,6 +630,37 @@ void Test::testN766481()
CPPUNIT_ASSERT_EQUAL(sal_False, xParaEnum-hasMoreElements());
}
+void Test::testN766487()
+{
+/*
+ * The problem was that 1) the font size of the first para was too large
2) numbering had no first-line-indent.
+ *
+ * oParas = ThisComponent.Text.createEnumeration
+ * oPara = oParas.nextElement
+ * oRuns = oPara.createEnumeration
+ * oRun = oRuns.nextElement
+ * xray oRun.CharHeight ' 12, was larger
+ * oPara = oParas.nextElement
+ * xray oPara.ParaFirstLineIndent ' -635, was 0
+ */
+load(n766487.docx);
+uno::Referencetext::XTextDocument xTextDocument(mxComponent,
uno::UNO_QUERY);
+uno::Referencecontainer::XEnumerationAccess
xParaEnumAccess(xTextDocument-getText(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration
xParaEnum(xParaEnumAccess-createEnumeration());
+
+uno::Referencecontainer::XEnumerationAccess
xRunEnumAccess(xParaEnum-nextElement(), uno::UNO_QUERY);
+uno::Referencecontainer::XEnumeration
xRunEnum(xRunEnumAccess-createEnumeration());
+uno::Referencebeans::XPropertySet xPropertySet(xRunEnum-nextElement(),
uno::UNO_QUERY);
+float fValue = 0;
+xPropertySet-getPropertyValue(CharHeight) = fValue;
+CPPUNIT_ASSERT_EQUAL(12.f, fValue);
+
+xPropertySet.set(xParaEnum-nextElement(), uno::UNO_QUERY);
+sal_Int32 nValue = 0;
+xPropertySet-getPropertyValue(ParaFirstLineIndent) = nValue;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(-360)), nValue);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Gerrit review patch query helper...
Hi, On Tue, Jun 26, 2012 at 01:35:14PM +0200, Sebastian Spaeth wrote: Hi, sorry for shameless self-plugs but I think this tool has become really useful now: I love all these tooling efforts, but I really think we should coordinate them more as changing the developer docs too often will just create frustrations on its own. So the timeline in my head looks something like this: - before switch: let devs learn their way around gerrit itself and only do minor tweaks to the workflows, additional scripting can evolve outside the core repo - end of July: switch to gerrit as main repo - end of August: hope every dev has a somewhat qualified opinion on the available tooling/scripting sets and maybe switch to one of the gerrit wrappers by default (updating the docs along the way and puuting it in core) So, I hope you and David are not too disappointed, if I hope for the scripts to foster outside the core-repo (at least those requiring updating the docs) for some time. Is that ok with you? What we urgently need inside the current solution is inegration of mailinglists and IRC. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: desktop/source extensions/source forms/source padmin/source writerperfect/source xmloff/inc
desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx |9
---
desktop/source/deployment/inc/dp_version.hxx |3 --
desktop/source/deployment/registry/component/dp_compbackenddb.hxx |7 -
desktop/source/deployment/registry/package/dp_extbackenddb.hxx|7 -
desktop/source/migration/services/oo3extensionmigration.hxx |3 --
extensions/source/bibliography/formcontrolcontainer.hxx |2 -
extensions/source/config/ldap/ldapaccess.hxx |2 -
extensions/source/propctrlr/fontdialog.hxx|3 --
extensions/source/propctrlr/genericpropertyhandler.hxx|1
extensions/source/propctrlr/propcontroller.hxx|3 --
extensions/source/propctrlr/xsddatatypes.hxx |1
extensions/source/update/check/updatecheck.hxx|1
forms/source/component/ListBox.hxx|7 -
forms/source/component/imgprod.hxx|2 -
forms/source/richtext/richtextcontrol.hxx |1
forms/source/xforms/convert.hxx |1
forms/source/xforms/model.hxx |1
forms/source/xforms/propertysetbase.hxx |1
padmin/source/padialog.hxx|1
writerperfect/source/filter/ListStyle.hxx |2 -
writerperfect/source/filter/TableStyle.hxx|1
writerperfect/source/filter/TextRunStyle.hxx |2 -
xmloff/inc/SchXMLExport.hxx | 12
--
xmloff/inc/txtflde.hxx|1
xmloff/inc/xexptran.hxx |1
25 files changed, 75 deletions(-)
New commits:
commit d57d3c3454d46ac347c144c169abefb2c404975f
Author: Takeshi Abe t...@fixedpoint.jp
Date: Tue Jun 26 22:48:18 2012 +0900
removed unnecessary forward declarations of class
Change-Id: Id08393f66797ef1c4378c8f3549d0900d4f1c7ec
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
index 2cc8a25..d1e4e44 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx
@@ -37,17 +37,8 @@ namespace com { namespace sun { namespace star { namespace
deployment {
namespace com { namespace sun { namespace star { namespace uno {
class XComponentContext;
-namespace com { namespace sun { namespace star { namespace xml { namespace dom
{
-class XNode;
-}
-namespace com { namespace sun { namespace star { namespace xml { namespace
xpath {
-class XXPathAPI;
-}
class Window;
-namespace osl {
-class Condition;
-}
namespace dp_gui {
diff --git a/desktop/source/deployment/inc/dp_version.hxx
b/desktop/source/deployment/inc/dp_version.hxx
index 860e311..be88cb0 100644
--- a/desktop/source/deployment/inc/dp_version.hxx
+++ b/desktop/source/deployment/inc/dp_version.hxx
@@ -24,9 +24,6 @@
#include com/sun/star/uno/Reference.hxx
#include dp_misc_api.hxx
-namespace com { namespace sun { namespace star { namespace deployment {
-class XPackage;
-} } } }
namespace rtl { class OUString; }
namespace dp_misc {
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index b763725..8acc9f1 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -32,13 +32,6 @@ namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
}
-namespace xml { namespace dom {
-class XDocument;
-class XNode;
-}}
-namespace xml { namespace xpath {
-class XXPathAPI;
-}}
}}}
namespace dp_registry {
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index d3962d9..8825fbd 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -33,13 +33,6 @@ namespace com { namespace sun { namespace star {
namespace uno {
class XComponentContext;
}
-namespace xml { namespace dom {
-class XDocument;
-class XNode;
-}}
-namespace xml { namespace xpath {
-class XXPathAPI;
-}}
}}}
namespace dp_registry {
diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx
b/desktop/source/migration/services/oo3extensionmigration.hxx
Re: [PUSHED] Use hyphen for copyright range in About box
Michael Meeks wrote: [swag artwork] Wow - that's great work too - I believe Thorsten (or Bubli?) was digging at web stores and the like for swag at some stage - but I forget what the final outcome was. It meanwhile went to Leif, then to Simon. Kendy was then actually doing the stuff for FOSDEM. ;) Cheers, -- Thorsten pgphtyX5lZJud.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED] Use hyphen for copyright range in About box
Hi Robinson, On 2012-06-26 at 15:51 +0200, Thorsten Behrens wrote: [swag artwork] Wow - that's great work too - I believe Thorsten (or Bubli?) was digging at web stores and the like for swag at some stage - but I forget what the final outcome was. It meanwhile went to Leif, then to Simon. Kendy was then actually doing the stuff for FOSDEM. ;) If I get details, I guess I could get you a permission from the FOSDEM t-shirt author to use that. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.5.2'
Tag 'libreoffice-3.5.5.2' created by Petr Mladek pmla...@suse.cz at 2012-06-26 14:50 -0700 Tag libreoffice-3.5.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP6b4uAAoJEPQ0oe+v7q6jM3kQAJC3OHv9BDE88Bq58onVvkuL kGfFZtG+K3CZf/g5ujttRWdHMcwMPMOaAQ0yKlNovC8+eAeFKgT+QaXr8DB//six KsBDWV/arnGHTAQfp+TIjqSTmKFX8Hxwfykm0KQnbDwik8bJxsBiD8a6xUNDwy3y nfY+wEF5uuNQansZvnIhS9G1APRk86mQtdl2udGJEXmdbVZ3Qnyl3QtYEFM5CgTC +nLt3JPanbM3SWZ6Hjd7GsU1jej/cYLx2V2wQUoF3hpoJqn+3J0t9nPJbuyZn9qY MXuFh7WKz8CikYpSia/z1+r+kZFsCCJXWAAh8PmGU9IX3ixquavDwr6pBc2bXjCr c9AnM4UvI2HThX4CEsOEhKR4fWw7E7ZMiwNG4tS1S2vJm/tDozv3iGBsjHwCKCkY R8AhKmxyjwsVz4lyCfT2qiJ8RZM6wLMvwIvIdld2A+a+469blIYlh69fYl+NIqKX jBd6Yo7hTcXwc7HXUc3MOJstSbYm4s4hqvId7jl99P434sslozRQGk8hl0mSBRnT vLuzAoIPgqVX4+73cA1jT1iaFmW42shLpLT1B3bRQhJo8FiTOOlU7VoOEY9exQ0V ac8WJI3f9VL9zDvqpkRZTO1pIL6BPQW4QSuaN6wPfyggYLnVf6TDuswFOKt0RY4z xb2mRh+C9l5stKrSxdUc =tkur -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-1363: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - scp2/source sfx2/inc sfx2/source
scp2/source/ooo/file_library_ooo.scp | 65 ++-
sfx2/inc/sfx2/tabdlg.hxx |4 ++
sfx2/source/dialog/tabdlg.cxx| 19 --
3 files changed, 53 insertions(+), 35 deletions(-)
New commits:
commit 58548484f734596a43dffa2810812fee42252437
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 26 14:31:12 2012 +0100
save tabdialog settings in dtor as well as ::Ok
Change-Id: Ia279c7cf6e319cba8ee185fd7158f7aa7b504008
diff --git a/sfx2/inc/sfx2/tabdlg.hxx b/sfx2/inc/sfx2/tabdlg.hxx
index 36d7891..aa77164 100644
--- a/sfx2/inc/sfx2/tabdlg.hxx
+++ b/sfx2/inc/sfx2/tabdlg.hxx
@@ -119,6 +119,10 @@ protected:
*/
bool PrepareLeaveCurrentPage();
+/** save the position of the TabDialog and which tab page is the currently
active one
+ */
+void SavePosAndId();
+
public:
SfxTabDialog( Window* pParent, const ResId rResId, const SfxItemSet * = 0,
sal_Bool bEditFmt = sal_False, const String *pUserButtonText
= 0 );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 5d84118..342dc47 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -468,6 +468,8 @@ SfxTabDialog::SfxTabDialog
SfxTabDialog::~SfxTabDialog()
{
+SavePosAndId();
+
const sal_uInt16 nCount = pImpl-pData-Count();
for ( sal_uInt16 i = 0; i nCount; ++i )
{
@@ -871,6 +873,14 @@ SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId )
const
return NULL;
}
+void SfxTabDialog::SavePosAndId()
+{
+// save settings (screen position and current page)
+SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
+
aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
+aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
+}
+
// ---
short SfxTabDialog::Ok()
@@ -893,10 +903,7 @@ short SfxTabDialog::Ok()
*/
{
-// save settings (screen position and current page)
-SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
-
aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
-aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
+SavePosAndId(); //See fdo#38828 Apply resetting window position
pImpl-bInOK = sal_True;
commit d800847be075dc7420e2655ba8167cc4f9436dc9
Author: Travis Carter b...@traviswcarter.com
Date: Thu Jun 21 19:25:19 2012 -0500
Properly store dialog's position and current page
Dialog's position and current page weren't always being stored. Moved code
from the destructor to SfxTabDialog::Ok() so that it will execute everytime Ok
or Apply is clicked.
Change-Id: Iddee68a7b22749db50c8c78613be11c8ba5500c6
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index 9096f8c..5d84118 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -468,11 +468,6 @@ SfxTabDialog::SfxTabDialog
SfxTabDialog::~SfxTabDialog()
{
-// save settings (screen position and current page)
-SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
-
aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
-aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
-
const sal_uInt16 nCount = pImpl-pData-Count();
for ( sal_uInt16 i = 0; i nCount; ++i )
{
@@ -883,6 +878,10 @@ short SfxTabDialog::Ok()
/* [Description]
Ok handler for the Dialogue.
+
+Dialog's current location and current page are saved for the next time
+the dialog is shown.
+
The OutputSet is created and for each page this or the special OutputSet
is set by calling the method SfxTabPage::FillItemSet(SfxItemSet ), to
insert the entered data by the user into the set.
@@ -894,6 +893,11 @@ short SfxTabDialog::Ok()
*/
{
+// save settings (screen position and current page)
+SvtViewOptions aDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
+
aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
+aDlgOpt.SetPageID( aTabCtrl.GetCurPageId() );
+
pImpl-bInOK = sal_True;
if ( !pOutSet )
commit f3daae2f80bbe5dae7e9eb14b8ac346dd73a2968
Author: Caolán McNamara caol...@redhat.com
Date: Tue Jun 26 14:14:35 2012 +0100
get the right inclusion rules for nss libs
Change-Id: I119a012f1b0e9fe06d15b7e41fe7ac140bb83629
diff --git a/scp2/source/ooo/file_library_ooo.scp
b/scp2/source/ooo/file_library_ooo.scp
index b1c38c3..4b9ecb6 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1326,6 +1326,40 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1)
#endif
#endif
+//we need the nss libs of libxmlsec is enabled, or if the internal mozilla is
enabled
Re: [PUSHED][PATCH] fdo#38828: Save position of tab dialogs
On Mon, 2012-06-25 at 18:49 -0500, Travis Carter wrote: I've sent a message to the mailing list. I'll add myself to the developers list once the archives refresh. Great. So I pushed this now. Keeping it in the dtor and adding it to ::Ok sounds alright to me. Fair enough. ... Should I roll a new patch with the code in the dtor? I decided to make that tweak myself, so no need now. Thanks for this. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANNOUNCE] libreoffice-3.5.5.2 tag created (3.5.5-rc2)
Hi, there have been created the libreoffice-3.5.5.2 tag for 3.5.5-rc2 release. The corresponding official builds will be available within next few days. It will be used as final if no blocker is found. See the attached list of changes against 3.5.5-rc1. Now, you might switch your current 3-5 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-3.5.5.2 libreoffice-3.5.5.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#3.5_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Best Regards, Petr fdo#30519 Bad transitions if use hardware acceleration is enabled [David Tardon] fdo#41556 VIEWING: Incomplete font substitution when FontConfig matches italic font [Caolán McNamara] fdo#43967 VIEWING: legacy report designer wizard improperly formats dates [Lionel Elie Mamane] fdo#46738 Cell background and border color formatting information of empty cells lost in particular document after FILESAVE as xls and xlsx [Petr Mladek] fdo#47636 Extremely slow display with font fallback [Caolán McNamara] fdo#48601 FILEOPEN: Open Visio's file with bitmap's blocks [Julien Nabet, Fridrich Štrba] fdo#48602 FILEOPEN: The Greek codepage instead the Russian codepage (*.vsd by MS_Visio-2000) [Fridrich Štrba] fdo#49178 CRASH when FILEOPEN particular RTF [Julien Nabet] fdo#49582 FILESAVE: Long delays saving in XP .XLS format [Petr Mladek] fdo#50603 Unable to update LibreOffice without resetting user profile [Stephan Bergmann] fdo#50988 Draw crashes on loading MS Logical Design Diagram example viso file. [Julien Nabet] fdo#51243 Trying to edit a report from new (but awful) Report Builder hangs libreoffice [Lionel Elie Mamane] fdo#51249 Crash while saving a document with track-changes enabled [Pierre-Eric Pelloux-Prayer] fdo#51270 On UNINSTALLING, LibreOffice leaves dirt behind [Andras Timar] rhbz#678440 opening urls fails with error 403 on picky servers [Fridrich Štrba, Stephan Bergmann] + common + version 3.5.5.2, tag libreoffice-3.5.5.2 (3.5.5-rc2) [Petr Mladek] + core + always include User-Agent to avoid 403 from picky servers (rhbz#678440) [Stephan Bergmann] + avoid a crash because of shared_ptr ownership [Luboš Luňák] + bump product version to 3.5.5-rc1+ [Petr Mladek] + bump product version to 3.5.5-rc2, release number to 2 [Petr Mladek] + cache fontconfig font substitutions (fdo#41556, fdo#47636) [Caolán McNamara] + close fds across a restart of soffice on Mac OS X (fdo#50603) [Stephan Bergmann] + CRASH when FILEOPEN particular RTF (fdo#49178) [Julien Nabet] + delete problematic IsOfficeRunning custom action [Andras Timar] + disable stream copy when saving a file with 'Changes Record' active (fdo#51249) [Pierre-Eric Pelloux-Prayer] + fix another crash in exotic circumstances [Fridrich Štrba] + fix arguments of Rectangle constructor [Ruslan Kabatsayev] + fix RemoveExtensions custom action (fdo#51270) [Andras Timar] + fix typo: = - == [David Tardon] + GTK: don't crash on X errors [Ruslan Kabatsayev] + infinite loop in SwFrameControlsManager::SetReadonlyControls (fdo#51243) [Lionel Elie Mamane] + legacy report designer wizard formats dates improperly (fdo#43967) [Lionel Elie Mamane] + paint scrolled area from the right surface (fdo#30519) [David Tardon] + related: FILEOPEN: Open Visio's file with bitmap's blocks (fdo#48601) [Julien Nabet] + revert Always include User-Agent to avoid 403 from picky servers (rhbz#678440) [Fridrich Štrba] + revert export all style information to xls/xlsx, (fdo#49582, fdo#46738) [Petr Mladek] + trying to solve out of bonds in (fdo#48601) [Fridrich Štrba] + uploading libvisio 0.0.18, fixing (fdo#48602) [Fridrich Štrba] + translations + update translations for LibreOffice 3.5.5 rc2 [Andras Timar] ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.5.2'
Tag 'libreoffice-3.5.5.2' created by Petr Mladek pmla...@suse.cz at 2012-06-26 14:50 -0700 Tag libreoffice-3.5.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP6b4uAAoJEPQ0oe+v7q6j/tAQAJVXYRFuqbbvI68wdKL9C7Ni OkT0RdNsYOlMI1w76gUjWz9hto6ISq/J1CY5jdi+MsuFuChfISvU1tv+qmnODPV0 c3Mr2zNKG8+EXF5uh2KG3+QO06YKm3qhB+JJAqj6js+RDhcwRF82DTulckFczk27 hW148TZMh++jVDdYPH/w3153gQ8O77+OaDeSyufm/cQmpGmPwGx0dhFDX8z2JV0R zoyzpIY/5+L/LxsXtUVQf58vd2lThL4Q72f7bri8+39Tu4nyri5qHAyeSFN+MlEG LJNpt7+9WIly85d6tWgHSSPi0ubIQgihIB807GBpEecKut0IDxXXYLIX4NDqgvLP fLBsQMzmIQ+61DbnCPxTQdWNGDPOqZ37IoUyh4ykkrHgOOfcIMmB1Pq5v2//rVdW 3eI/j1mPX+gKhOCLzpGNdZcax7Rsj6kPDQqpz5N7ojlb9SLIiUAutkmx5z3AScn4 JvnowMFw8gB3IVcXhM/s4kiVEb8wdlN+ysXE3bxz1E98xT0y9+eSzZKCVlKWg8xq ooLprKfW1sXqlq+dcL/1b3czCLN+JtECedwuL0GEK7BwJKb6W/ag+srI4pzWtyip HHoaguoqYOEMABhiLGFH6Tt3NMG+XHuhayacRAZv1QhPPmGBWECDSmJqCvNMPA00 qg5sYCxDFWWS08B5DDgG =t2dE -END PGP SIGNATURE- Changes since libreoffice-3.5.0.1-4: --- 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-3.5.5.2'
Tag 'libreoffice-3.5.5.2' created by Petr Mladek pmla...@suse.cz at 2012-06-26 14:50 -0700 Tag libreoffice-3.5.5.2 -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJP6b4uAAoJEPQ0oe+v7q6jYqcQAJG9V3Alz+JWIciML91Qqx0T 1eAKzJjC6myj6QHQhIuQy5J6xSybpKothqs8VA8Dx76/6aIU6EhGNGmM4wh7NbN1 0L9B9RcUXEh9d5GAdpDgtl16qMlBBh/2DcvR1WpoSo00M7VXJZdf0giRaf/IkH5V 1k3Ju+lwagrA1iSiDyWrDRe8Boq5N7O2yIq4PSkkifxcR7pL5bt4ZKAV3RKyTGQo 82mb1sw9788/gAMM9su3GrvTKFUEAcOCEby5OpHWnMDGu9nRJmod5T396H+h/yI1 lB234GLomfw+xy2zTIOsWzQCLxTohLEwKodmTU9UqzbkmOLyJPE2vPg3cB1oUkjZ CKv14XCLxpXsqi/U4nBKDtwA1FOzCruVSnxkFWnmwkDjfD0FzvXJ+r2e7CNBJzAV PuW5grjesWYwyusqMimanQNGbdQQZ04+4xblygq2IEsN7Dxz9Ow0Oug8W6rqbD00 w+MZ9g0xp2kLFOJORdAGgZkcgijvsS2QH3SO7TclQ9R3YQVIz6dzZDCC4Kcp6AAN vYBD9fpQ/5hvTJAI0mMiFiAiKEKChRygOJ0qF1V79FVEbVN29Bm4c8EpjRZOHZI1 HnCFU3oyMJdeM6kF7WPOkHmPiG/v6mIylX5ENqYystPKQ+htkv/nKFlMo/Lc0/i7 t7ROYOrCHIJ4YSuXwF1T =fK3U -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-37: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-5' - instsetoo_native/util solenv/inc
instsetoo_native/util/openoffice.lst | 30 +++--- solenv/inc/minor.mk |4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) New commits: commit 53f4ed9d27349919ebc5365af4eb058d795bb37b Author: Petr Mladek pmla...@suse.cz Date: Tue Jun 26 16:36:33 2012 +0200 bump product version to 3.5.5-rc2+ Change-Id: Ia3cd369f29508ad9e66bb39b8f8dc37fd5c95d06 diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index d0d86bd..2f74886 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -53,13 +53,13 @@ LibreOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.5 - ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc2+ BASEPRODUCTVERSION 3.5 PCPFILENAME libreoffice.pcp UPDATEURL http://update.libreoffice.org/check.php @@ -112,13 +112,13 @@ LibreOffice_wJRE PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.5 - ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc2+ BASEPRODUCTVERSION 3.5 UPDATEURL http://update.libreoffice.org/check.php ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst @@ -170,14 +170,14 @@ LibreOffice_Dev PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3.5 USERDIRPRODUCTVERSION 3 ABOUTBOXPRODUCTVERSION 3.5.5 - ABOUTBOXPRODUCTVERSIONSUFFIX rc1+ + ABOUTBOXPRODUCTVERSIONSUFFIX rc2+ BASEPRODUCTVERSION 3.5 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX lodevbasis @@ -240,7 +240,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3.5 LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc1 +SHORT_PRODUCTEXTENSION rc2 LICENSENAME LGPL SETSTATICPATH 1 NOVERSIONINDIRNAME 1 @@ -275,7 +275,7 @@ LibreOffice_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc1 +SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3.5 @@ -318,7 +318,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc1 +SHORT_PRODUCTEXTENSION rc2 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk @@ -367,7 +367,7 @@ LibreOffice_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc1 +SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test BRANDPACKAGEVERSION 3.5 @@ -410,7 +410,7 @@ LibreOffice_Dev_Test PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION -SHORT_PRODUCTEXTENSION rc1 +SHORT_PRODUCTEXTENSION rc2 UNIXBASISROOTNAME lodev3.5 POSTVERSIONEXTENSION TEST POSTVERSIONEXTENSIONUNIX test @@ -458,13 +458,13 @@ OxygenOffice PRODUCTVERSION 3.5 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc1 + SHORT_PRODUCTEXTENSION rc2 POSTVERSIONEXTENSION
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/inc sc/source
sc/inc/attarray.hxx|2 +-
sc/inc/column.hxx |2 +-
sc/inc/document.hxx|1 -
sc/inc/table.hxx |2 +-
sc/source/core/data/attarray.cxx |4 ++--
sc/source/core/data/column2.cxx|4 ++--
sc/source/core/data/document.cxx | 13 -
sc/source/core/data/table1.cxx |4 ++--
sc/source/filter/excel/xetable.cxx |2 +-
9 files changed, 10 insertions(+), 24 deletions(-)
New commits:
commit e5f690b3711b61c05671d46d19439dd1100f4bff
Author: Petr Mladek pmla...@suse.cz
Date: Tue Jun 26 11:16:59 2012 +0200
Revert export all style information to xls/xlsx, fdo#46738
It caused huge slow down and even errors when exporting XLS (fdo#49582).
The original problem was less serious because it was old regression
from LO-3.3. There is not easy fix.
= reverting is the best solution according to Markus.
This reverts commit 6c6a4ed070acc0b106e951864fa5d20927f5c1e0.
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/inc/attarray.hxx b/sc/inc/attarray.hxx
index 27a086e..b58472e 100644
--- a/sc/inc/attarray.hxx
+++ b/sc/inc/attarray.hxx
@@ -175,7 +175,7 @@ public:
boolIsEmpty() const;
boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool
bFullFormattedArea = false ) const;
+boolGetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const;
boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
boolIsVisibleEqual( const ScAttrArray rOther,
SCROW nStartRow, SCROW nEndRow ) const;
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 313dcd6..f86bf9b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -183,7 +183,7 @@ public:
boolHasSelectionMatrixFragment(const ScMarkData rMark) const;
boolGetFirstVisibleAttr( SCROW rFirstRow ) const;
-boolGetLastVisibleAttr( SCROW rLastRow, bool bFullFormattedArea =
false ) const;
+boolGetLastVisibleAttr( SCROW rLastRow ) const;
boolHasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const;
boolIsVisibleAttrEqual( const ScColumn rCol, SCROW nStartRow = 0,
SCROW nEndRow = MAXROW ) const;
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 6167634..50bcd27 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -940,7 +940,6 @@ public:
SCCOL rEndCol, SCROW rEndRow, bool
bIncludeOld, bool bOnlyDown ) const;
SC_DLLPUBLIC bool GetCellArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow ) const;
SC_DLLPUBLIC bool GetTableArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow ) const;
-SC_DLLPUBLIC void GetFormattedAndUsedArea( SCTAB nTab, SCCOL
rEndCol, SCROW rEndRow ) const;
SC_DLLPUBLIC bool GetPrintArea( SCTAB nTab, SCCOL rEndCol,
SCROW rEndRow,
bool bNotes = true ) const;
SC_DLLPUBLIC bool GetPrintAreaHor( SCTAB nTab, SCROW nStartRow,
SCROW nEndRow,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 10775e2..4f1fe38 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -405,7 +405,7 @@ public:
boolGetCellArea( SCCOL rEndCol, SCROW rEndRow ) const;
// FALSE = empty
boolGetTableArea( SCCOL rEndCol, SCROW rEndRow ) const;
-boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes,
bool bFullFormattedArea = false ) const;
+boolGetPrintArea( SCCOL rEndCol, SCROW rEndRow, bool bNotes )
const;
boolGetPrintAreaHor( SCROW nStartRow, SCROW nEndRow,
SCCOL rEndCol, bool bNotes ) const;
boolGetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol,
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx
index 5714e7c..2aa660a 100644
--- a/sc/source/core/data/attarray.cxx
+++ b/sc/source/core/data/attarray.cxx
@@ -1831,7 +1831,7 @@ bool ScAttrArray::GetFirstVisibleAttr( SCROW rFirstRow )
const
const SCROW SC_VISATTR_STOP = 84;
-bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData, bool
bFullFormattedArea ) const
+bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow, SCROW nLastData ) const
{
// #i30830# changed behavior:
// ignore all attributes starting with the first run of SC_VISATTR_STOP
equal rows
@@ -1862,7 +1862,7 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW rLastRow,
SCROW nLastData, bool bFu
if ( nAttrStartRow = nLastData )
nAttrStartRow = nLastData + 1;
SCROW nAttrSize = pData[nEndPos].nRow + 1 - nAttrStartRow;
-if ( nAttrSize = SC_VISATTR_STOP !bFullFormattedArea )
+if ( nAttrSize = SC_VISATTR_STOP )
{
bFound = false;// ignore this range and below
}
diff --git
Re: [PATCH] Converting Svptrarr usage (33)
On Mon, 2012-06-25 at 14:29 +0200, Noel Grandin wrote: Hi Be not afraid, most of the patches are very small :-) FWIW, there now doesn't seem to be *too* many of the ForEach_foo, ::ForEach and ::_ForEach family left in LibreOffice except for a few users in sw. If those went away they could be removed en-masse from the svl/inc/svl/svarray.hxx macros which would drop 9 lines from unusedcode.easy as a sideeffect. C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5][PUSHED 3-5-5] revert http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=6c6a4ed070acc0b106e951864fa5d20927f5c1e0
Markus Mohrhard píše v Út 26. 06. 2012 v 13:12 +0200: Hey, we need to revert http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=6c6a4ed070acc0b106e951864fa5d20927f5c1e0 in 3-5. The patch is correct and does the right thing but sadly our cell export code is insane and therefore this patch makes our export incredibly slow if we have a whole formatted column. After looking into the code and my profiling results I see no easy solution for this problem and think that the performance problem is much worse than the bug this patch fixed. See fdo#49582 for a bug which is caused by this commit. I will also revert this commit in master and 3-6 because we will not be able to fix the underlying problem with a bit of refactoring of the export code. I tested it with the document from the bug 49582. The revert really improved the performance a lot. In addition, it solved an error message about too many rows. The original bug 46738 was already in LO-3.3 = old bug = less critical. = reverted in both 3-5 and 3-5-5 branch. I think that we do not need 3-ple review for reverting commits when it is requested by the author. Best Regards, Petr ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b02c285edf34e25e0f164d9fb65e3504ef043c39
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 26 16:48:19 2012 +0200
aero toolbar: Use f0f0f0 for the gradient again, it was reverted by
accident.
Change-Id: I05435615185f05ec3fd9609f039394f4ecb03def
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index ded121d..b8abaee 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -482,7 +482,7 @@ void impl_drawAeroToolbar( HDC hDC, RECT rc )
// gradient at the bottom
TRIVERTEX vert[2] = {
{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
-{ rc.right, rc.bottom, 0xe500, 0xe900, 0xee00, 0xff00 }
+{ rc.right, rc.bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
};
GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/win
vcl/win/source/gdi/salnativewidgets-luna.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6ce4e0a263f3dfe86eccc8f750f57364ed612a4a
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jun 26 16:48:19 2012 +0200
aero toolbar: Use f0f0f0 for the gradient again, it was reverted by
accident.
Change-Id: I05435615185f05ec3fd9609f039394f4ecb03def
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index ded121d..b8abaee 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -482,7 +482,7 @@ void impl_drawAeroToolbar( HDC hDC, RECT rc )
// gradient at the bottom
TRIVERTEX vert[2] = {
{ rc.left, gradient_break, 0xfa00, 0xfa00, 0xfa00, 0xff00 },
-{ rc.right, rc.bottom, 0xe500, 0xe900, 0xee00, 0xff00 }
+{ rc.right, rc.bottom, 0xf000, 0xf000, 0xf000, 0xff00 }
};
GradientFill( hDC, vert, 2, g_rect, 1, GRADIENT_FILL_RECT_V );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PUSHED][PATCH] Prevent print settings dialog to show help button when it's called from help window
On Tue, 2012-06-26 at 15:06 +0200, Maxime de Roucy wrote: Here is the a new 0003 and 0004 without the bug. ok, so pushed 3 and 4 to master now. Thanks for this. It seems odd that we have *two* methods in SfxPrinter, IsKnown and IsOriginal that both return bKnown and are so equivalent. Maybe we should delete one of the blasted things. The original detection of being called from an API call was odd, esp with the rollback of i'm from the api if i have parameters, except if i have one parameter and it's print-selection. So to me pre 3 and post 3 *seem* equivalent except for the addition of the new property, but its a bit of a rats nest of code :-) C. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sfx2/source vcl/source
sfx2/source/view/viewprn.cxx | 89 +++--
vcl/source/window/printdlg.cxx |3 +
2 files changed, 54 insertions(+), 38 deletions(-)
New commits:
commit 7db0ac29c0962932bbcd8b460dc51c9e5009dbfa
Author: Maxime de Roucy mdero...@linagora.com
Date: Tue Jun 26 15:52:41 2012 +0100
Prevent print settings dialog to show help button
Prevent the printer settings dialog to show help button when it's called
from the help.
Add a PrinterController property : HideHelpButton
Change-Id: I45585a30a2f429659f554747f93c650cb048711f
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 239c300..cb8a2e8 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -671,8 +671,6 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest rReq )
bSilent = pSilentItem pSilentItem-GetValue();
}
-//FIXME: how to transport bPrintOnHelp?
-
// no help button in dialogs if called from the help window
// (pressing help button would exchange the current page inside the help
// document that is going to be printed!)
@@ -744,6 +742,11 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest rReq )
}
}
+// we will add the PrintSelectionOnly or HideHelpButton
properties
+// we have to increase the capacity of aProps
+sal_Int32 nLen = aProps.getLength();
+aProps.realloc( nLen + 1 );
+
// HACK: writer sets the SID_SELECTION item when printing directly
and expects
// to get only the selection document in that case (see
getSelectionObject)
// however it also reacts to the PrintContent property. We need
this distinction here, too,
@@ -755,11 +758,15 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest rReq )
SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION,
sal_False);
sal_Bool bSelection = ( pSelectItem != NULL
pSelectItem-GetValue() );
-sal_Int32 nLen = aProps.getLength();
-aProps.realloc( nLen + 1 );
aProps[nLen].Name = rtl::OUString( PrintSelectionOnly );
aProps[nLen].Value = makeAny( bSelection );
}
+else // if nId == SID_PRINTDOC ; nothing to do with the previous
HACK
+{
+// should the printer selection and properties dialogue
display an help button
+aProps[nLen].Name = rtl::OUString( HideHelpButton );
+aProps[nLen].Value = makeAny( bPrintOnHelp );
+}
ExecPrint( aProps, bIsAPI, (nId == SID_PRINTDOCDIRECT) );
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index d9aa5dd..9c05203 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -902,6 +902,9 @@ PrintDialog::PrintDialog( Window* i_pParent, const
boost::shared_ptrPrinterCont
// setup dependencies
checkControlDependencies();
+if ( maPController-getBoolProperty( rtl::OUString( HideHelpButton ),
sal_False ) )
+maHelpButton.Hide();
+
// set initial focus to Number of copies
maJobPage.maCopyCountField.GrabFocus();
maJobPage.maCopyCountField.SetSelection( Selection(0, 0x) );
commit 512b195910a7f73206c50a89ec5fc62cced49ace
Author: Maxime de Roucy mdero...@linagora.com
Date: Tue Jun 26 15:50:52 2012 +0100
Some rewriting in SfxViewShell::ExecPrint_Impl
* add comments
* reorganise if statement
* use of the IsAPI function
* prevent segfault (NULLÂ pointer dereferencing)
Change-Id: I79b010e676ea5efc23903d6c63e04175871d1258
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 909b54e..239c300 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -137,7 +137,7 @@ SfxPrinterController::SfxPrinterController( const
boost::shared_ptrPrinter i_
// initialize extra ui options
if( mxRenderable.is() )
{
-for (sal_Int32 nProp=0; nProprProps.getLength(); nProp++)
+for (sal_Int32 nProp=0; nProp rProps.getLength(); ++nProp)
setValue( rProps[nProp].Name, rProps[nProp].Value );
Sequence beans::PropertyValue aRenderOptions( 3 );
@@ -654,13 +654,19 @@ Printer* SfxViewShell::GetActivePrinter() const
void SfxViewShell::ExecPrint_Impl( SfxRequest rReq )
{
-sal_uInt16 nDialogRet = RET_CANCEL;
+sal_uInt16 nDialogRet = RET_CANCEL;
SfxPrinter* pPrinter = 0;
SfxDialogExecutor_Impl* pExecutor = 0;
boolbSilent = false;
-sal_Bool bIsAPI = rReq.GetArgs() rReq.GetArgs()-Count();
+
+// does the function have been called by the user interface or by an API
call
+sal_Bool bIsAPI = rReq.IsAPI();
if ( bIsAPI )
{
+// the function have been called by the API
+
+// Should it be visible
installation sets, parallel compression, pigz etc.
i've noticed that building archive installation sets on my machine is
entirely CPU bound (since everything fits into RAM) and a single gzip
takes up most of the time, so i've toyed around a little with a parallel
implementation pigz (available in Fedora) and a single line change
makes quite a difference:
real2m55.031s
user3m7.863s
sys 0m10.980s
real2m56.103s
user3m9.408s
sys 0m11.484s
real2m58.402s
user3m10.293s
sys 0m10.523s
real0m39.902s
user4m40.154s
sys 0m12.257s
real0m36.689s
user4m39.771s
sys 0m11.989s
real0m41.307s
user4m40.514s
sys 0m11.741s
i wonder, is this something that would enable us to do release builds
faster; of course since i don't do those i don't know to what extent it
could help, especially as we don't release archive but rpm (and
deb?) installation sets, and probably those will have their
compression done by something invoked by rpm... but at least for
gzip/pigz the tools look compatible, so perhaps putting it in PATH with
the right name could be done.
also there seem to be parallel implementations of bzip2 and lzma:
http://www.zlib.net/pigz/
http://compression.ca/pbzip2/
http://jnovy.fedorapeople.org/pxz/
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 5f477a5..9aeb53c 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -552,7 +552,7 @@ sub create_package
if ( $getuidlibrary ne ) { $ldpreloadstring = LD_PRELOAD= . $getuidlibrary; }
}
-$systemcall = cd $tempdir; $ldpreloadstring tar -cf - . | gzip $archive;
+$systemcall = cd $tempdir; $ldpreloadstring tar -cf - . | pigz $archive;
}
if ( $makesystemcall )
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [PUSHED 3-5][PUSHED 3-5-5] revert http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-3-5id=6c6a4ed070acc0b106e951864fa5d20927f5c1e0
On Tue, 2012-06-26 at 16:44 +0200, Petr Mladek wrote: = reverted in both 3-5 and 3-5-5 branch. I think that we do not need 3-ple review for reverting commits when it is requested by the author. Seems sensible :-) glad it made it into 3.5.5. Thanks, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/filter/ww8/rtfattributeoutput.cxx |7 +--
sw/source/filter/ww8/rtfattributeoutput.hxx |2 ++
sw/source/filter/ww8/rtfexport.cxx |2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 9ad4c4835614fe1c1cf82a9cf02d3069fd8bff2a
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 26 16:52:04 2012 +0200
fdo#48335 don't export zoom factor when zoom type is not percent
Change-Id: I1fb7e3d9d65f2f3388bb4851f5ad517ed1681f04
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index b50fd3e..f816eb1 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -506,7 +506,7 @@ void RtfExport::ExportDocument_Impl()
Strm() m_pAttrOutput-m_aTabStop.makeStringAndClear().getStr()
sNewLine;
// Zoom
ViewShell *pViewShell(pDoc-GetCurrentViewShell());
-if (pViewShell)
+if (pViewShell pViewShell-GetViewOptions()-GetZoomType() ==
SVX_ZOOM_PERCENT)
{
Strm() OOO_STRING_SVTOOLS_RTF_VIEWSCALE;
OutULong(pViewShell-GetViewOptions()-GetZoom());
commit 5d505e5b1edee7f709e4baff70a971cb3fe851c2
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Jun 26 16:39:17 2012 +0200
fdo#48335 RTF export: don't try to end not started runs
Change-Id: I022556acd0891cf24963d667d34f366496453630
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 3bb8b60..6810950 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -383,6 +383,7 @@ void RtfAttributeOutput::StartRun( const SwRedlineData*
pRedlineData, bool bSing
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
+m_bInRun = true;
m_bSingleEmptyRun = bSingleEmptyRun;
if (!m_bSingleEmptyRun)
m_aRun-append('{');
@@ -398,8 +399,9 @@ void RtfAttributeOutput::EndRun()
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
m_aRun-append(m_rExport.sNewLine);
m_aRun.appendAndClear(m_aRunText);
-if (!m_bSingleEmptyRun)
+if (!m_bSingleEmptyRun m_bInRun)
m_aRun-append('}');
+m_bInRun = false;
}
void RtfAttributeOutput::StartRunProperties()
@@ -3028,7 +3030,8 @@ RtfAttributeOutput::RtfAttributeOutput( RtfExport
rExport )
m_bHadFieldResult( false ),
m_bTableRowEnded( false ),
m_aCells(),
-m_bSingleEmptyRun(false)
+m_bSingleEmptyRun(false),
+m_bInRun(false)
{
SAL_INFO(sw.rtf, OSL_THIS_FUNC);
}
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index a6430f1..56c31b6 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -543,6 +543,8 @@ private:
/// If we're in a paragraph that has a single empty run only.
bool m_bSingleEmptyRun;
+
+bool m_bInRun;
public:
RtfAttributeOutput( RtfExport rExport );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#50871 BUGZILLAASSISTANT: Help Linguistic PDF Export not available
Hi Rainer, Rob, I am a bit confused. Could I push the patch now or should I wait for some other action? Best Regards, Petr Rob Snelders píše v Pá 22. 06. 2012 v 21:53 +0200: Hi, I also created a patch for when the component is renamed. -- Greetings, Rob Snelders Op 22-06-12 18:54, Rainer Bielefeld schreef: Caolán McNamara schrieb: Use localization, globalization, etc., throughout regardless of US/UK English IMO. Hi, I think so, too, and will modify that for next new LibO release we get, so that no extra Assistant update will be required. https://wiki.documentfoundation.org/BugReport_Details#Localisation http://en.wikipedia.org/wiki/Eats,_Shoots_%26_Leaves :-) :-) Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Can #32260 and 51135 be closed? -- both: Request for account
On Tue, 2012-06-26 at 13:09 +0200, Bjoern Michaelsen wrote: And as penality you can review/cherry-pick Muhammads patch at: https://gerrit.libreoffice.org/#/c/236/ I tried and failed ;-) there is some unexpected complexity with logerrit cherry-pick of a patch that is already merged in gerrit (or something) ? Thanks :-) Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: sw/source
sw/source/ui/uiview/view0.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ec7af76e37993f0dd0870dc2f7b89677af8c88c2 Author: Muhammad Haggag mhag...@gmail.com Date: Mon Jun 25 09:33:36 2012 +0200 fdo#44602 Modeless word count window hides when user clicks into a note The word count dialog wasn't registered as a child window in the SwView interface. Now it is. Change-Id: I334e3403f91ff6884ef1e3a6a64149c284926726 Reviewed-on: https://gerrit.libreoffice.org/236 Tested-by: Michael Meeks michael.me...@suse.com Reviewed-by: Michael Meeks michael.me...@suse.com diff --git a/sw/source/ui/uiview/view0.cxx b/sw/source/ui/uiview/view0.cxx index 1d23e78..be41613 100644 --- a/sw/source/ui/uiview/view0.cxx +++ b/sw/source/ui/uiview/view0.cxx @@ -105,6 +105,7 @@ SFX_IMPL_INTERFACE( SwView, SfxViewShell, SW_RES(RID_TOOLS_TOOLBOX) ) SFX_CHILDWINDOW_REGISTRATION(SwSpellDialogChildWindow::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(FN_REDLINE_ACCEPT); SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG); +SFX_CHILDWINDOW_REGISTRATION(FN_WORDCOUNT_DIALOG); SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(::avmedia::MediaPlayer::GetChildWindowId()); SFX_CHILDWINDOW_REGISTRATION(FN_INSERT_FIELD_DATA_ONLY); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [PATCH] fdo#50871 BUGZILLAASSISTANT: Help Linguistic PDF Export not available
Petr Mladek schrieb: I am a bit confused. Could I push the patch now or should I wait for some other action? Hi Petr, if there are no 3rd parties concerns Patches generally should be pushed after review with a note in the bug so that I know that it will be available for the next Assistant-Update (What I am currently planning to do for LibO 3.5.5.2.). Best regards Rainer ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: logerrit
logerrit |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b0cb1955daf41617a3abc72f153d858570d6e515 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Tue Jun 26 18:45:02 2012 +0200 do not submit a change for now as that removes the ref on gerrit Change-Id: I699aad760823a8ccbfc7dc93bf0658b5222dff71 diff --git a/logerrit b/logerrit index b3d2233..52be193 100755 --- a/logerrit +++ b/logerrit @@ -123,11 +123,11 @@ case $1 in ask_tristate $CODEREVIEW case $ANSWER in y) - read -p 'do you approve and submit the change (+) too, or prefer someone else to do that ()? ' CODEREVIEW + read -p 'do you approve the change (+) too, or prefer someone else to do that ()? ' CODEREVIEW ask_tristate $CODEREVIEW case $ANSWER in y) - CODEREVIEWFLAG=--codereview=2 --submit + CODEREVIEWFLAG=--codereview=2 ;; n) CODEREVIEWFLAG=--codereview=1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Can #32260 and 51135 be closed? -- both: Request for account
Hi, On Tue, Jun 26, 2012 at 05:03:43PM +0100, Michael Meeks wrote: On Tue, 2012-06-26 at 13:09 +0200, Bjoern Michaelsen wrote: And as penality you can review/cherry-pick Muhammads patch at: https://gerrit.libreoffice.org/#/c/236/ I tried and failed ;-) there is some unexpected complexity with logerrit cherry-pick of a patch that is already merged in gerrit (or something) ? Yes, it seems that you cannot cherrypick _after_ it is merged in gerrit. Usually that makes a lot of sense, as the patch will be on master at that time. Its only an issue as long as we need to manually push over to fd.o. So for now one should not click publish and submit, but use publish comments instead unless one has pushed the patch to fd.o too. Gerrit will notice the change to be merged anyway on the next sync. I tweaked logerrit (for now) to not do the Wrong Thing(tm) with: http://cgit.freedesktop.org/libreoffice/core/commit/?id=b0cb1955daf41617a3abc72f153d858570d6e515 So again, this is a temporary issue that will be gone when gerrit owns the repo as then you do not need the ref anymore once the patch is in. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: installation sets, parallel compression, pigz etc.
On Tue, Jun 26, 2012 at 05:02:37PM +0200, Michael Stahl wrote: i've noticed that building archive installation sets on my machine is entirely CPU bound (since everything fits into RAM) and a single gzip takes up most of the time, so i've toyed around a little with a parallel implementation pigz (available in Fedora) and a single line change makes quite a difference: Its even worse for xz compression. My release builds (with ccache take 1.5 as much time to pack as to build): https://plus.google.com/101094190333184858950/posts/D9x87DkdceD Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sc/source
sc/source/ui/inc/prevwsh.hxx |3 -
sc/source/ui/view/preview.cxx |5 --
sc/source/ui/view/prevwsh.cxx | 96 +-
3 files changed, 61 insertions(+), 43 deletions(-)
New commits:
commit 4a5e8fc26e2bbd37779505c40f470b3b3be9a5db
Author: Noel Power noel.po...@novell.com
Date: Tue Jun 26 18:19:21 2012 +0100
fix for fdo#51040 preview crash
Change-Id: I13d3cfa99294bdce8c9f5133f49e91114feb4baa
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 0f89fc7..020c211 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -50,7 +50,6 @@ class CommandEvent;
class ScPreviewShell: public SfxViewShell
{
-friend class ScPreview; // allow access to AdjustPosSizePixel
ScDocShell* pDocShell;
SystemWindow* mpFrameWindow;
@@ -66,7 +65,6 @@ friend class ScPreview; // allow access to AdjustPosSizePixel
SfxBroadcaster* pAccessibilityBroadcaster;
boolGetPageSize( Size aPageSize );
-voidUpdateNeededScrollBars();
private:
voidConstruct( Window* pParent );
DECL_LINK(ScrollHandler, ScrollBar* );
@@ -106,6 +104,7 @@ public:
voidInitStartTable(SCTAB nTab);
voidUpdateScrollBars();
+voidUpdateNeededScrollBars(bool bFromZoom = false);
sal_BoolScrollCommand( const CommandEvent rCEvt );
voidExecute( SfxRequest rReq );
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index da05322..c45135b 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -705,10 +705,7 @@ void ScPreview::SetZoom(sal_uInt16 nNewZoom)
SetMapMode( aMMMode );
bInSetZoom = true; // don't scroll during SetYOffset in
UpdateScrollBars
-if ( Window* pWin = ( pViewShell-GetViewFrame() ?
pViewShell-GetViewFrame()-GetWindow() : NULL ) )
-pViewShell-AdjustPosSizePixel( pWin-GetPosPixel(),
pWin-GetSizePixel() );
-else
-pViewShell-UpdateScrollBars();
+pViewShell-UpdateNeededScrollBars(true);
bInSetZoom = false;
bStateValid = false;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index a69cb79..02bf4e1 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -302,16 +302,9 @@ bool ScPreviewShell::GetPageSize( Size aPageSize )
return true;
}
-void ScPreviewShell::UpdateNeededScrollBars()
+void ScPreviewShell::UpdateNeededScrollBars( bool bFromZoom )
{
-bool bVert = pVerScroll ? pVerScroll-IsVisible() : false;
-bool bHori = pHorScroll ? pHorScroll-IsVisible() : false;
-
Size aPageSize;
-if ( !GetPageSize( aPageSize ) )
-return;
-
-Size aWindowSize = pPreview-GetOutputSize();
OutputDevice* pDevice = Application::GetDefaultDevice();
long nBarW =
GetViewFrame()-GetWindow().GetSettings().GetStyleSettings().GetScrollBarSize();
@@ -320,49 +313,74 @@ void ScPreviewShell::UpdateNeededScrollBars()
long aHeightOffSet = pDevice ? pDevice-PixelToLogic( Size( nBarW, nBarH
), pPreview-GetMapMode() ).Height() : 0;
long aWidthOffSet = aHeightOffSet;
-if( pHorScroll )
+
+if (!GetPageSize( aPageSize ))
+return;
+
+// for centering, page size without the shadow is used
+bool bVert = pVerScroll ? pVerScroll-IsVisible() : false;
+bool bHori = pHorScroll ? pHorScroll-IsVisible() : false;
+Size aWindowSize = pPreview-GetOutputSize();
+Point aPos = pPreview-GetPosPixel();
+Size aWindowPixelSize = pPreview-GetOutputSizePixel();
+
+// if we are called from Zoom then we need to compensate for whatever
+// scrollbars were displayed before the zoom was called
+if ( bFromZoom )
{
-long nMaxPos = aPageSize.Width() - aWindowSize.Width() + aWidthOffSet;
-if ( nMaxPos0 )
-bHori = false;
-else
-bHori = true;
-pHorScroll-Show( bHori );
+if ( bVert )
+{
+aWindowPixelSize.Width() += nBarH;
+aWindowSize.Width() += aHeightOffSet;
+}
+if ( bHori )
+{
+aWindowPixelSize.Height() += nBarW;
+aWindowSize.Height() += aWidthOffSet;
+}
}
+// recalculate any needed scrollbars
+bHori = false;
+bVert = false;
-if( pVerScroll )
-{
-nMaxVertPos = aPageSize.Height() - aWindowSize.Height() +
aHeightOffSet;
+long nMaxWidthPos = aPageSize.Width() - aWindowSize.Width();
+if ( nMaxWidthPos0 )
+bHori = false;
+else
+bHori = true;
-if ( nMaxVertPos 0 )
-bVert = false;
-else
+long nMaxHeightPos = aPageSize.Height() - aWindowSize.Height();
+
+if ( nMaxHeightPos 0 )
+bVert = false;
+else
+bVert = true;
+
+// see if having a scroll bar requires the other
+if ( bVert
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/ui/inc/prevwsh.hxx |3 -
sc/source/ui/view/preview.cxx |5 --
sc/source/ui/view/prevwsh.cxx | 96 +-
3 files changed, 61 insertions(+), 43 deletions(-)
New commits:
commit baf87aacce6d75f9b01156ce085ef4487d46a406
Author: Noel Power noel.po...@novell.com
Date: Tue Jun 26 18:19:21 2012 +0100
fix for fdo#51040 preview crash
Change-Id: I13d3cfa99294bdce8c9f5133f49e91114feb4baa
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index f62165f..1da34f3 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -50,7 +50,6 @@ class CommandEvent;
class ScPreviewShell: public SfxViewShell
{
-friend class ScPreview; // allow access to AdjustPosSizePixel
ScDocShell* pDocShell;
SystemWindow* mpFrameWindow;
@@ -66,7 +65,6 @@ friend class ScPreview; // allow access to AdjustPosSizePixel
SfxBroadcaster* pAccessibilityBroadcaster;
boolGetPageSize( Size aPageSize );
-voidUpdateNeededScrollBars();
private:
voidConstruct( Window* pParent );
DECL_LINK(ScrollHandler, ScrollBar* );
@@ -106,6 +104,7 @@ public:
voidInitStartTable(SCTAB nTab);
voidUpdateScrollBars();
+voidUpdateNeededScrollBars(bool bFromZoom = false);
sal_BoolScrollCommand( const CommandEvent rCEvt );
voidExecute( SfxRequest rReq );
diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx
index ae233ff..8007e0e 100644
--- a/sc/source/ui/view/preview.cxx
+++ b/sc/source/ui/view/preview.cxx
@@ -701,10 +701,7 @@ void ScPreview::SetZoom(sal_uInt16 nNewZoom)
SetMapMode( aMMMode );
bInSetZoom = true; // don't scroll during SetYOffset in
UpdateScrollBars
-if ( Window* pWin = ( pViewShell-GetViewFrame() ?
pViewShell-GetViewFrame()-GetWindow() : NULL ) )
-pViewShell-AdjustPosSizePixel( pWin-GetPosPixel(),
pWin-GetSizePixel() );
-else
-pViewShell-UpdateScrollBars();
+pViewShell-UpdateNeededScrollBars(true);
bInSetZoom = false;
bStateValid = false;
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 77f633d..43f9794 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -297,16 +297,9 @@ bool ScPreviewShell::GetPageSize( Size aPageSize )
return true;
}
-void ScPreviewShell::UpdateNeededScrollBars()
+void ScPreviewShell::UpdateNeededScrollBars( bool bFromZoom )
{
-bool bVert = pVerScroll ? pVerScroll-IsVisible() : false;
-bool bHori = pHorScroll ? pHorScroll-IsVisible() : false;
-
Size aPageSize;
-if ( !GetPageSize( aPageSize ) )
-return;
-
-Size aWindowSize = pPreview-GetOutputSize();
OutputDevice* pDevice = Application::GetDefaultDevice();
long nBarW =
GetViewFrame()-GetWindow().GetSettings().GetStyleSettings().GetScrollBarSize();
@@ -315,49 +308,74 @@ void ScPreviewShell::UpdateNeededScrollBars()
long aHeightOffSet = pDevice ? pDevice-PixelToLogic( Size( nBarW, nBarH
), pPreview-GetMapMode() ).Height() : 0;
long aWidthOffSet = aHeightOffSet;
-if( pHorScroll )
+
+if (!GetPageSize( aPageSize ))
+return;
+
+// for centering, page size without the shadow is used
+bool bVert = pVerScroll ? pVerScroll-IsVisible() : false;
+bool bHori = pHorScroll ? pHorScroll-IsVisible() : false;
+Size aWindowSize = pPreview-GetOutputSize();
+Point aPos = pPreview-GetPosPixel();
+Size aWindowPixelSize = pPreview-GetOutputSizePixel();
+
+// if we are called from Zoom then we need to compensate for whatever
+// scrollbars were displayed before the zoom was called
+if ( bFromZoom )
{
-long nMaxPos = aPageSize.Width() - aWindowSize.Width() + aWidthOffSet;
-if ( nMaxPos0 )
-bHori = false;
-else
-bHori = true;
-pHorScroll-Show( bHori );
+if ( bVert )
+{
+aWindowPixelSize.Width() += nBarH;
+aWindowSize.Width() += aHeightOffSet;
+}
+if ( bHori )
+{
+aWindowPixelSize.Height() += nBarW;
+aWindowSize.Height() += aWidthOffSet;
+}
}
+// recalculate any needed scrollbars
+bHori = false;
+bVert = false;
-if( pVerScroll )
-{
-nMaxVertPos = aPageSize.Height() - aWindowSize.Height() +
aHeightOffSet;
+long nMaxWidthPos = aPageSize.Width() - aWindowSize.Width();
+if ( nMaxWidthPos0 )
+bHori = false;
+else
+bHori = true;
-if ( nMaxVertPos 0 )
-bVert = false;
-else
+long nMaxHeightPos = aPageSize.Height() - aWindowSize.Height();
+
+if ( nMaxHeightPos 0 )
+bVert = false;
+else
+bVert = true;
+
+// see if having a scroll bar requires the other
+if ( bVert
Re: fdo 50950 make (ISO)WEEKNUM comply with ODFF1.2, advise asked
Hi Winfried, On Monday, 2012-06-25 09:53:29 +0200, Winfried Donkers wrote: I will do that. (I hope my contributions don't cost you too much time in correcting so that they fit well in the general picture...) Well, my hope is that I'm not too dumb to educate you ;-) so you'd be able to work more independently on spreadsheet functions. It seems one point didn't make it across: I did not suggest to create yet another (internal) WEEKNUM function. I did start with keeping WEEKNUM_ADD in the Add-in module, but as I had diffuculties in using the Date::getWeekofYear function (getting the null date right), hm.. GetNullDate() and the exact/exact algorithm of GetDiffParam() in analysishelper.cxx didn't help? I am a bit busy with other projects at the time, so don't hurry for my sake :-) No problem, take your time. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GnuPG key 0x293C05FD : 997A 4C60 CE41 0149 0DB3 9E96 2F1A D073 293C 05FD pgpEd4e5YCAPt.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: Makefile.top
Makefile.top |6 ++ 1 file changed, 6 insertions(+) New commits: commit 4a9c85b3f8c4e91b08bf814a048f9cdf9ffe31f9 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Sun Jun 24 14:01:54 2012 +0200 reenable unitcheck and slowcheck as top level targets Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243 diff --git a/Makefile.top b/Makefile.top index 4e8c976..d904916 100644 --- a/Makefile.top +++ b/Makefile.top @@ -493,6 +493,12 @@ check: dev-install subsequentcheck subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install) $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ +unitcheck: + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ + +slowcheck: + $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ + debugrun: $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Templates licensing
All my past and future contributions to the templates that I submit to be bundled with LibreOffice may be licensed under the CC0 license. Alexander Wilms ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 32 +++
sc/source/core/tool/interpr1.cxx | 45 ++-
sc/source/core/tool/interpr4.cxx |8 ++
sc/source/core/tool/parclass.cxx | 11 ++---
4 files changed, 48 insertions(+), 48 deletions(-)
New commits:
commit d822c6afe6c1a676e9b86d67e599dbcf75512a7c
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 26 20:51:22 2012 +0200
resolved fdo#51442 N() inconsistent argument handling
5743e7b36220e9689091812cef7a4396dd48c4e6 introduced a different handling
of arguments in the N() spreadsheet function. That lost the ability to
use position dependent range intersections and suppressed every error
instead of propagating it. Previous versions suppressed only the #N/A
error. Excel propagates all errors instead.
Note that Excel for N() does not use position dependent range
intersection (SingleRef of DoubleRef) when a range reference is passed
and does not handle evaluation in array context (instead top left value
is always used), which both is inconsistent with other functions taking
a scalar value parameter. ODFF does not specify this function different.
This change re-enables range intersection and adds array evaluation.
Gnumeric does the same.
Change-Id: Ice35271e40f1a27cea384226e25945108003841a
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 1db6294..a86a3a0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -433,25 +433,37 @@ void testFuncN(ScDocument* pDoc)
pDoc-SetString(1, 13, 0, OUString(=N(\foo\)));
// Range references
-pDoc-SetString(1, 14, 0, OUString(=N(A1:A8)));
-pDoc-SetString(1, 15, 0, OUString(=N(A4:B8)));
-pDoc-SetString(1, 16, 0, OUString(=N(A6:B8)));
-pDoc-SetString(1, 17, 0, OUString(=N(A2:B8)));
+pDoc-SetString(2, 2, 0, OUString(=N(A1:A8)));
+pDoc-SetString(2, 3, 0, OUString(=N(A1:A8)));
+pDoc-SetString(2, 4, 0, OUString(=N(A1:A8)));
+pDoc-SetString(2, 5, 0, OUString(=N(A1:A8)));
// Calculate and check the results.
pDoc-CalcAll();
-double checks[] = {
+double checks1[] = {
0, 0, 0,1, -1, 12.3, 0, // cell reference
-0, 1, -1, 123, 0,0, 0, // in-line values
-0, 1, 12.3, 0// range references
+0, 1, -1, 123, 0,0, 0 // in-line values
};
-for (size_t i = 0; i SAL_N_ELEMENTS(checks); ++i)
+for (size_t i = 0; i SAL_N_ELEMENTS(checks1); ++i)
{
pDoc-GetValue(1, i, 0, result);
-bool bGood = result == checks[i];
+bool bGood = result == checks1[i];
if (!bGood)
{
-cerr row (i+1) : expected= checks[i]
actual= result endl;
+cerr row (i+1) : expected= checks1[i]
actual= result endl;
+CPPUNIT_ASSERT_MESSAGE(Unexpected result for N, false);
+}
+}
+double checks2[] = {
+0, 1, -1, 12.3 // range references
+};
+for (size_t i = 0; i SAL_N_ELEMENTS(checks2); ++i)
+{
+pDoc-GetValue(1, i+2, 0, result);
+bool bGood = result == checks2[i];
+if (!bGood)
+{
+cerr row (i+2+1) : expected= checks2[i]
actual= result endl;
CPPUNIT_ASSERT_MESSAGE(Unexpected result for N, false);
}
}
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 42f6457..f3090bf 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2952,40 +2952,19 @@ void ScInterpreter::ScIsOdd()
void ScInterpreter::ScN()
{
-switch (GetRawStackType())
-{
-case svSingleRef:
-case svDoubleRef:
-case svMatrix:
-case svExternalSingleRef:
-case svExternalDoubleRef:
-{
-ScMatrixRef pMat = GetMatrix();
-SCSIZE nC, nR;
-pMat-GetDimensions(nC, nR);
-if (!nC || !nR)
-PushDouble(0);
-else
-PushDouble(pMat-GetDouble(0, 0));
-return;
-}
-case svString:
-PopError();
-PushDouble(0);
-return;
-default:
-;
-}
-
-// Default action
+RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, sc, er, ScInterpreter::ScN );
+sal_uInt16 nErr = nGlobalError;
+nGlobalError = 0;
+// Temporarily override the ConvertStringToValue() error for
+// GetCellValue() / GetCellValueOrZero()
+sal_uInt16 nSErr = mnStringNoValueError;
+mnStringNoValueError = errCellNoValue;
double fVal = GetDouble();
-if (nGlobalError)
-{
-// Don't propagate the error. Push 0 instead.
-nGlobalError = 0;
-PushDouble(0);
-return;
-}
+mnStringNoValueError = nSErr;
+if (nErr)
+nGlobalError = nErr;// preserve previous error if any
+else if (nGlobalError ==
[Libreoffice-commits] .: 3 commits - android/qa configure.in
android/qa/desktop/Makefile | 16 +-- configure.in| 59 +++- 2 files changed, 45 insertions(+), 30 deletions(-) New commits: commit 377d16bf8b61b5543233f4ffdef7dd1848585040 Author: Michael Meeks michael.me...@suse.com Date: Tue Jun 26 20:20:41 2012 +0100 android: add --with-android-arch to make space for an x86 target diff --git a/configure.in b/configure.in index e282af3..d95d738 100644 --- a/configure.in +++ b/configure.in @@ -109,6 +109,23 @@ fi dnl === dnl When building for Android the --with-android-ndk is mandatory dnl === + +AC_ARG_WITH(android-ndk, +AS_HELP_STRING([--with-android-ndk], +[Specify location of the Android Native Development Kit. Mandatory when building for Android.]), +,) + +AC_ARG_WITH(android-sdk, +AS_HELP_STRING([--with-android-sdk], +[Specify location of the Android SDK. Mandatory when building for Android.]), +,) + +AC_ARG_WITH(android-arch, +AS_HELP_STRING([--with-android-arch], +[Specify the Android target architecture - default is arm, or try x86]),, +[with_android_arch=arm]) + +ANDROID_ARCH= ANDROID_NDK_HOME= if test -n $with_android_ndk; then ANDROID_NDK_HOME=$with_android_ndk @@ -116,20 +133,27 @@ if test -n $with_android_ndk; then # What if the NDK at some point starts including several toolchains for different # gcc versions (like some 3rd-party improved NDK builds already do)? # Then the use of a wildcard below will break. - ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/arm-linux*/prebuilt/*/bin` - - test -z $SYSBASE export SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-arm - test -z $AR AR=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ar - test -z $NM NM=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-nm - test -z $OBJDUMP OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-objdump - test -z $RANLIB RANLIB=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ranlib - test -z $STRIP STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip - - ANDROIDCFLAGS=-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a - - test -z $CC CC=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc $ANDROIDCFLAGS - test -z $CXX CXX=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ $ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include + ANDROID_ABI_PREBUILT_BIN=`echo $ANDROID_NDK_HOME/toolchains/$with_android_arch-linux*/prebuilt/*/bin` + + test -z $SYSBASE export SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$with_android_arch + test -z $AR AR=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-ar + test -z $NM NM=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-nm + test -z $OBJDUMP OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-objdump + test -z $RANLIB RANLIB=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-ranlib + test -z $STRIP STRIP=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-strip + + if test $with_android_arch = arm; then + ANDROIDCFLAGS=-march=armv7-a -mfloat-abi=softfp -mfpu=neon -Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a + ANDROIDCXXFLAGS=$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include + else # x86 + ANDROIDCFLAGS=-march=atom --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-x86 -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86 + ANDROIDCXXFLAGS=$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86/include + fi + test -z $CC CC=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-gcc $ANDROIDCFLAGS + test -z $CXX CXX=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-g++ $ANDROIDCXXFLAGS + ANDROID_ARCH=$with_android_arch fi +AC_SUBST(ANDROID_ARCH) AC_SUBST(ANDROID_NDK_HOME) dnl === @@ -983,15 +1007,6 @@ AC_ARG_ENABLE(coretext, dnl === dnl Optional Packages (--with/without-) dnl === -AC_ARG_WITH(android-ndk, -AS_HELP_STRING([--with-android-ndk], -[Specify location of the Android Native Development Kit. Mandatory when building for Android.]), -,) -
Re: [PATCH] Converting Svptrarr usage (33)
On Tue, Jun 26, 2012 at 4:39 PM, Caolán McNamara caol...@redhat.com wrote: FWIW, there now doesn't seem to be *too* many of the ForEach_foo, ::ForEach and ::_ForEach family left in LibreOffice except for a few users in sw. If those went away they could be removed en-masse from the svl/inc/svl/svarray.hxx macros which would drop 9 lines from unusedcode.easy as a sideeffect. I'm hoping to get to the point where we can just drop svarray.hxx altogether :-) But the SORT and SORT_DEL variants are making my life difficult - they tend to be used in ways which are pretty hard to convert to STL containers. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 2 commits - sc/source
sc/source/core/tool/interpr1.cxx |4 ++--
sc/source/core/tool/token.cxx| 13 -
2 files changed, 2 insertions(+), 15 deletions(-)
New commits:
commit 1e8650e0c0902181ac4431fc4fded40abe55a781
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 26 21:57:33 2012 +0200
removed unused lcl_IsReference()
Change-Id: I1f79bf11105e06cf713db11a6e00cd41a3aab06b
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 99b0713..1d7f2a1 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -116,19 +116,6 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScSingleRefToken )
// Need quite a lot of ScDoubleRefToken
IMPL_FIXEDMEMPOOL_NEWDEL( ScDoubleRefToken )
-// --- helpers --
-
-inline bool lcl_IsReference( OpCode eOp, StackVar eType )
-{
-return
-(eOp == ocPush (eType == svSingleRef || eType == svDoubleRef))
-|| (eOp == ocColRowNameAuto eType == svDoubleRef)
-|| (eOp == ocColRowName eType == svSingleRef)
-|| (eOp == ocMatRef eType == svSingleRef)
-;
-}
-
-
// --- class ScRawToken -
xub_StrLen ScRawToken::GetStrLen( const sal_Unicode* pStr )
commit a323d44a95c8e4a82599fa33d7d78d4d407741d0
Author: Eike Rathke er...@redhat.com
Date: Tue Jun 26 21:49:01 2012 +0200
bring some sense into translated comment
Change-Id: I045927b3310ddef6208a1d0a837ed6bc098f9ca8
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index f3090bf..a7f6572 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -2970,14 +2970,14 @@ void ScInterpreter::ScN()
void ScInterpreter::ScTrim()
{
-// Doesn't only trim but writes out twice!
+// Doesn't only trim but also removes duplicated blanks within!
String aVal = comphelper::string::strip(GetString(), ' ');
String aStr;
register const sal_Unicode* p = aVal.GetBuffer();
register const sal_Unicode* const pEnd = p + aVal.Len();
while ( p pEnd )
{
-if ( *p != ' ' || p[-1] != ' ' )// ' ' can't be first, -1 is fine
too
+if ( *p != ' ' || p[-1] != ' ' )// first can't be ' ', so -1 is
fine
aStr += *p;
p++;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice] [GSoC 2012][svg export filter] Weekly Report #5
On Tue, 26 Jun 2012 10:26:02 +0200, Thorsten Behrens t...@documentfoundation.org wrote: Hi Marco, skip Implemented support to the rewind option for the JavaScript engine. Is that working satisfactory already? If yes, I wouldn't mind you merging svg-export into master again. Just to be sure there is no misunderstanding, for rewind option I mean the possibility of resetting a shape to its original state when the effect is ended (that is performed by managing the fill=remove case properly), not the ability to go back by a single effect which would require to set the animation engine to a state where it is possible to play the last effect again. As for your question: well it works correctly but on Opera as it doesn't like the fill attribute on animation element, and in some cases it removes the attribute value, so I really don't know how to fix it at present. Cheers, -- Marco -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Björn Michaelsen bjoern.michael...@canonical.com changed: What|Removed |Added Depends on||51324 --- Comment #28 from Björn Michaelsen bjoern.michael...@canonical.com 2012-06-26 13:53:29 PDT --- Adding 51324 as it is: a) a crasher b) although it is a heisenbug, we have a decent reproduction scenario c) it disturbs all forms of automated testing -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- 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
[GSOC] Removing avmedia dependency in drawinglayer
This patch remove avmedia dependency in drawinglayer to avoid a circular dependency, this is the most clean solution i came up with but i wanted to share it before applying it The other option was create a new lib drawinglayer_media with just that code because moving the class to svx didnt feel right. The only use of this class came from http://opengrok.libreoffice.org/xref/core/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx#152 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] .: 3 commits - oox/source sc/inc sc/source xmloff/inc xmloff/source
oox/source/token/tokens.txt |1 +
sc/inc/colorscale.hxx |7 +++
sc/inc/fillinfo.hxx |1 +
sc/source/core/data/colorscale.cxx |1 +
sc/source/filter/inc/extlstcontext.hxx |1 +
sc/source/filter/oox/extlstcontext.cxx | 13 +
sc/source/filter/xml/xmlcondformat.cxx | 11 +++
sc/source/filter/xml/xmlexprt.cxx |4
sc/source/filter/xml/xmlimprt.cxx |1 +
sc/source/filter/xml/xmlimprt.hxx |3 ++-
sc/source/ui/condformat/colorformat.cxx |2 ++
sc/source/ui/view/output.cxx|5 +++--
xmloff/inc/xmloff/xmltoken.hxx |1 +
xmloff/source/core/xmltoken.cxx |1 +
14 files changed, 49 insertions(+), 3 deletions(-)
New commits:
commit 3f135598fd508e70f31f36cd8a8d7a61ccf4ff79
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Jun 27 05:53:29 2012 +0200
add import of axis color for data bars from xlsx
Change-Id: I2a15f8787afceaea1cb8e1c2902c05367d3e5b15
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 5bbaa62..fee78ee 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -713,6 +713,7 @@ axId
axPos
axis
axisCol
+axisColor
axisPage
axisPosition
axisRow
diff --git a/sc/source/filter/inc/extlstcontext.hxx
b/sc/source/filter/inc/extlstcontext.hxx
index 2ed742d..a76109c 100644
--- a/sc/source/filter/inc/extlstcontext.hxx
+++ b/sc/source/filter/inc/extlstcontext.hxx
@@ -43,6 +43,7 @@ public:
private:
void importDataBar( const AttributeList rAttribs );
void importNegativeFillColor( const AttributeList rAttribs );
+void importAxisColor( const AttributeList rAttribs );
void* mpTarget;
};
diff --git a/sc/source/filter/oox/extlstcontext.cxx
b/sc/source/filter/oox/extlstcontext.cxx
index 3f6991e..6435128 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -58,6 +58,10 @@ void ExtCfRuleContext::onStartElement( const AttributeList
rAttribs )
break;
case XLS_EXT_TOKEN( negativeFillColor ):
importNegativeFillColor( rAttribs );
+break;
+case XLS_EXT_TOKEN( axisColor ):
+importAxisColor( rAttribs );
+break;
default:
break;
@@ -93,6 +97,15 @@ namespace {
}
+void ExtCfRuleContext::importAxisColor( const AttributeList rAttribs )
+{
+ScDataBarFormatData* pDataBar =
static_castScDataBarFormatData*(mpTarget);
+
+sal_Int32 nColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT );
+::Color aColor = RgbToRgbComponents(nColor);
+pDataBar-maAxisColor = aColor;
+}
+
void ExtCfRuleContext::importNegativeFillColor( const AttributeList rAttribs )
{
sal_Int32 nColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT );
commit 064bfb1aab1b207a37a602f155f3b3c15cef60b4
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jun 26 16:42:33 2012 +0200
add support for axis color import/export
Change-Id: I713981b9ae1a82ca0b014cde88abdc32af1f9975
diff --git a/sc/source/filter/xml/xmlcondformat.cxx
b/sc/source/filter/xml/xmlcondformat.cxx
index 6aa55cc..a8fc8bb 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -193,6 +193,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext(
ScXMLImport rImport, sal_
rtl::OUString sGradient;
rtl::OUString sAxisPosition;
rtl::OUString sShowValue;
+rtl::OUString sAxisColor;
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList-getLength() : 0);
const SvXMLTokenMap rAttrTokenMap = GetScImport().GetDataBarAttrMap();
@@ -221,6 +222,9 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext(
ScXMLImport rImport, sal_
case XML_TOK_DATABAR_SHOWVALUE:
sShowValue = sValue;
break;
+case XML_TOK_DATABAR_AXISCOLOR:
+sAxisColor = sValue;
+break;
default:
break;
}
@@ -253,6 +257,13 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext(
ScXMLImport rImport, sal_
else
mpFormatData-mbNeg = false;
+if(!sAxisColor.isEmpty())
+{
+sal_Int32 nColor = 0;
+sax::Converter::convertColor( nColor, sAxisColor );
+mpFormatData-maAxisColor = Color(nColor);
+}
+
if(!sShowValue.isEmpty())
{
bool bShowValue = true;
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 1bfe200..5cd5594 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3963,6 +3963,10 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
rtl::OUStringBuffer aBuffer;
::sax::Converter::convertColor(aBuffer,
pFormatData-maPositiveColor.GetColor());
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 3 commits - oox/source sc/inc sc/source xmloff/inc xmloff/source
oox/source/token/tokens.txt |1 +
sc/inc/colorscale.hxx |7 +++
sc/inc/fillinfo.hxx |1 +
sc/source/core/data/colorscale.cxx |1 +
sc/source/filter/inc/extlstcontext.hxx |1 +
sc/source/filter/oox/extlstcontext.cxx | 13 +
sc/source/filter/xml/xmlcondformat.cxx | 11 +++
sc/source/filter/xml/xmlexprt.cxx |4
sc/source/filter/xml/xmlimprt.cxx |1 +
sc/source/filter/xml/xmlimprt.hxx |3 ++-
sc/source/ui/condformat/colorformat.cxx |2 ++
sc/source/ui/view/output.cxx|5 +++--
xmloff/inc/xmloff/xmltoken.hxx |1 +
xmloff/source/core/xmltoken.cxx |1 +
14 files changed, 49 insertions(+), 3 deletions(-)
New commits:
commit eee54a502d5279fe1f4e38a384e7182e88d34f34
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Wed Jun 27 05:53:29 2012 +0200
add import of axis color for data bars from xlsx
Change-Id: I2a15f8787afceaea1cb8e1c2902c05367d3e5b15
diff --git a/oox/source/token/tokens.txt b/oox/source/token/tokens.txt
index 5bbaa62..fee78ee 100644
--- a/oox/source/token/tokens.txt
+++ b/oox/source/token/tokens.txt
@@ -713,6 +713,7 @@ axId
axPos
axis
axisCol
+axisColor
axisPage
axisPosition
axisRow
diff --git a/sc/source/filter/inc/extlstcontext.hxx
b/sc/source/filter/inc/extlstcontext.hxx
index 2ed742d..a76109c 100644
--- a/sc/source/filter/inc/extlstcontext.hxx
+++ b/sc/source/filter/inc/extlstcontext.hxx
@@ -43,6 +43,7 @@ public:
private:
void importDataBar( const AttributeList rAttribs );
void importNegativeFillColor( const AttributeList rAttribs );
+void importAxisColor( const AttributeList rAttribs );
void* mpTarget;
};
diff --git a/sc/source/filter/oox/extlstcontext.cxx
b/sc/source/filter/oox/extlstcontext.cxx
index 3f6991e..6435128 100644
--- a/sc/source/filter/oox/extlstcontext.cxx
+++ b/sc/source/filter/oox/extlstcontext.cxx
@@ -58,6 +58,10 @@ void ExtCfRuleContext::onStartElement( const AttributeList
rAttribs )
break;
case XLS_EXT_TOKEN( negativeFillColor ):
importNegativeFillColor( rAttribs );
+break;
+case XLS_EXT_TOKEN( axisColor ):
+importAxisColor( rAttribs );
+break;
default:
break;
@@ -93,6 +97,15 @@ namespace {
}
+void ExtCfRuleContext::importAxisColor( const AttributeList rAttribs )
+{
+ScDataBarFormatData* pDataBar =
static_castScDataBarFormatData*(mpTarget);
+
+sal_Int32 nColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT );
+::Color aColor = RgbToRgbComponents(nColor);
+pDataBar-maAxisColor = aColor;
+}
+
void ExtCfRuleContext::importNegativeFillColor( const AttributeList rAttribs )
{
sal_Int32 nColor = rAttribs.getIntegerHex( XML_rgb, API_RGB_TRANSPARENT );
commit d09e1505086ec775b5521f58927def50fabd0865
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Jun 26 16:42:33 2012 +0200
add support for axis color import/export
Change-Id: I713981b9ae1a82ca0b014cde88abdc32af1f9975
diff --git a/sc/source/filter/xml/xmlcondformat.cxx
b/sc/source/filter/xml/xmlcondformat.cxx
index 6aa55cc..a8fc8bb 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -193,6 +193,7 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext(
ScXMLImport rImport, sal_
rtl::OUString sGradient;
rtl::OUString sAxisPosition;
rtl::OUString sShowValue;
+rtl::OUString sAxisColor;
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList-getLength() : 0);
const SvXMLTokenMap rAttrTokenMap = GetScImport().GetDataBarAttrMap();
@@ -221,6 +222,9 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext(
ScXMLImport rImport, sal_
case XML_TOK_DATABAR_SHOWVALUE:
sShowValue = sValue;
break;
+case XML_TOK_DATABAR_AXISCOLOR:
+sAxisColor = sValue;
+break;
default:
break;
}
@@ -253,6 +257,13 @@ ScXMLDataBarFormatContext::ScXMLDataBarFormatContext(
ScXMLImport rImport, sal_
else
mpFormatData-mbNeg = false;
+if(!sAxisColor.isEmpty())
+{
+sal_Int32 nColor = 0;
+sax::Converter::convertColor( nColor, sAxisColor );
+mpFormatData-maAxisColor = Color(nColor);
+}
+
if(!sShowValue.isEmpty())
{
bool bShowValue = true;
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index ab01286..6b91c2e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3971,6 +3971,10 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
rtl::OUStringBuffer aBuffer;
::sax::Converter::convertColor(aBuffer,
pFormatData-maPositiveColor.GetColor());
Re: [Libreoffice-qa] BugHunt Session ...Re: [libreoffice-projects] Re: minutes of the libreoffice qa call 2012-06-14
On Mon, 2012-06-25 at 19:38 +0200, Cor Nouws wrote: What do others think? If it gets us more testing of 3.6 - it sounds like an excellent idea to me :-) ATB, Michael. -- michael.me...@suse.com , Pseudo Engineer, itinerant idiot ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [ANNOUNCE] libreoffice-3.5.5.2 tag created (3.5.5-rc2)
Hi, there have been created the libreoffice-3.5.5.2 tag for 3.5.5-rc2 release. The corresponding official builds will be available within next few days. It will be used as final if no blocker is found. See the attached list of changes against 3.5.5-rc1. Now, you might switch your current 3-5 source tree to it using: ./g fetch --tags ./g checkout -b tag-libreoffice-3.5.5.2 libreoffice-3.5.5.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#3.5_release and release criteria at http://wiki.documentfoundation.org/Release_Criteria Best Regards, Petr fdo#30519 Bad transitions if use hardware acceleration is enabled [David Tardon] fdo#41556 VIEWING: Incomplete font substitution when FontConfig matches italic font [Caolán McNamara] fdo#43967 VIEWING: legacy report designer wizard improperly formats dates [Lionel Elie Mamane] fdo#46738 Cell background and border color formatting information of empty cells lost in particular document after FILESAVE as xls and xlsx [Petr Mladek] fdo#47636 Extremely slow display with font fallback [Caolán McNamara] fdo#48601 FILEOPEN: Open Visio's file with bitmap's blocks [Julien Nabet, Fridrich Štrba] fdo#48602 FILEOPEN: The Greek codepage instead the Russian codepage (*.vsd by MS_Visio-2000) [Fridrich Štrba] fdo#49178 CRASH when FILEOPEN particular RTF [Julien Nabet] fdo#49582 FILESAVE: Long delays saving in XP .XLS format [Petr Mladek] fdo#50603 Unable to update LibreOffice without resetting user profile [Stephan Bergmann] fdo#50988 Draw crashes on loading MS Logical Design Diagram example viso file. [Julien Nabet] fdo#51243 Trying to edit a report from new (but awful) Report Builder hangs libreoffice [Lionel Elie Mamane] fdo#51249 Crash while saving a document with track-changes enabled [Pierre-Eric Pelloux-Prayer] fdo#51270 On UNINSTALLING, LibreOffice leaves dirt behind [Andras Timar] rhbz#678440 opening urls fails with error 403 on picky servers [Fridrich Štrba, Stephan Bergmann] + common + version 3.5.5.2, tag libreoffice-3.5.5.2 (3.5.5-rc2) [Petr Mladek] + core + always include User-Agent to avoid 403 from picky servers (rhbz#678440) [Stephan Bergmann] + avoid a crash because of shared_ptr ownership [Luboš Luňák] + bump product version to 3.5.5-rc1+ [Petr Mladek] + bump product version to 3.5.5-rc2, release number to 2 [Petr Mladek] + cache fontconfig font substitutions (fdo#41556, fdo#47636) [Caolán McNamara] + close fds across a restart of soffice on Mac OS X (fdo#50603) [Stephan Bergmann] + CRASH when FILEOPEN particular RTF (fdo#49178) [Julien Nabet] + delete problematic IsOfficeRunning custom action [Andras Timar] + disable stream copy when saving a file with 'Changes Record' active (fdo#51249) [Pierre-Eric Pelloux-Prayer] + fix another crash in exotic circumstances [Fridrich Štrba] + fix arguments of Rectangle constructor [Ruslan Kabatsayev] + fix RemoveExtensions custom action (fdo#51270) [Andras Timar] + fix typo: = - == [David Tardon] + GTK: don't crash on X errors [Ruslan Kabatsayev] + infinite loop in SwFrameControlsManager::SetReadonlyControls (fdo#51243) [Lionel Elie Mamane] + legacy report designer wizard formats dates improperly (fdo#43967) [Lionel Elie Mamane] + paint scrolled area from the right surface (fdo#30519) [David Tardon] + related: FILEOPEN: Open Visio's file with bitmap's blocks (fdo#48601) [Julien Nabet] + revert Always include User-Agent to avoid 403 from picky servers (rhbz#678440) [Fridrich Štrba] + revert export all style information to xls/xlsx, (fdo#49582, fdo#46738) [Petr Mladek] + trying to solve out of bonds in (fdo#48601) [Fridrich Štrba] + uploading libvisio 0.0.18, fixing (fdo#48602) [Fridrich Štrba] + translations + update translations for LibreOffice 3.5.5 rc2 [Andras Timar] ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] BugHunt Session ...Re: [libreoffice-projects] Re: minutes of the libreoffice qa call 2012-06-14
Michael Meeks schrieb: If it gets us more testing of 3.6 - it sounds like an excellent idea to Hi, I also believe it would be great do do some final spurt for 3.6. Though I will have to beg of, currently I invest a lot of time for testing with Master and 3.6 during normal work, (https://bugs.freedesktop.org/report.cgi?x_axis_field=versiony_axis_field=reporterz_axis_field=query_format=report-tableshort_desc_type=allwordssubstrshort_desc=product=LibreOfficelongdesc_type=allwordssubstrlongdesc=bug_file_loc_type=allwordssubstrbug_file_loc=status_whiteboard_type=allwordssubstrstatus_whiteboard=keywords_type=allwordskeywords=bug_id=bug_id_type=anyexactemailassigned_to1=1emailtype1=substringemail1=emailassigned_to2=1emailreporter2=1emailqa_contact2=1emailcc2=1emailtype2=substringemail2=emailtype3=substringemail3=chfieldvalue=chfieldfrom=chfieldto=Nowfield0-0-0=versiontype0-0-0=anywordssubstrvalue0-0-0=3.6.0+3.7.0.0.alphaformat=tableaction=wrap), and I will have to limit my engagement a little to avoid conflicts with job and wife ;-) But may be I will join for a short visit. Best regards rainer ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 51426] Installation of LibreOffice on Windows
https://bugs.freedesktop.org/show_bug.cgi?id=51426 Florian Reisinger reisi...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever Confirmed|0 |1 --- Comment #2 from Florian Reisinger reisi...@gmail.com 2012-06-25 23:03:50 PDT --- Jep, IMHO a Windows Installer bug. CCed Andreas Timar /in Installer Expert @David: Good catch ;) -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51426] Installation of LibreOffice on Windows
https://bugs.freedesktop.org/show_bug.cgi?id=51426 Florian Reisinger reisi...@gmail.com changed: What|Removed |Added CC||tima...@gmail.com --- Comment #1 from Florian Reisinger reisi...@gmail.com 2012-06-25 23:03:38 PDT --- Jep, IMHO a Windows Installer bug. CCed Andreas Timar /in Installer Expert @David: Good catch ;) -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51433] New: Intermittent Error - Inadmissible value or data type. Data type mismatch.
https://bugs.freedesktop.org/show_bug.cgi?id=51433 Bug #: 51433 Summary: Intermittent Error - Inadmissible value or data type. Data type mismatch. Classification: Unclassified Product: LibreOffice Version: 3.5.4 release Platform: All OS/Version: All Status: UNCONFIRMED Severity: normal Priority: medium Component: BASIC AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: libreofficeb...@toeai.com By intermittent, I do NOT mean that the bug can only be reproduced sometimes. It can ALWAYS be reproduced if you follow the directions below precisely. By intermittent, I mean that if you wander from the precise instructions given, the results become unpredictable. Entering the same input can lead to different behavior depending on how you got there. I have reproduced it on 3.4.5 running on Linux Mint Debian 64-bit and on 3.3 and 3.5.4.2 running on Windows XP. Steps to reproduce: 1) Open Calc and start with a new empty spreadsheet file. 2) Click Tools, Macros, Organize Macros, LibreOffice Basic... 3) Click Untitled 1, click New, click OK. 4) In the code editor, press Ctrl+A then Delete to clear any automatic skeleton code. 5) Enter the following code: Function Q(a, b) Q = IIf(a MOD b = 0, 0, b - (a MOD b)) End Function 6) Go to cell A1; enter the formula =Q(4,3). (no error, result is 2) 7) In the code editor, change the name of the function on lines 1 and 2 from Q to R (example - other names will work). 8) Change the formula in A1 to read =R(4,2). (no error, result is 0) 9) Again, change the formula in A1 to now read =R(4,3); enter. (You are taken back to the code editor; line 2 is highlighted; The message box reads Inadmissible value or data type. Data type mismatch.) Extra credit: Change the function name again (e.g. Foo) Change the formula to =FOO(4,3). (no error) Change the formula to =FOO(4,4). (no error) Change the formula to =FOO(4,5). (now you get the error as described above) -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51434] New: Inadequate Print Preview if Legal Size or A4 Paper
https://bugs.freedesktop.org/show_bug.cgi?id=51434 Bug #: 51434 Summary: Inadequate Print Preview if Legal Size or A4 Paper Classification: Unclassified Product: LibreOffice Version: 3.5.2 release Platform: x86-64 (AMD64) OS/Version: Windows (All) Status: UNCONFIRMED Severity: minor Priority: medium Component: Libreoffice AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: dlg.al...@gmail.com Created attachment 63475 -- https://bugs.freedesktop.org/attachment.cgi?id=63475 Inadequate Preview if A4 and Legal Size LibreOffice 3.5.3.2 Build ID: 235ab8a-3802056-4a8fed3-2d66ea8-e241b80 Windows XP Professional Service Pack 3 = Not accurate preview when Legal or A4 is used screenshot has been provided!! -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51434] Inadequate Print Preview if Legal Size or A4 Paper
https://bugs.freedesktop.org/show_bug.cgi?id=51434 Alfel Benvic Go dlg.al...@gmail.com changed: What|Removed |Added Component|Libreoffice |Printing and PDF export -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51434] Inadequate Print Preview if Legal Size or A4 Paper
https://bugs.freedesktop.org/show_bug.cgi?id=51434 Alfel Benvic Go dlg.al...@gmail.com changed: What|Removed |Added Status|UNCONFIRMED |NEW Ever Confirmed|0 |1 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51435] New: TDF Site: Download hints with obsolete versions
https://bugs.freedesktop.org/show_bug.cgi?id=51435 Bug #: 51435 Summary: TDF Site: Download hints with obsolete versions Classification: Unclassified Product: LibreOffice Version: 3.5.4 release Platform: Other OS/Version: All Status: NEW Severity: critical Priority: medium Component: WWW AssignedTo: libreoffice-bugs@lists.freedesktop.org ReportedBy: libreoff...@bielefeldundbuss.de CC: cl...@cup.uni-muenchen.de Blocks: 50029 Steps how to reproduce: 1. Visit http://www.libreoffice.org/get-help/installation/windows/ Via LibO Home Page - Get Help - Installation - Installing LibreOffice on Windows; - Download the LibreOffice installer Expected Offer: 3.5.4 and 3.4.6 Actual: LibreOffice 3.5.0 Final (2012-02-14) + LibreOffice 3.4.5 Final (2012-01-16) Same Problem with Linux and Mac The download link is correct for 3.5.4, but the texts are wrong. Additional download Problems: - On a.m. Page 3.4.5 is offered in the heading, but there is no way to download that version from that page. Additionally we have a link to 3.4 Features, But I can not find any way to download 3.4 on LibO Page Problem reported here is part of problem in Bug 50029 - German download page is still the old ugly layout and should be updated as the intl. one -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 50029] German download page is still the old ugly layout and should be updated as the intl. one
https://bugs.freedesktop.org/show_bug.cgi?id=50029 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||51435 -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51415] : I have 3.4.3 and need to go to 3.4.5 before 3.5.x .... where do I find the download for 3.4.5?
https://bugs.freedesktop.org/show_bug.cgi?id=51415 David Tardon dtar...@redhat.com changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution||NOTABUG CC||dtar...@redhat.com --- Comment #1 from David Tardon dtar...@redhat.com 2012-06-25 23:39:31 PDT --- Bugzilla is not a support tool! Anyway, the old releases can be found in http://downloadarchive.documentfoundation.org/libreoffice/old/ . -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 --- Comment #27 from Roman Eisele b...@eikota.de 2012-06-25 23:41:31 PDT --- (In reply to comment #26) Bug 40907 : the bug is very annoying for corporate use on mac network I agree completely. However, bug 40907 is already included in our LibreOffice 3.5 most annoying bugs list (bug 37361), and this is sufficient and adaequate. At the moment, the present (3.6) bugs list should contain only bugs which are *new* in LibreOffice 3.6. If bug 40907 will not be resolved during the 3.5 maintenance phase, we will move it, just like all remaining (open) 3.5 bugs, to this (3.6) bug list, so there really is no need to include a bug in both lists. (No offence -- this is just an attempt to explain our current practice for anybody who does not know it yet!) -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are on the CC list for the bug. You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 48644] TDF Site: There is No Longer a Link to 3.4.x version download In Conflict with Published Policy
https://bugs.freedesktop.org/show_bug.cgi?id=48644 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Status|UNCONFIRMED |NEW Severity|normal |major CC||cl...@cup.uni-muenchen.de, ||LibreOffice@bielefeldundbus ||s.de Ever Confirmed|0 |1 --- Comment #1 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-06-25 23:54:46 PDT --- So it is -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 35715] Download information missing
https://bugs.freedesktop.org/show_bug.cgi?id=35715 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Status|NEW |RESOLVED Resolution||WORKSFORME CC||LibreOffice@bielefeldundbus ||s.de --- Comment #1 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-06-26 00:03:12 PDT --- Can't find that any longer -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 45582] VIEWING: Background Colour of Different Items are Marked Incorrectly with the Background Colour of Fields
https://bugs.freedesktop.org/show_bug.cgi?id=45582 --- Comment #12 from sasha.libreoff...@gmail.com 2012-06-26 00:07:46 PDT --- Thanks for attachment and additional explanations In my Opinion bullets, numbering digits, formatting marks and chapter numbers are not fields. As I can see, from LO point of view, these things are fields. Just automatically added. They are automatically recalculated as other fields. IMHO internally they are also fields. From user point they are not fields because not inserted manually. May be separating one sort of fields from other will take much resources from developers because will needed reworking huge amount of internals of LO. And will added many regressions. What about attached screenshots and comment 3 : reproduced in 3.5.4, but it is the same thing as in comment 1 We may change this bug report to functionality request with name something like Separate automatically added fields and manually added -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 46186] RTL: RTL table reverses its direction on LTR page
https://bugs.freedesktop.org/show_bug.cgi?id=46186 Ahmad Harthi aalhar...@kacst.edu.sa changed: What|Removed |Added Platform|Other |All Priority|medium |high CC||aalhar...@kacst.edu.sa, ||fmalota...@kacst.edu.sa Version|3.4.4 release |3.5.4 release --- Comment #2 from Ahmad Harthi aalhar...@kacst.edu.sa 2012-06-26 00:26:31 PDT --- I confirm this using LibreOffice 3.5.4 on Windows 7 Basic. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 51426] Installation of LibreOffice on Windows
https://bugs.freedesktop.org/show_bug.cgi?id=51426 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added CC||LibreOffice@bielefeldundbus ||s.de --- Comment #3 from Rainer Bielefeld libreoff...@bielefeldundbuss.de 2012-06-26 00:31:54 PDT --- Not reproducible for me. Clicked big download button Main installer, was forwarded to http://ftp5.gwdg.de/pub/tdf/libreoffice/stable/3.5.4/win/x86/LibO_3.5.4_Win_x86_install_multi.msi But may be we have a mirror with a damaged file on it? I have no idea how to reproduce the problem - what ever it might be. @David/Florian: unfortunately important information is missing. Please: - Write a meaningful Summary describing exactly what the problem is - add information -- Why you selected Version 3.5.1RC1 -- Concerning the download mirror (I find that information in Seamonkey Download Manager) -- everything else crossing your mind after you read linked texts -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
