date:20130816

[Libreoffice-commits] core.git: 2 commits - sd/source sw/source

2013-08-16 Thread Ivan Timofeev

 sd/source/ui/accessibility/AccessibleOutlineView.cxx   |4 
 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx |4 
 sd/source/ui/accessibility/AccessibleSlideSorterView.cxx   |4 
 sd/source/ui/animations/CustomAnimationCreateDialog.cxx|2 
 sd/source/ui/animations/CustomAnimationDialog.cxx  |   48 +++-
 sd/source/ui/animations/CustomAnimationList.cxx|4 
 sd/source/ui/animations/CustomAnimationPane.cxx|   53 -
 sd/source/ui/animations/CustomAnimationPane.hxx|4 
 sd/source/ui/animations/SlideTransitionPane.cxx|   72 +
 sd/source/ui/animations/SlideTransitionPane.hxx|6 -
 sw/source/ui/docvw/HeaderFooterWin.cxx |4 
 11 files changed, 91 insertions(+), 114 deletions(-)

New commits:
commit 1f7d320eae75f7d96846f117f7b061ab6a5a84b1
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Aug 16 12:07:52 2013 +0400

String-OUString

Change-Id: I082aaa9ddd539a9d7989f763c320343bd1951f4e

diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx 
b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 5074eaf..39fc2d8 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -245,7 +245,7 @@ OUString
 {
 SolarMutexGuard aGuard;
 
-return String( SdResId(SID_SD_A11Y_I_OUTLINEVIEW_N) );
+return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_N);
 }
 
 
@@ -258,7 +258,7 @@ OUString
 {
 SolarMutexGuard aGuard;
 
-return String( SdResId(SID_SD_A11Y_I_OUTLINEVIEW_D) );
+return SD_RESSTR(SID_SD_A11Y_I_OUTLINEVIEW_D);
 }
 
 void AccessibleOutlineView::UpdateChildren()
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx 
b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 9366bd1..c5177c1 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -203,7 +203,7 @@ OUString SAL_CALL 
AccessibleSlideSorterObject::getAccessibleDescription (void)
 throw (uno::RuntimeException)
 {
 ThrowIfDisposed();
-return String(SdResId(STR_PAGE));
+return SD_RESSTR(STR_PAGE);
 }
 
 
@@ -219,7 +219,7 @@ OUString SAL_CALL 
AccessibleSlideSorterObject::getAccessibleName (void)
 if (pPage != NULL)
 return pPage-GetName();
 else
-return String();
+return OUString();
 }
 
 
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx 
b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index ba31c04..e682668 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -294,7 +294,7 @@ OUString SAL_CALL 
AccessibleSlideSorterView::getAccessibleDescription (void)
 ThrowIfDisposed();
 SolarMutexGuard aGuard;
 
-return String(SdResId(SID_SD_A11Y_I_SLIDEVIEW_D));
+return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_D);
 }
 
 
@@ -306,7 +306,7 @@ OUString SAL_CALL 
AccessibleSlideSorterView::getAccessibleName (void)
 ThrowIfDisposed();
 SolarMutexGuard aGuard;
 
-return String(SdResId(SID_SD_A11Y_I_SLIDEVIEW_N));
+return SD_RESSTR(SID_SD_A11Y_I_SLIDEVIEW_N);
 }
 
 
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx 
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 813ff4e..95454ad 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -252,7 +252,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( 
Window* pParent, Cus
 
 fillDurationComboBox(mpCBSpeed);
 
-String sMotionPathLabel( SdResId( STR_CUSTOMANIMATION_USERPATH ) );
+OUString sMotionPathLabel( SD_RESSTR( STR_CUSTOMANIMATION_USERPATH ) );
 
 sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND;
 
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx 
b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 058a072..691ec3a 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -566,8 +566,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 
nControlType, Window
 mpMenu = new PopupMenu();
 for( sal_Int32 i = 25; i  101; i += 25 )
 {
-String aStr(OUString::valueOf(i));
-aStr += sal_Unicode('%');
+OUString aStr(OUString::number(i) + %);
 mpMenu-InsertItem( i, aStr );
 }
 
@@ -1004,7 +1003,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 
nControlType, Window* pPar
 , maModifyHdl( rModifyHdl )
 {
 mpEdit = new Edit( pParent, 
WB_TABSTOP|WB_IGNORETAB|WB_NOBORDER|WB_READONLY);
-mpEdit-SetText( String( SdResId( STR_CUSTOMANIMATION_SAMPLE ) ) );
+mpEdit-SetText( SD_RESSTR(STR_CUSTOMANIMATION_SAMPLE) );
 
 mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_FONTSTYLE_POPUP ) );

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/inc

2013-08-16 Thread Jürgen Schmidt

 solenv/inc/minor.mk |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit c8dba796d1fc4df773f26e79554a952cd6219968
Author: JÃ¼rgen Schmidt j...@apache.org
Date:   Fri Aug 16 07:54:02 2013 +

adapt version and build number for AOO 4.1.0

diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 8fbfec4..2278b56 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -18,8 +18,8 @@
 #  under the License.
 #
 # *
-RSCVERSION=400
-RSCREVISION=400m3(Build:9702)
-BUILD=9702
-LAST_MINOR=m3
-SOURCEVERSION=AOO400
+RSCVERSION=410
+RSCREVISION=410m1(Build:9750)
+BUILD=9750
+LAST_MINOR=m1
+SOURCEVERSION=AOO410
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2013-08-16 Thread Noel Power

 sc/source/filter/inc/tablebuffer.hxx |4 +++-
 sc/source/filter/oox/tablebuffer.cxx |   28 +---
 sc/source/filter/oox/worksheethelper.cxx |5 +
 3 files changed, 33 insertions(+), 4 deletions(-)

New commits:
commit edd51b813005c2159426d8f2917eede5b14a4577
Author: Noel Power noel.po...@suse.com
Date:   Thu Aug 15 16:23:46 2013 +0100

fix for bnc#834705 missing drop downs for autofilter

After commit fc861c7088e9b639a1c2c80f8ba4535c798aeb34 there is now an order
dependency, between any ScPatternAttr flags indirectly set and
SheetDataBuffer::finalizeImport which sets the attributes directly for a 
column
So the ATTR_MERGE_FLAG that has ScMergeFlagAttr ( and associated
 SC_MF_AUTO flag ) is scrubbed when by the direct writting of the attribute
from SheetDataBuffer::finalizeImport - Document::SetAttrEntries
I've reordered that Table import here and split the finalize ( which happens
before heetDataBuffer::finalizeImport ) so that the databaseranges which 
were
created before sheet import still happens, the autofilter part of the import
is now deferred ( until after SheetDataBuffer::finalizeImport )

Change-Id: I11bb45ee7b330760fd93ecca30b23399414ac3a7

diff --git a/sc/source/filter/inc/tablebuffer.hxx 
b/sc/source/filter/inc/tablebuffer.hxx
index 9d4a2c7..2de2d30 100644
--- a/sc/source/filter/inc/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -59,6 +59,7 @@ public:
 
 /** Creates a database range from this tables. */
 voidfinalizeImport();
+voidapplyAutoFilters();
 
 /** Returns the unique table identifier. */
 inline sal_Int32getTableId() const { return maModel.mnId; }
@@ -103,7 +104,8 @@ public:
 
 /** Creates database ranges from all imported tables. */
 voidfinalizeImport();
-
+/** Applies autofilters from created database range ( requires 
finalizeImport to have run before being called */
+voidapplyAutoFilters();
 /** Returns a table by its identifier. */
 TableRefgetTable( sal_Int32 nTableId ) const;
 /** Returns a table by its display name. */
diff --git a/sc/source/filter/oox/tablebuffer.cxx 
b/sc/source/filter/oox/tablebuffer.cxx
index 672e11c..4dc61a0 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -20,6 +20,7 @@
 #include tablebuffer.hxx
 
 #include com/sun/star/sheet/XDatabaseRange.hpp
+#include com/sun/star/sheet/XDatabaseRanges.hpp
 #include oox/helper/attributelist.hxx
 #include oox/helper/binaryinputstream.hxx
 #include oox/helper/propertyset.hxx
@@ -96,9 +97,6 @@ void Table::finalizeImport()
 PropertySet aPropSet( xDatabaseRange );
 if( !aPropSet.getProperty( mnTokenIndex, PROP_TokenIndex ) )
 mnTokenIndex = -1;
-
-// filter settings
-maAutoFilters.finalizeImport( xDatabaseRange );
 }
 catch( Exception )
 {
@@ -106,6 +104,25 @@ void Table::finalizeImport()
 }
 }
 
+void Table::applyAutoFilters()
+{
+if( !maDBRangeName.isEmpty() )
+{
+try
+{
+// get the range ( maybe we should cache the xDatabaseRange from 
finalizeImport )
+PropertySet aDocProps( getDocument() );
+Reference XDatabaseRanges  xDatabaseRanges( 
aDocProps.getAnyProperty( PROP_DatabaseRanges ), UNO_QUERY_THROW );
+Reference XDatabaseRange  xDatabaseRange( 
xDatabaseRanges-getByName( maDBRangeName ), UNO_QUERY );
+maAutoFilters.finalizeImport( xDatabaseRange );
+}
+catch( Exception )
+{
+OSL_FAIL( Table::applyAutofilters - cannot create filter );
+}
+}
+}
+
 // 
 
 TableBuffer::TableBuffer( const WorkbookHelper rHelper ) :
@@ -129,6 +146,11 @@ void TableBuffer::finalizeImport()
 maIdTables.forEachMem( Table::finalizeImport );
 }
 
+void TableBuffer::applyAutoFilters()
+{
+maIdTables.forEachMem( Table::applyAutoFilters );
+}
+
 TableRef TableBuffer::getTable( sal_Int32 nTableId ) const
 {
 return maIdTables.get( nTableId );
diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 9fe9144..ee8201f 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -68,6 +68,7 @@
 #include scitems.hxx
 #include editutil.hxx
 #include tokenarray.hxx
+#include tablebuffer.hxx
 
 #include svl/stritem.hxx
 #include editeng/editobj.hxx
@@ -946,6 +947,10 @@ void WorksheetGlobals::finalizeWorksheetImport()
 {
 lclUpdateProgressBar( mxRowProgress, 1.0 );
 maSheetData.finalizeImport();
+// assumes getTables().finalizeImport ( which creates the DatabaseRanges )
+// has been called already
+getTables().applyAutoFilters();
+
 getCondFormats().finalizeImport();

[Libreoffice-commits] .: 2 commits - include/cppunit src/cppunit

2013-08-16 Thread Libreoffice Gerrit user

 include/cppunit/TextTestResult.h |2 ++
 src/cppunit/TestCase.cpp |4 
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c4f7bf8d1346bdfc4d34af24b373e6a0aeb6cc46
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 16 10:25:03 2013 +0200

-Werror,-Wbind-to-temporary-copy

C++98 requires an accessible copy constructor for class
'CppUnit::TestCaseMethodFunctor' when binding a reference to a temporary; 
was
private. (Clang)

diff --git a/src/cppunit/TestCase.cpp b/src/cppunit/TestCase.cpp
index 10ff578..13c0525 100644
--- a/src/cppunit/TestCase.cpp
+++ b/src/cppunit/TestCase.cpp
@@ -34,10 +34,6 @@ public:
   }
 
 private:
-  // disable copying
-  TestCaseMethodFunctor( const TestCaseMethodFunctor );
-  // disable copying
-  TestCaseMethodFunctor operator=( const TestCaseMethodFunctor );
   TestCase *m_target;
   Method m_method;
 };
commit d831d2d72f93fc24462bec8f296fd870c8f8407c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 16 10:14:06 2013 +0200

-Werror,-Woverloaded-virtual

'CppUnit::TextTestResult::addFailure' hides overloaded virtual function;
../../include/cppunit/TestResult.h:85:16: note: hidden overloaded virtual
function 'CppUnit::TestResult::addFailure' declared here: different number 
of
parameters (2 vs 1). (Clang)

diff --git a/include/cppunit/TextTestResult.h b/include/cppunit/TextTestResult.h
index e7b1fa3..63937b0 100644
--- a/include/cppunit/TextTestResult.h
+++ b/include/cppunit/TextTestResult.h
@@ -26,6 +26,8 @@ public:
   virtual void addFailure( const TestFailure failure );
   virtual void startTest( Test *test );
   virtual void print( OStream stream );
+
+  using TestResult::addFailure;
 };
 
 /** insertion operator for easy output */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - sc/source

2013-08-16 Thread Noel Power

 sc/source/filter/inc/tablebuffer.hxx |4 +++-
 sc/source/filter/oox/tablebuffer.cxx |   28 +---
 sc/source/filter/oox/worksheethelper.cxx |5 +
 3 files changed, 33 insertions(+), 4 deletions(-)

New commits:
commit 23fa299a5b778696b8825c6892fb54ff0da80d01
Author: Noel Power noel.po...@suse.com
Date:   Thu Aug 15 16:23:46 2013 +0100

fix for bnc#834705 missing drop downs for autofilter

After commit fc861c7088e9b639a1c2c80f8ba4535c798aeb34 there is now an order
dependency, between any ScPatternAttr flags indirectly set and
SheetDataBuffer::finalizeImport which sets the attributes directly for a 
column
So the ATTR_MERGE_FLAG that has ScMergeFlagAttr ( and associated
 SC_MF_AUTO flag ) is scrubbed when by the direct writting of the attribute
from SheetDataBuffer::finalizeImport - Document::SetAttrEntries
I've reordered that Table import here and split the finalize ( which happens
before heetDataBuffer::finalizeImport ) so that the databaseranges which 
were
created before sheet import still happens, the autofilter part of the import
is now deferred ( until after SheetDataBuffer::finalizeImport )

Change-Id: I11bb45ee7b330760fd93ecca30b23399414ac3a7

diff --git a/sc/source/filter/inc/tablebuffer.hxx 
b/sc/source/filter/inc/tablebuffer.hxx
index 5ed673b..d162391 100644
--- a/sc/source/filter/inc/tablebuffer.hxx
+++ b/sc/source/filter/inc/tablebuffer.hxx
@@ -59,6 +59,7 @@ public:
 
 /** Creates a database range from this tables. */
 voidfinalizeImport();
+voidapplyAutoFilters();
 
 /** Returns the unique table identifier. */
 inline sal_Int32getTableId() const { return maModel.mnId; }
@@ -103,7 +104,8 @@ public:
 
 /** Creates database ranges from all imported tables. */
 voidfinalizeImport();
-
+/** Applies autofilters from created database range ( requires 
finalizeImport to have run before being called */
+voidapplyAutoFilters();
 /** Returns a table by its identifier. */
 TableRefgetTable( sal_Int32 nTableId ) const;
 /** Returns a table by its display name. */
diff --git a/sc/source/filter/oox/tablebuffer.cxx 
b/sc/source/filter/oox/tablebuffer.cxx
index 0748e3c..87e1200 100644
--- a/sc/source/filter/oox/tablebuffer.cxx
+++ b/sc/source/filter/oox/tablebuffer.cxx
@@ -20,6 +20,7 @@
 #include tablebuffer.hxx
 
 #include com/sun/star/sheet/XDatabaseRange.hpp
+#include com/sun/star/sheet/XDatabaseRanges.hpp
 #include oox/helper/attributelist.hxx
 #include oox/helper/binaryinputstream.hxx
 #include oox/helper/propertyset.hxx
@@ -97,9 +98,6 @@ void Table::finalizeImport()
 PropertySet aPropSet( xDatabaseRange );
 if( !aPropSet.getProperty( mnTokenIndex, PROP_TokenIndex ) )
 mnTokenIndex = -1;
-
-// filter settings
-maAutoFilters.finalizeImport( xDatabaseRange );
 }
 catch( Exception )
 {
@@ -107,6 +105,25 @@ void Table::finalizeImport()
 }
 }
 
+void Table::applyAutoFilters()
+{
+if( !maDBRangeName.isEmpty() )
+{
+try
+{
+// get the range ( maybe we should cache the xDatabaseRange from 
finalizeImport )
+PropertySet aDocProps( getDocument() );
+Reference XDatabaseRanges  xDatabaseRanges( 
aDocProps.getAnyProperty( PROP_DatabaseRanges ), UNO_QUERY_THROW );
+Reference XDatabaseRange  xDatabaseRange( 
xDatabaseRanges-getByName( maDBRangeName ), UNO_QUERY );
+maAutoFilters.finalizeImport( xDatabaseRange );
+}
+catch( Exception )
+{
+OSL_FAIL( Table::applyAutofilters - cannot create filter );
+}
+}
+}
+
 // 
 
 TableBuffer::TableBuffer( const WorkbookHelper rHelper ) :
@@ -130,6 +147,11 @@ void TableBuffer::finalizeImport()
 maIdTables.forEachMem( Table::finalizeImport );
 }
 
+void TableBuffer::applyAutoFilters()
+{
+maIdTables.forEachMem( Table::applyAutoFilters );
+}
+
 TableRef TableBuffer::getTable( sal_Int32 nTableId ) const
 {
 return maIdTables.get( nTableId );
diff --git a/sc/source/filter/oox/worksheethelper.cxx 
b/sc/source/filter/oox/worksheethelper.cxx
index 49add26..530a573 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -66,6 +66,7 @@
 #include worksheetbuffer.hxx
 #include worksheetsettings.hxx
 #include formulabuffer.hxx
+#include tablebuffer.hxx
 
 namespace oox {
 namespace xls {
@@ -943,6 +944,10 @@ void WorksheetGlobals::finalizeWorksheetImport()
 {
 lclUpdateProgressBar( mxRowProgress, 1.0 );
 maSheetData.finalizeImport();
+// assumes getTables().finalizeImport ( which creates the DatabaseRanges )
+// has been called already
+getTables().applyAutoFilters();
+
 getCondFormats().finalizeImport();

[Libreoffice-commits] core.git: ucb/source

2013-08-16 Thread Stephan Bergmann

 ucb/source/ucp/webdav-neon/DAVProperties.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 27e7da167052900214e61e6792da93e3ba1310f5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 16 11:04:51 2013 +0200

sPropName is needed after all

Change-Id: Ib48606425edb5f267615f4a15028b15e8fd00d5d

diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.cxx 
b/ucb/source/ucp/webdav-neon/DAVProperties.cxx
index 8015b12..7abdb6f 100644
--- a/ucb/source/ucp/webdav-neon/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVProperties.cxx
@@ -183,6 +183,8 @@ bool DAVProperties::isUCBSpecialProperty(
 if ( nEnd = nStart ) // incl. -1 for not found
 return false;
 
+OUString sPropName( rFullName.copy( nStart, nEnd - nStart ) );
+
 // TODO skip whitespaces?
 if ( !rFullName.match( xmlns:prop=\, ++nEnd ) )
 return false;
@@ -198,6 +200,7 @@ bool DAVProperties::isUCBSpecialProperty(
 rParsedName = rFullName.copy( nStart, nEnd - nStart );
 if ( !rParsedName.endsWith( / ) )
 rParsedName += /;
+rParsedName += sPropName;
 
 return rParsedName.getLength();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

2013-08-16 Thread Julien Nabet

 sc/source/core/opencl/formulagroupcl.cxx |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 35223e5f19dc1f4e59c3694e98103444c82082b8
Author: Julien Nabet serval2...@yahoo.fr
Date:   Thu Aug 15 22:40:40 2013 +0200

cppcheck: memory leak + test rResult before freeing it

Change-Id: Ia2cd69eb0a180cdfb747a82edefbe1527138b26d
Reviewed-on: https://gerrit.libreoffice.org/5444
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/sc/source/core/opencl/formulagroupcl.cxx 
b/sc/source/core/opencl/formulagroupcl.cxx
index 915f1d9..274af4e 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -313,7 +313,10 @@ bool FormulaGroupInterpreterOpenCL::interpret(ScDocument 
rDoc, const ScAddress
 
 ScFormulaCell* pDest = rDoc.GetFormulaCell(aTmpPos);
 if (!pDest)
+{
+free(rResult);
 return false;
+}
 if(ocl_calc.GetOpenclState())
 {
 const formula::FormulaToken *pCur = aCode2.First();
@@ -473,8 +476,7 @@ bool FormulaGroupInterpreterOpenCL::interpret(ScDocument 
rDoc, const ScAddress
 rDoc.SetFormulaResults(rTopPos, rResult, xGroup-mnLength);
 }
 
-if(rResult)
-free(rResult);
+free(rResult);
 
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - include/svl svl/Library_svl.mk svl/source

2013-08-16 Thread Michael Stahl

 include/svl/cenumitm.hxx  |   90 +
 include/svl/eitem.hxx |   92 ++
 svl/Library_svl.mk|1 
 svl/source/items/cenumitm.cxx |   78 +++
 svl/source/items/eitem.cxx|   34 ---
 5 files changed, 122 insertions(+), 173 deletions(-)

New commits:
commit c8e327092a8419636ae447b3b82052e6aeb724a0
Author: Michael Stahl mst...@redhat.com
Date:   Thu Aug 15 23:26:58 2013 +0200

SfxEnumItem: cut out the middle man here too

CntEnumItem, we hardly knew you existed.

Change-Id: I54b489f22662f9a3305478d18438b13850444316

diff --git a/include/svl/cenumitm.hxx b/include/svl/cenumitm.hxx
index dc61d30..c8fb8bb 100644
--- a/include/svl/cenumitm.hxx
+++ b/include/svl/cenumitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVTOOLS_CENUMITM_HXX
-#define _SVTOOLS_CENUMITM_HXX
+#ifndef SVTOOLS_CENUMITM_HXX
+#define SVTOOLS_CENUMITM_HXX
 
 #include svl/svldllapi.h
 #include tools/debug.hxx
@@ -81,42 +81,6 @@ public:
 virtual void SetBoolValue(sal_Bool bValue);
 };
 
-//
-DBG_NAMEEX(CntEnumItem)
-
-class SVL_DLLPUBLIC CntEnumItem: public SfxEnumItemInterface
-{
-sal_uInt16 m_nValue;
-
-protected:
-explicit CntEnumItem(sal_uInt16 which = 0, sal_uInt16 nTheValue = 0):
-SfxEnumItemInterface(which), m_nValue(nTheValue) {}
-
-CntEnumItem(sal_uInt16 which, SvStream  rStream);
-
-CntEnumItem(const CntEnumItem  rItem):
-SfxEnumItemInterface(rItem), m_nValue(rItem.m_nValue) {}
-
-public:
-TYPEINFO();
-
-virtual SvStream  Store(SvStream  rStream, sal_uInt16) const;
-
-virtual sal_uInt16 GetEnumValue() const;
-
-virtual void SetEnumValue(sal_uInt16 nTheValue);
-
-sal_uInt16 GetValue() const { return m_nValue; }
-
-inline void SetValue(sal_uInt16 nTheValue);
-};
-
-inline void CntEnumItem::SetValue(sal_uInt16 nTheValue)
-{
-DBG_ASSERT(GetRefCount() == 0, CntEnumItem::SetValue(): Pooled item);
-m_nValue = nTheValue;
-}
-
-#endif // _SVTOOLS_CENUMITM_HXX
+#endif // SVTOOLS_CENUMITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svl/eitem.hxx b/include/svl/eitem.hxx
index e035c61..65938e2 100644
--- a/include/svl/eitem.hxx
+++ b/include/svl/eitem.hxx
@@ -24,18 +24,39 @@
 #include svl/cenumitm.hxx
 
 //
-class SVL_DLLPUBLIC SfxEnumItem: public CntEnumItem
+
+class SVL_DLLPUBLIC SfxEnumItem
+: public SfxEnumItemInterface
 {
+sal_uInt16 m_nValue;
+
 protected:
-explicit SfxEnumItem(sal_uInt16 which = 0, sal_uInt16 nValue = 0):
-CntEnumItem(which, nValue) {}
+explicit SfxEnumItem(sal_uInt16 const nWhich =0, sal_uInt16 const nValue 
=0)
+: SfxEnumItemInterface(nWhich)
+, m_nValue(nValue)
+{ }
 
-SfxEnumItem(sal_uInt16 which, SvStream  rStream):
-CntEnumItem(which, rStream) {}
+SfxEnumItem(const SfxEnumItem  rItem)
+: SfxEnumItemInterface(rItem)
+, m_nValue(rItem.m_nValue)
+{ }
+
+SfxEnumItem(sal_uInt16 const nWhich, SvStream  rStream);
 
 public:
 TYPEINFO();
 
+sal_uInt16 GetValue() const { return m_nValue; }
+
+void SetValue(sal_uInt16 nTheValue);
+
+// SfxPoolItem
+virtual SvStream  Store(SvStream  rStream, sal_uInt16) const 
SAL_OVERRIDE;
+
+virtual sal_uInt16 GetEnumValue() const SAL_OVERRIDE;
+
+virtual void SetEnumValue(sal_uInt16 nTheValue) SAL_OVERRIDE;
+
 };
 
 //
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index fd28a7a..fbca266 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Library_add_exception_objects,svl,\
 svl/source/items/ctypeitm \
 svl/source/items/custritm \
 svl/source/items/dateitem \
-svl/source/items/eitem \
 svl/source/items/flagitem \
 svl/source/items/globalnameitem \
 svl/source/items/grabbagitem \
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 42923ff..9e11d71 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -119,39 +119,45 @@ void SfxEnumItemInterface::SetBoolValue(sal_Bool)
 {}
 
 //
-//  class CntEnumItem
+//  class SfxEnumItem
 //
 
-DBG_NAME(CntEnumItem)
+DBG_NAME(SfxEnumItem)
 
-CntEnumItem::CntEnumItem(sal_uInt16 which, SvStream  rStream):
-SfxEnumItemInterface(which)
+SfxEnumItem::SfxEnumItem(sal_uInt16 const nWhich, SvStream  rStream)
+: SfxEnumItemInterface(nWhich)
 {
 m_nValue = 0;
 rStream  m_nValue;
 }
 
-TYPEINIT1(CntEnumItem, SfxEnumItemInterface)
+TYPEINIT1(SfxEnumItem, SfxEnumItemInterface)
 
 // virtual
-SvStream  CntEnumItem::Store(SvStream  rStream, sal_uInt16) const
+SvStream

new startcenter UI

2013-08-16 Thread Winfried Donkers

Hi  Krisztian, all,


With commit https://gerrit.libreoffice.org/5319
(I think) the startcenter UI has been changed drastically.

I have no opinion whether this UI looks and works better than the old one, but :
-recently used documents are shown in tiles and longer document names are 
abbreviated, making it impossible to distinguish between documents with 
identical beginning of the name (which is quite common, e.g. a project number, 
followed by more specific information in the name). Could the complete file 
name be shown as a hint or something?
-For a longish list of recent documents, tile presentation is far from 
efficient. An optional simple list would be a useful alternative presentation.

(My master branch was pulled yesterday).

I hope my feed back makes sense.

Winfried

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: comphelper/source include/comphelper

2013-08-16 Thread Stephan Bergmann

 comphelper/source/misc/docpasswordrequest.cxx |   40 --
 include/comphelper/docpasswordrequest.hxx |   18 +--
 2 files changed, 2 insertions(+), 56 deletions(-)

New commits:
commit 889da158066e3d0e6bced748d0dd4c7730cf8912
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 16 12:31:07 2013 +0200

Use cppu::WeakImplHelper

...and get rid of hand-coded queryInterface implementations that use
dynamic_cast.  My claim at http://lists.cs.uiuc.edu/pipermail/cfe-commits/
Week-of-Mon-20130812/086127.html ubsan: check type_info equality via 
strcmp
that there should not be uses of dynamic_cast involving [UNO] classes in 
the
LibreOffice code base made me wonder...

Change-Id: Ic7702fd00b8e5c79399124c0acf12c80bc71a86f

diff --git a/comphelper/source/misc/docpasswordrequest.cxx 
b/comphelper/source/misc/docpasswordrequest.cxx
index a674f72..c0a59a7 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.cxx
@@ -106,26 +106,6 @@ SimplePasswordRequest::~SimplePasswordRequest()
 {
 }
 
-/*uno::*/Any SAL_CALL SimplePasswordRequest::queryInterface( const 
/*uno::*/Type rType ) throw (RuntimeException)
-{
-return ::cppu::queryInterface ( rType,
-// OWeakObject interfaces
-dynamic_cast XInterface*  ( (XInteractionRequest *) this ),
-static_cast XWeak*  ( this ),
-// my own interfaces
-static_cast XInteractionRequest*   ( this ) );
-}
-
-void SAL_CALL SimplePasswordRequest::acquire(  ) throw ()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL SimplePasswordRequest::release(  ) throw ()
-{
-OWeakObject::release();
-}
-
 sal_Bool SimplePasswordRequest::isPassword() const
 {
 return mpPassword-isSelected();
@@ -182,26 +162,6 @@ DocPasswordRequest::~DocPasswordRequest()
 {
 }
 
-/*uno::*/Any SAL_CALL DocPasswordRequest::queryInterface( const /*uno::*/Type 
rType ) throw (RuntimeException)
-{
-return ::cppu::queryInterface ( rType,
-// OWeakObject interfaces
-dynamic_cast XInterface*  ( (XInteractionRequest *) this ),
-static_cast XWeak*  ( this ),
-// my own interfaces
-static_cast XInteractionRequest*   ( this ) );
-}
-
-void SAL_CALL DocPasswordRequest::acquire(  ) throw ()
-{
-OWeakObject::acquire();
-}
-
-void SAL_CALL DocPasswordRequest::release(  ) throw ()
-{
-OWeakObject::release();
-}
-
 sal_Bool DocPasswordRequest::isPassword() const
 {
 return mpPassword-isSelected();
diff --git a/include/comphelper/docpasswordrequest.hxx 
b/include/comphelper/docpasswordrequest.hxx
index 54a32f5..ffeaacb 100644
--- a/include/comphelper/docpasswordrequest.hxx
+++ b/include/comphelper/docpasswordrequest.hxx
@@ -24,8 +24,6 @@
 #include com/sun/star/task/PasswordRequestMode.hpp
 #include com/sun/star/task/XInteractionRequest.hpp
 #include cppuhelper/implbase1.hxx
-#include cppuhelper/weak.hxx
-
 
 namespace comphelper {
 
@@ -44,18 +42,12 @@ enum DocPasswordRequestType
 // 
 
 class COMPHELPER_DLLPUBLIC SimplePasswordRequest :
-public ::com::sun::star::task::XInteractionRequest,
-public ::cppu::OWeakObject
+public cppu::WeakImplHelper1css::task::XInteractionRequest
 {
 public:
 explicitSimplePasswordRequest( 
com::sun::star::task::PasswordRequestMode eMode );
 virtual ~SimplePasswordRequest();
 
-// XInterface / OWeakObject
-virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const 
::com::sun::star::uno::Type aType ) throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL acquire(  ) throw ();
-virtual void SAL_CALL release(  ) throw ();
-
 sal_BoolisPassword() const;
 
 OUString getPassword() const;
@@ -78,8 +70,7 @@ private:
 string for a document.
  */
 class COMPHELPER_DLLPUBLIC DocPasswordRequest :
-public ::com::sun::star::task::XInteractionRequest,
-public ::cppu::OWeakObject
+public cppu::WeakImplHelper1css::task::XInteractionRequest
 {
 public:
 explicitDocPasswordRequest(
@@ -89,11 +80,6 @@ public:
 sal_Bool bPasswordToModify = sal_False );
 virtual ~DocPasswordRequest();
 
-// XInterface / OWeakObject
-virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const 
::com::sun::star::uno::Type aType ) throw 
(::com::sun::star::uno::RuntimeException);
-virtual void SAL_CALL acquire(  ) throw ();
-virtual void SAL_CALL release(  ) throw ();
-
 sal_BoolisPassword() const;
 
 OUString getPassword() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: package/source writerfilter/source

2013-08-16 Thread Michael Stahl

 package/source/xstor/xstorage.cxx   |6 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   13 +++--
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 6e3ac01f850228afb5c6cb1a33b101693aea8712
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 16 12:35:26 2013 +0200

fdo#68084: OOXML import: handle exceptions if stream is missing

The bugdoc does not have a styles.xml but a stylesWithEffects.xml,
whatever that may mean.  (the app.xml contains Microsoft Macintosh Word)

Change-Id: If3d11c5d166dcaf3d94129339559787c20e6db46

diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index 2d63850..76fbd6f 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -2136,7 +2136,11 @@ SotElement_Impl* OStorage::OpenStreamElement_Impl( const 
OUString aStreamName,
 if ( !( m_pImpl-m_nStorageMode  embed::ElementModes::WRITE )
   || (( nOpenMode  embed::ElementModes::WRITE ) != 
embed::ElementModes::WRITE )
   || ( nOpenMode  embed::ElementModes::NOCREATE ) == 
embed::ElementModes::NOCREATE )
-throw io::IOException( OSL_LOG_PREFIX, uno::Reference 
uno::XInterface () ); // TODO: access_denied
+{
+throw io::IOException(Element does not exist and cannot be 
+created: \ + aStreamName + \,
+uno::Reference uno::XInterface ()); // TODO: 
access_denied
+}
 
 // create a new StreamElement and insert it into the list
 pElement = m_pImpl-InsertStream( aStreamName, bEncr );
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 09ded15..b64c28a 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -54,8 +54,17 @@ OOXMLDocumentImpl::~OOXMLDocumentImpl()
 void OOXMLDocumentImpl::resolveFastSubStream(Stream  rStreamHandler,
  OOXMLStream::StreamType_t nType)
 {
-OOXMLStream::Pointer_t pStream
-(OOXMLDocumentFactory::createStream(mpStream, nType));
+OOXMLStream::Pointer_t pStream;
+try
+{
+pStream = OOXMLDocumentFactory::createStream(mpStream, nType);
+}
+catch (uno::Exception const e)
+{
+SAL_INFO(writerfilter, resolveFastSubStream: exception while 
+resolving stream   nType   :   e.Message);
+return;
+}
 OOXMLStream::Pointer_t savedStream = mpStream;
 mpStream = pStream;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: xmlscript/source

2013-08-16 Thread Jelle van der Waa

 xmlscript/source/xmldlg_imexp/xmldlg_export.cxx |   35 
 xmlscript/source/xmldlg_imexp/xmldlg_import.cxx |   17 ++-
 2 files changed, 9 insertions(+), 43 deletions(-)

New commits:
commit d812281f96b03866c5d367380409c266b9bb8d05
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Mon Aug 12 22:11:38 2013 +0200

fdo#57950: Remove some chained appends in xmlscript

Change-Id: I7061f59077a75b879ad42179b839894747f5ba5b
Reviewed-on: https://gerrit.libreoffice.org/5377
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
index 450d18e..0f7c5b0 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
@@ -80,41 +80,25 @@ Reference xml::sax::XAttributeList  Style::createElement()
 // background-color
 if (_set  0x1)
 {
-OUStringBuffer buf( 16 );
-buf.append( (sal_Unicode)'0' );
-buf.append( (sal_Unicode)'x' );
-buf.append( OUString::valueOf( 
(sal_Int64)(sal_uInt64)_backgroundColor, 16 ) );
-pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :background-color, 
buf.makeStringAndClear() );
+pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :background-color, 0x + 
OUString::number(_backgroundColor,16));
 }
 
 // text-color
 if (_set  0x2)
 {
-OUStringBuffer buf( 16 );
-buf.append( (sal_Unicode)'0' );
-buf.append( (sal_Unicode)'x' );
-buf.append( OUString::valueOf( (sal_Int64)(sal_uInt64)_textColor, 16 ) 
);
-pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :text-color, 
buf.makeStringAndClear() );
+pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :text-color, 0x + 
OUString::number(_textColor,16));
 }
 
 // textline-color
 if (_set  0x20)
 {
-OUStringBuffer buf( 16 );
-buf.append( (sal_Unicode)'0' );
-buf.append( (sal_Unicode)'x' );
-buf.append( OUString::valueOf( (sal_Int64)(sal_uInt64)_textLineColor, 
16 ) );
-pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :textline-color, 
buf.makeStringAndClear() );
+pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :textline-color, 0x + 
OUString::number(_textLineColor,16));
 }
 
 // fill-color
 if (_set  0x10)
 {
-OUStringBuffer buf( 16 );
-buf.append( (sal_Unicode)'0' );
-buf.append( (sal_Unicode)'x' );
-buf.append( OUString::valueOf( (sal_Int64)(sal_uInt64)_fillColor, 16 ) 
);
-pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :fill-color, 
buf.makeStringAndClear() );
+pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :fill-color, 0x + 
OUString::number(_fillColor,16));
 }
 
 // border
@@ -132,10 +116,7 @@ Reference xml::sax::XAttributeList  
Style::createElement()
 pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :border, simple );
 break;
 case BORDER_SIMPLE_COLOR: {
-OUStringBuffer buf;
-buf.appendAscii( 0x );
-buf.append( OUString::valueOf((sal_Int64)(sal_uInt64)_borderColor, 
16 ) );
-pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :border, 
buf.makeStringAndClear() );
+pStyle-addAttribute( XMLNS_DIALOGS_PREFIX :border, 0x + 
OUString::number(_borderColor,16));
 break;
 }
 default:
@@ -535,11 +516,7 @@ void ElementDescriptor::readHexLongAttr( OUString const  
rPropName, OUString co
 Any a( _xProps-getPropertyValue( rPropName ) );
 if (a.getValueTypeClass() == TypeClass_LONG)
 {
-OUStringBuffer buf( 16 );
-buf.append( (sal_Unicode)'0' );
-buf.append( (sal_Unicode)'x' );
-buf.append( OUString::valueOf( (sal_Int64)(sal_uInt64)*(sal_uInt32 
*)a.getValue(), 16 ) );
-addAttribute( rAttrName, buf.makeStringAndClear() );
+addAttribute( rAttrName, 0x + 
OUString::number((sal_Int64)(sal_uInt64)*(sal_uInt32 *)a.getValue(),16)  );
 }
 }
 }
diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx 
b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
index b05ea5b..ef41489 100644
--- a/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
+++ b/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx
@@ -1444,11 +1444,7 @@ void ImportContext::importEvents(
 if (getStringAttr( aLocation, location, 
xAttributes, _pImport-XMLNS_SCRIPT_UID ))
 {
 // prepend location
-OUStringBuffer buf;
-buf.append( aLocation );
-buf.append( (sal_Unicode)':' );
-buf.append( descr.ScriptCode );
-descr.ScriptCode = buf.makeStringAndClear();
+descr.ScriptCode = aLocation + : + 
descr.ScriptCode;
 }

[Libreoffice-commits] core.git: qadevOOo/runner

2013-08-16 Thread Rene Engelhard

 qadevOOo/runner/lib/TestParameters.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b118c88a83da383a3f7fb1a1de2a3cb9a89d4452
Author: Rene Engelhard r...@debian.org
Date:   Fri Aug 16 13:32:17 2013 +0200

qadevOOo: handle kfreebsd as UNXLNGI

Change-Id: Ib3be1e407a9a3716fe171eb0586f03174015d844

diff --git a/qadevOOo/runner/lib/TestParameters.java 
b/qadevOOo/runner/lib/TestParameters.java
index 9b05147..66050ee 100644
--- a/qadevOOo/runner/lib/TestParameters.java
+++ b/qadevOOo/runner/lib/TestParameters.java
@@ -314,7 +314,7 @@ public class TestParameters extends HashMapString,Object {
 String operatingSystem = ;
 if (osname.indexOf (windows)-1) {
 operatingSystem = PropertyName.WNTMSCI;
-} else if (osname.indexOf (linux)-1) {
+} else if (osname.indexOf (linux)-1 || osname.indexOf 
(kfreebsd)-1) {
 operatingSystem = PropertyName.UNXLNGI;
 } else if (osname.indexOf (sunos)-1) {
 if (osarch.equals (x86)) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c8/dba796d1fc4df773f26e79554a952cd6219968

2013-08-16 Thread Caolán McNamara

 c8/dba796d1fc4df773f26e79554a952cd6219968 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 19a379895a18a8168f63f25cdcf00c5c8a790706
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 16 14:00:06 2013 +0100

Notes added by 'git notes add'

diff --git a/c8/dba796d1fc4df773f26e79554a952cd6219968 
b/c8/dba796d1fc4df773f26e79554a952cd6219968
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/c8/dba796d1fc4df773f26e79554a952cd6219968
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/Library_dba.mk dbaccess/source

2013-08-16 Thread Stephan Bergmann

 dbaccess/Library_dba.mk |1 
 dbaccess/source/core/api/querycontainer.cxx |   72 +++---
 dbaccess/source/core/dataaccess/connection.cxx  |2 
 dbaccess/source/core/inc/ContainerListener.hxx  |   80 
 dbaccess/source/core/inc/querycontainer.hxx |   20 ++--
 dbaccess/source/core/misc/ContainerListener.cxx |  119 
 6 files changed, 51 insertions(+), 243 deletions(-)

New commits:
commit c9db5e6f083aea2622559efcb9fcccef7926fd16
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Aug 16 14:57:24 2013 +0200

Do not use this ptr in ctor

...offload to init() instead and wrap ctor in create().  That removes the 
need
for refcount fiddling and additional OContainerListener class.  Which in 
turn
removes code using dynamic_cast on UNO interface classes, which my claim at
http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20130812/
086127.html ubsan: check type_info equality via strcmp that there 
should not
be uses of dynamic_cast involving [UNO] classes in the LibreOffice code 
base
made me wonder about...

Change-Id: I5d72650f6bf081f971f7bd6bb65f4e58a342f791

diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 08d13df..27d2e99 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -115,7 +115,6 @@ $(eval $(call gb_Library_add_exception_objects,dba,\
 dbaccess/source/core/dataaccess/myucp_resultset \
 dbaccess/source/core/dataaccess/SharedConnection \
 dbaccess/source/core/misc/apitools \
-dbaccess/source/core/misc/ContainerListener \
 dbaccess/source/core/misc/ContainerMediator \
 dbaccess/source/core/misc/DatabaseDataProvider \
 dbaccess/source/core/misc/dsntypes \
diff --git a/dbaccess/source/core/api/querycontainer.cxx 
b/dbaccess/source/core/api/querycontainer.cxx
index 7e0e05e..fc5ccfc 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -22,7 +22,6 @@
 #include dbastrings.hrc
 #include query.hxx
 #include objectnameapproval.hxx
-#include ContainerListener.hxx
 #include veto.hxx
 
 #include com/sun/star/beans/XPropertySet.hpp
@@ -75,32 +74,41 @@ OQueryContainer::OQueryContainer(
 ,m_xConnection(_rxConn)
 {
 DBG_CTOR(OQueryContainer, NULL);
+}
 
-increment(m_refCount);
+void OQueryContainer::init()
+{
+Reference XContainer  xContainer( m_xCommandDefinitions, UNO_QUERY_THROW 
);
+xContainer-addContainerListener( this );
+
+Reference XContainerApproveBroadcaster  xContainerApprove( 
m_xCommandDefinitions, UNO_QUERY_THROW );
+xContainerApprove-addContainerApproveListener( this );
+
+// fill my structures
+ODefinitionContainer_Impl rDefinitions( getDefinitions() );
+Sequence OUString  sDefinitionNames = 
m_xCommandDefinitions-getElementNames();
+const OUString* pDefinitionName = sDefinitionNames.getConstArray();
+const OUString* pEnd = pDefinitionName + sDefinitionNames.getLength();
+for ( ; pDefinitionName != pEnd; ++pDefinitionName )
 {
-m_pCommandsListener = new OContainerListener( *this, m_aMutex );
-m_pCommandsListener-acquire();
-
-Reference XContainer  xContainer( m_xCommandDefinitions, 
UNO_QUERY_THROW );
-xContainer-addContainerListener( m_pCommandsListener );
-
-Reference XContainerApproveBroadcaster  xContainerApprove( 
m_xCommandDefinitions, UNO_QUERY_THROW );
-xContainerApprove-addContainerApproveListener( m_pCommandsListener );
-
-// fill my structures
-ODefinitionContainer_Impl rDefinitions( getDefinitions() );
-Sequence OUString  sDefinitionNames = 
m_xCommandDefinitions-getElementNames();
-const OUString* pDefinitionName = sDefinitionNames.getConstArray();
-const OUString* pEnd = pDefinitionName + sDefinitionNames.getLength();
-for ( ; pDefinitionName != pEnd; ++pDefinitionName )
-{
-rDefinitions.insert( *pDefinitionName, TContentPtr() );
-
m_aDocuments.push_back(m_aDocumentMap.insert(Documents::value_type(*pDefinitionName,Documents::mapped_type())).first);
-}
+rDefinitions.insert( *pDefinitionName, TContentPtr() );
+
m_aDocuments.push_back(m_aDocumentMap.insert(Documents::value_type(*pDefinitionName,Documents::mapped_type())).first);
 }
-decrement(m_refCount);
 
-setElementApproval( PContainerApprove( new ObjectNameApproval( _rxConn, 
ObjectNameApproval::TypeQuery ) ) );
+setElementApproval( PContainerApprove( new ObjectNameApproval( 
m_xConnection, ObjectNameApproval::TypeQuery ) ) );
+}
+
+rtl::ReferenceOQueryContainer OQueryContainer::create(
+  const Reference XNameContainer  _rxCommandDefinitions
+, const Reference XConnection  _rxConn
+, const Reference XComponentContext  _rxORB,
+::dbtools::IWarningsContainer* _pWarnings)
+{
+

[Libreoffice-commits] core.git: helpcontent2

2013-08-16 Thread Caolán McNamara

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69298f626e77204ee6b534552b3f49ddf02f0365
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 16 14:10:51 2013 +0100

Updated core
Project: help  b8c3f4436f5c754a8d80433e0230cfd7f2a7ae36

diff --git a/helpcontent2 b/helpcontent2
index 9eaf149..b8c3f44 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9eaf1497e24eb637d1b94e2233533fdbf8a321f7
+Subproject commit b8c3f4436f5c754a8d80433e0230cfd7f2a7ae36
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|38635   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||38635

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

2013-08-16 Thread Caolán McNamara

 helpers/help_hid.lst|   22 -
 source/text/swriter/01/05060100.xhp |   82 ++--
 2 files changed, 41 insertions(+), 63 deletions(-)

New commits:
commit b8c3f4436f5c754a8d80433e0230cfd7f2a7ae36
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 16 14:10:51 2013 +0100

update help ids for frame type page .ui conversion

Change-Id: I4f2ecf7ee91d69f13103be5e682dfc85ac6e1119

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index e1e1b1e..d06697b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1796,7 +1796,6 @@ HID_FORMULA_LB_FUNCTION,64866,
 HID_FORM_NAVIGATOR,38068,
 HID_FORM_NAVIGATOR_WIN,38069,
 HID_FRAME_TOOLBOX,54829,
-HID_FRM_STD,53170,
 HID_FTP,41040,
 HID_FTP_BTN_PATH,41046,
 HID_FTP_CANCEL,41048,
@@ -7497,13 +7496,6 @@ 
sw_CheckBox_TP_FLD_DOKINF_CB_DOKINFFIXEDCONTENT,878724117,
 sw_CheckBox_TP_FLD_DOK_CB_DOKFIXEDCONTENT,878756922,
 sw_CheckBox_TP_FLD_VAR_CB_VARINVISIBLE,878740520,
 sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196,
-sw_CheckBox_TP_FRM_STD_CB_AUTOHEIGHT,878167071,
-sw_CheckBox_TP_FRM_STD_CB_AUTOWIDTH,878167086,
-sw_CheckBox_TP_FRM_STD_CB_FIXEDRATIO,878167142,
-sw_CheckBox_TP_FRM_STD_CB_FOLLOWTEXTFLOW,878167169,
-sw_CheckBox_TP_FRM_STD_CB_MIRROR,878167077,
-sw_CheckBox_TP_FRM_STD_CB_REL_HEIGHT,878167141,
-sw_CheckBox_TP_FRM_STD_CB_REL_WIDTH,878167140,
 sw_CheckBox_TP_GRF_EXT_CB_HOR,878232622,
 sw_CheckBox_TP_GRF_EXT_CB_VERT,878232623,
 sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858,
@@ -7670,10 +7662,6 @@ sw_ListBox_TP_FLD_VAR_LB_VARTYPE,878743067,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629,
 sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796,
-sw_ListBox_TP_FRM_STD_DLB_HORIZONTAL,878169634,
-sw_ListBox_TP_FRM_STD_DLB_VERTICAL,878169639,
-sw_ListBox_TP_FRM_STD_LB_HORI_RELATION,878169602,
-sw_ListBox_TP_FRM_STD_LB_VERT_RELATION,878169604,
 sw_ListBox_TP_LAB_LAB_BOX_MAKE,909692428,
 sw_ListBox_TP_LAB_LAB_BOX_TYPE,909692430,
 sw_ListBox_TP_LAB_LAB_LB_DATABASE,909692421,
@@ -7729,10 +7717,6 @@ sw_MetricField_TP_FORMAT_TABLE_ED_LEFT_DIST,878221875,
 sw_MetricField_TP_FORMAT_TABLE_ED_RIGHT_DIST,878221876,
 sw_MetricField_TP_FORMAT_TABLE_ED_TOP_DIST,878221845,
 sw_MetricField_TP_FORMAT_TABLE_ED_WIDTH,878221825,
-sw_MetricField_TP_FRM_STD_ED_AT_HORZ_POS,878172708,
-sw_MetricField_TP_FRM_STD_ED_AT_VERT_POS,878172713,
-sw_MetricField_TP_FRM_STD_ED_HEIGHT,878172702,
-sw_MetricField_TP_FRM_STD_ED_WIDTH,878172700,
 sw_MetricField_TP_LINENUMBERING_MF_OFFSET,878893577,
 sw_MetricField_TP_TABLE_COLUMN_COL_MF_1,888494700,
 sw_MetricField_TP_TABLE_COLUMN_COL_MF_2,888494702,
@@ -7838,7 +7822,6 @@ sw_PushButton_TP_FLD_FUNC_PB_LISTADD,878776914,
 sw_PushButton_TP_FLD_FUNC_PB_LISTDOWN,878776919,
 sw_PushButton_TP_FLD_FUNC_PB_LISTREMOVE,878776917,
 sw_PushButton_TP_FLD_FUNC_PB_LISTUP,878776918,
-sw_PushButton_TP_FRM_STD_BT_REALSIZE,878170668,
 sw_PushButton_TP_GRF_EXT_PB_BROWSE,878236213,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287,
@@ -7901,11 +7884,6 @@ sw_RadioButton_TP_FORMAT_TABLE_RB_FROM_LEFT,878215824,
 sw_RadioButton_TP_FORMAT_TABLE_RB_FULL,878215694,
 sw_RadioButton_TP_FORMAT_TABLE_RB_LEFT,878215690,
 sw_RadioButton_TP_FORMAT_TABLE_RB_RIGHT,878215691,
-sw_RadioButton_TP_FRM_STD_RB_ANCHOR_AS_CHAR,878166532,
-sw_RadioButton_TP_FRM_STD_RB_ANCHOR_AT_CHAR,878166531,
-sw_RadioButton_TP_FRM_STD_RB_ANCHOR_FRAME,878166533,
-sw_RadioButton_TP_FRM_STD_RB_ANCHOR_PAGE,878166529,
-sw_RadioButton_TP_FRM_STD_RB_ANCHOR_PARA,878166530,
 sw_RadioButton_TP_GRF_EXT_RB_MIRROR_ALL_PAGES,878232128,
 sw_RadioButton_TP_GRF_EXT_RB_MIRROR_LEFT_PAGES,878232129,
 sw_RadioButton_TP_GRF_EXT_RB_MIRROR_RIGHT_PAGES,878232130,
diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index 9bb77f0..cc8885e 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -31,96 +31,96 @@
 bookmark xml-lang=en-US branch=index 
id=bm_id9646290bookmark_valueresizing;aspect ratio/bookmark_value
 bookmark_valueaspect ratio;resizing objects/bookmark_value
 /bookmarkcommentUFI: new index entries, see i54237/comment
-bookmark xml-lang=en-US branch=hid/SW_HID_FRM_STD id=bm_id3147406 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/frmtypepage/FrmTypePage id=bm_id3147406 
localize=false/
 paragraph role=heading id=hd_id3151389 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/swriter/01/05060100.xhp 
name=TypeType/link/paragraph
-paragraph role=paragraph id=par_id3150568 xml-lang=en-US l10n=U 
oldref=2ahelp hid=HID_FRM_STDSpecifies the size and the position of the 
selected object or frame on a page./ahelp/paragraph
+paragraph role=paragraph id=par_id3150568 xml-lang=en-US l10n=U 
oldref=2ahelp hid=modules/swriter/ui/frmtypepage/FrmTypePageSpecifies 
the size and the position of the selected object or frame on a

Minutes of the ESC call 2013-08-15

2013-08-16 Thread Thorsten Behrens

Attending: Caolan, Christian, David, Eike, Kendy, Kohei, Lionel,
   Michael S., Norbert, Petr, Robinson, Stephan, Thorsten,
   Tim, Tsahi

* Completed Action Items:
+ add 'download updates from inside LibO' to GSoC wiki page (Astron)
+ come up with proposal for what to do about .debs (retired, Petr
  fixed a set of regressions in 4.1.1)
+ polish  push chrome performance bits to a feature branch (Pierre-Eric)
+ send details / howto to have patches with their author's name
  submitted to Tsahi (Michael)

* New Action Items:
+ roll out Easy Hack rotation, incrementally improve afterwards (Robinson)
+ introduce interested people into update service maintenance (Kendy)
+ poke fdo admins for own BZ instance (Thorsten)

* Pending Action Items:
+ dig out the URL for GSOC travel funding (Cedric)
+ upgrade 3.6 users to 4.0.5 once that is out (Thorsten/Kendy)
+ create i18n tool to ensure style issues (also unique fn names)
  don't recur fdo#67786 (Andras)
+ switch to pure sidebar mode in master - but not enabled by
  default, except in Impress (Caolan)
  - pending UX input
+ come up with a proposal on what still needs improving in sidebar
  land (Astron)
+ suggestions for next API incompatibility release timing welcome
  (Bjoern)

* Release Engineering update (Cloph)
+ 4.0.5 rc2
   - RC1 is published, rc2 done  pre-announced, mirror push
 ongoing
   - scheduled release next week
+ 4.1.1 rc2
+ Writer / style translation issue status (Cedric)
- commit deadline next Monday, tagging on Tuesday
* 4.1.2 RC1
- first week of September

* QA update (Robinson)
+ increase in unconfirmed bugs
  - renewed QA team effort to stay on top there

+ Regressions in 4.2
  - some regressions found in 4.2pre, need to encourage more tech
savvy users to test pre-release builds
  - Cloph: new style download page has pre-release builds
selectable
  - Robinson: use the online update to indicate there are new
pre-release builds
  - Norbert: don't publicize nightly master builds too widely
  - Thorsten: possibly pick some master builds before official
alphas, to get early feedback on new features

+ proposal to migrate bugzilla to our infra
  - Robinson: QA needs more tweaks, BZ should be tailored much
better to project needs
  - have direct admin access, timely responses
  - rename the version field label to better match our usage
  - add a number of useful extensions
  - Norbert: avoid to have QA/Users to work around limitations in
BZ, that burn time and energy
  - Thorsten: as a first step, try to get our own BZ instance at
fdo

+ Nightly build availability
  - two additional Windows builders now with nightly uploads

+ https://bugs.freedesktop.org/page.cgi?id=weekly-bug-summary.html
+134-96(+38 overall)
 many thanks to the top four bug squashers:
  Urmas  8
  Joel   8
  Miklos 6
  ign_christian  4

* Open 4.2 MAB
+ 6/6 7/7 2/2 2/2 1/1
+ https://bugs.freedesktop.org/show_bug.cgi?id=65675

* Open 4.1 MAB
+ 15/81 13/77 8/68 11/64 3/55 7/52 7/48 2/42 4/39 5/37 7/32 3/26 3/23
   19%   17%  12%   17%   5%  14%  15%
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=60270hide_resolved=1

* Open 4.0 MAB
+ 44/171 32/157 14/138 13/137 12/137 12/135 12/134 12/133 12/132 16/132 
14/130
   26%20%10% 9% 9% 9% 9% 9% 9%12%   
 11%
+ 
https://bugs.freedesktop.org/showdependencytree.cgi?id=54157hide_resolved=1

* Bibisected bugs open: whiteboard 'bibsected'
+ 41 (of 137) older ?
+ http://bit.ly/VQfF3Q

* all bugs tagged with 'regression'
+ 333(+?) bugs open of 1875(+?) total

* ~Component   count net *
Writer - 101 (+?)
   Spreadsheet - 44 (+?)
   Libreoffice - 35 (+?)
  Presentation - 27 (+?)
   Crashes - 23 (+?)
  Database - 20 (+?)
   Drawing - 16 (+?)
   Borders - 15 (+?)
 Migration -  3 (+?)
 BASIC -  3 (+?)
+ 
https://bugs.freedesktop.org/buglist.cgi?keywords=regression%2C%20keywords_type=allwordsresolution=---query_format=advancedproduct=LibreOfficelist_id=36764
+ Migration: 
https://bugs.freedesktop.org/showdependencytree.cgi?id=43489hide_resolved=1

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 5 commits - dbaccess/Library_dbu.mk sc/Library_vbaobj.mk sd/Library_sd.mk sfx2/Library_sfx.mk slideshow/Library_slideshow.mk svx/Library_svxcore.mk

2013-08-16 Thread Michael Stahl

 dbaccess/Library_dbu.mk|2 +-
 sc/Library_vbaobj.mk   |2 +-
 sd/Library_sd.mk   |   27 +++
 sfx2/Library_sfx.mk|2 +-
 slideshow/Library_slideshow.mk |   12 +---
 svx/Library_svxcore.mk |   15 +--
 6 files changed, 8 insertions(+), 52 deletions(-)

New commits:
commit d0a593d77133906b9541eee418cffbc222ae4ff4
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 16 15:02:24 2013 +0200

pass gb_DEBUG_CFLAGS for the remaining NOOPT files

Change-Id: I5d5f65766d4ad3b319b2cbe4f6491d0aab7f02df

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index fa7211b..996b7b2 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -271,7 +271,7 @@ endif
 ifeq ($(COM),GCC)
 $(eval $(call gb_Library_add_cxxobjects,dbu,\
 dbaccess/source/ui/uno/copytablewizard \
-, $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) \
+, $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) $(if $(call 
gb_LinkTarget__debug_enabled,dbu),$(gb_DEBUG_CFLAGS)) \
 ))
 else
 $(eval $(call gb_Library_add_exception_objects,dbu,\
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 5c98686..9146a11 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -123,7 +123,7 @@ endif
 ifeq ($(sc_gccthunkBroken),1)
 $(eval $(call gb_Library_add_cxxobjects,vbaobj,\
 sc/source/ui/vba/vbasheetobjects \
-, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+, $(gb_COMPILERNOOPTFLAGS) $(if $(call 
gb_LinkTarget__debug_enabled,vbaobj),$(gb_DEBUG_CFLAGS)) 
$(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 else
 $(eval $(call gb_Library_add_exception_objects,vbaobj,\
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 2af7216..a95e2b7 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -293,7 +293,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_cxxobjects,sfx,\
sfx2/source/control/dispatch \
-, $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+, $(gb_COMPILERNOOPTFLAGS) $(if $(call 
gb_LinkTarget__debug_enabled,sfx),$(gb_DEBUG_CFLAGS)) 
$(gb_LinkTarget_EXCEPTIONFLAGS) \
 ))
 else
 $(eval $(call gb_Library_add_exception_objects,sfx,\
commit 3565a294189c6203a301a0971b7c9e48ab1e39df
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 16 14:49:17 2013 +0200

sd: remove NOOPT for optsitem.cxx and futext.cxx

These have been added in initial CVS import.

Change-Id: I8235db9d16b699f9736762bf097e99819753d616

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 34a1525..2adb159 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -189,6 +189,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/annotations/annotationmanager \
sd/source/ui/annotations/annotationtag \
sd/source/ui/annotations/annotationwindow \
+   sd/source/ui/app/optsitem \
sd/source/ui/app/sddll \
sd/source/ui/app/sddll1 \
sd/source/ui/app/sddll2 \
@@ -308,6 +309,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/func/fusnapln \
sd/source/ui/func/fusumry \
sd/source/ui/func/futempl \
+   sd/source/ui/func/futext \
sd/source/ui/func/futhes \
sd/source/ui/func/futransf \
sd/source/ui/func/futxtatt \
@@ -600,17 +602,4 @@ endif
 
 endif
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_cxxobjects,sd,\
-   sd/source/ui/app/optsitem \
-   sd/source/ui/func/futext \
-   , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sd,\
-   sd/source/ui/app/optsitem \
-   sd/source/ui/func/futext \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
commit 8f9b8b6e6f89f28f1a537a1b4a2aaac076ab7b08
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 16 14:46:55 2013 +0200

sd: remove NOOPT for unowcntr.cxx

This has been added in initial CVS import.

Change-Id: Ibc1f68860019a639a665d314b1ebfc96d3ca1e45

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 807926f..34a1525 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -464,6 +464,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/unoidl/unopback \
sd/source/ui/unoidl/unopool \
sd/source/ui/unoidl/unosrch \
+   sd/source/ui/unoidl/unowcntr \
sd/source/ui/view/DocumentRenderer \
sd/source/ui/view/FormShellManager \
sd/source/ui/view/GraphicObjectBar \
@@ -612,15 +613,4 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 ))
 endif
 
-ifeq ($(strip $(COM)),GCC)
-$(eval $(call gb_Library_add_cxxobjects,sd,\
-   sd/source/ui/unoidl/unowcntr \
-   , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-))
-else
-$(eval $(call gb_Library_add_exception_objects,sd,\
-   sd/source/ui/unoidl/unowcntr \
-))
-endif
-
 # vim: set noet

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 43030, which changed state.

Bug 43030 Summary: Cannot upscale video files inserted into an Impress 
presentation
https://bugs.freedesktop.org/show_bug.cgi?id=43030

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/aqua

2013-08-16 Thread Tor Lillqvist

 vcl/aqua/source/a11y/aqua11ywrapper.mm |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit d626fa2e5892a8a166b5aec49e9cb5bfc2cf18c5
Author: Tor Lillqvist t...@iki.fi
Date:   Fri Aug 16 16:29:40 2013 +0300

Fix build breakage for 64-bit where NSPoint == CGPoint

Change-Id: I2dc86331cd1ddf3a9b9ea28dcd881d23789d60d6

diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm 
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index e5dde15..8de6f5c 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -62,10 +62,16 @@ static std::ostream operator(std::ostream s, NSObject 
*obj) {
 return s  [[obj description] UTF8String];
 }
 
+#ifndef _LP64
+
+// In 64-bit code NSPoint == CGPoint, and CGPoint already has
+// an operator in vcl/inc/quartz/util.h
+
 static std::ostream operator(std::ostream s, NSPoint point) {
 return s  NSStringFromPoint(point);
 }
 
+#endif
 
 @implementation AquaA11yWrapper : NSView
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - package/source writerfilter/source

2013-08-16 Thread Michael Stahl

 package/source/xstor/xstorage.cxx   |6 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   13 +++--
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit b697e302c1eb31afdcc3bbc916bd929ec96a6c70
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 16 12:35:26 2013 +0200

fdo#68084: OOXML import: handle exceptions if stream is missing

The bugdoc does not have a styles.xml but a stylesWithEffects.xml,
whatever that may mean.  (the app.xml contains Microsoft Macintosh Word)

Change-Id: If3d11c5d166dcaf3d94129339559787c20e6db46
(cherry picked from commit 6e3ac01f850228afb5c6cb1a33b101693aea8712)
Reviewed-on: https://gerrit.libreoffice.org/5449
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index 073f1d1..d95e418 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -2192,7 +2192,11 @@ SotElement_Impl* OStorage::OpenStreamElement_Impl( const 
OUString aStreamName,
 if ( !( m_pImpl-m_nStorageMode  embed::ElementModes::WRITE )
   || (( nOpenMode  embed::ElementModes::WRITE ) != 
embed::ElementModes::WRITE )
   || ( nOpenMode  embed::ElementModes::NOCREATE ) == 
embed::ElementModes::NOCREATE )
-throw io::IOException( OSL_LOG_PREFIX, uno::Reference 
uno::XInterface () ); // TODO: access_denied
+{
+throw io::IOException(Element does not exist and cannot be 
+created: \ + aStreamName + \,
+uno::Reference uno::XInterface ()); // TODO: 
access_denied
+}
 
 // create a new StreamElement and insert it into the list
 pElement = m_pImpl-InsertStream( aStreamName, bEncr );
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 29c64ad..083d6ec 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -54,8 +54,17 @@ OOXMLDocumentImpl::~OOXMLDocumentImpl()
 void OOXMLDocumentImpl::resolveFastSubStream(Stream  rStreamHandler,
  OOXMLStream::StreamType_t nType)
 {
-OOXMLStream::Pointer_t pStream
-(OOXMLDocumentFactory::createStream(mpStream, nType));
+OOXMLStream::Pointer_t pStream;
+try
+{
+pStream = OOXMLDocumentFactory::createStream(mpStream, nType);
+}
+catch (uno::Exception const e)
+{
+SAL_INFO(writerfilter, resolveFastSubStream: exception while 
+resolving stream   nType   :   e.Message);
+return;
+}
 OOXMLStream::Pointer_t savedStream = mpStream;
 mpStream = pStream;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/inc starmath/source

2013-08-16 Thread Marcos Paulo de Souza

 starmath/inc/starmath.hrc |7 +++
 starmath/source/ElementsDockingWindow.cxx |   23 ++-
 starmath/source/commands.src  |7 +++
 3 files changed, 32 insertions(+), 5 deletions(-)

New commits:
commit c66062aacb521037eb5af9c32c94c33df9cd69a7
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Wed Aug 14 10:18:44 2013 -0300

Math: New feature about color selection

Now we can choose colors to equations in Elements Dock, in the Attributes 
section.

All colors there can be choosed by clicking in the name of color.

Change-Id: I5545b292955072f9f45f31262a511cee3d70c953
Reviewed-on: https://gerrit.libreoffice.org/5414
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 0459731..7730067 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -327,6 +327,13 @@
 #define RID_WIDEHATX(RID_APP_START + 1722)
 #define RID_WIDETILDEX  (RID_APP_START + 1723)
 #define RID_WIDEVECX(RID_APP_START + 1724)
+#define RID_COLORX_BLACK(RID_APP_START + 1725)
+#define RID_COLORX_BLUE (RID_APP_START + 1726)
+#define RID_COLORX_GREEN(RID_APP_START + 1727)
+#define RID_COLORX_RED  (RID_APP_START + 1728)
+#define RID_COLORX_CYAN (RID_APP_START + 1729)
+#define RID_COLORX_MAGENTA  (RID_APP_START + 1730)
+#define RID_COLORX_YELLOW   (RID_APP_START + 1731)
 
 #define RID_LRPARENTX   (RID_APP_START + 1801)
 #define RID_LRBRACKETX  (RID_APP_START + 1802)
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 893c2a0..111a818 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -48,8 +48,6 @@ SmElementSeparator::SmElementSeparator() :
 SmElement(SmNodePointer(), OUString())
 {}
 
-//
-
 const sal_uInt16 SmElementsControl::aUnaryBinaryOperatorsList[] =
 {
 RID_PLUSX, RID_MINUSX, RID_PLUSMINUSX, RID_MINUSPLUSX,
@@ -130,7 +128,10 @@ const sal_uInt16 SmElementsControl::aAttributes[] =
 RID_WIDEVECX, RID_WIDETILDEX, RID_WIDEHATX, RID_OVERLINEX,
 RID_UNDERLINEX, RID_OVERSTRIKEX,
 0x,
-RID_PHANTOMX, RID_BOLDX, RID_ITALX, RID_SIZEXY, RID_FONTXY
+RID_PHANTOMX, RID_BOLDX, RID_ITALX, RID_SIZEXY, RID_FONTXY,
+0x,
+RID_COLORX_BLACK, RID_COLORX_BLUE, RID_COLORX_GREEN,
+RID_COLORX_RED, RID_COLORX_CYAN, RID_COLORX_MAGENTA, RID_COLORX_YELLOW
 };
 
 const sal_uInt16 SmElementsControl::aBrackets[] =
@@ -401,6 +402,20 @@ void SmElementsControl::addElements(const sal_uInt16 
aElementsArray[], sal_uInt1
 addElement(OUString(\size\), SmResId(aElementId));
 else if (aElementId == RID_FONTXY)
 addElement(OUString(\font\), SmResId(aElementId));
+else if (aElementId == RID_COLORX_BLACK)
+addElement(OUString(color black { \black\ }), 
SmResId(aElementId));
+else if (aElementId == RID_COLORX_BLUE)
+addElement(OUString(color blue { \blue\ }), 
SmResId(aElementId));
+else if (aElementId == RID_COLORX_GREEN)
+addElement(OUString(color green { \green\ }), 
SmResId(aElementId));
+else if (aElementId == RID_COLORX_RED)
+addElement(OUString(color red { \red\ }), 
SmResId(aElementId));
+else if (aElementId == RID_COLORX_CYAN)
+addElement(OUString(color cyan { \cyan\ }), 
SmResId(aElementId));
+else if (aElementId == RID_COLORX_MAGENTA)
+addElement(OUString(color magenta { \magenta\ }), 
SmResId(aElementId));
+else if (aElementId == RID_COLORX_YELLOW)
+addElement(OUString(color yellow { \yellow\ }), 
SmResId(aElementId));
 else
 addElement(SmResId(aElementId), SmResId(aElementId));
 }
@@ -458,8 +473,6 @@ void SmElementsControl::build()
 Invalidate();
 }
 
-//***
-
 const sal_uInt16 SmElementsDockingWindow::aCategories[] = {
 RID_CATEGORY_UNARY_BINARY_OPERATORS,
 RID_CATEGORY_RELATIONS,
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index e30e3e0..a39d151 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -173,6 +173,13 @@ String RID_ITALX{ Text = ital ?  ; };
 String RID_SIZEXY   { Text = size ? {?}  ; };
 String RID_FONTXY   { Text = font ? {?}  ; };
 String RID_COLORX   { Text = color ? {?}  ; };
+String RID_COLORX_BLACK { Text = color black {?}  ; };
+String RID_COLORX_BLUE  { Text = color blue {?}  ; };
+String RID_COLORX_GREEN { Text = color green {?}  ; };
+String RID_COLORX_RED   { Text = color red {?}

Re: Subj: Problem controlling Writer remotely -- Please help

2013-08-16 Thread Lars Doelle

Hi Stephan,

thanks for your reply.

  Seeking a solution, i write to ask for help to this mail-list. Two
  solutions appear to be possible (in order of preference):
 
  1) Use com.sun.star.connection.Acceptor to create a TCP-server within
  LibreOffice. Our problem is how to make this event-driven. Is is
  this possible at all?
 
 Not sure I get your scenario right.

What i want to do is to setup a TCP-server from within LibreOffice that is able
to read and send raw data over the wire using some Basic routine processing
it in between.

Now my question is how to use the LibreOffice-infrastructure best to create
a TCP-server? Can it be done from Basic using the Acceptor interface at all? 
Should
i better use a python-script, create a listening thread and then call the 
processing
Basic-macro, or what else?


 If you want the LibreOffice 
 (soffice) process to accept incoming connections, just start it with an 
 --accept=... command line argument.  (The resulting 
 css.connection.Acceptor is running in its own thread then, to not block 
 anything else while waiting for connections, see 
 desktop/source/offacc/acceptor.{hxx,cxx}.)

If you say above some '--accept=parameter' magic would already create
a silly TCP-server that passes all connections accepted to some Basic routine
for further read and write i would definitely love to learn more about this 
trick.

Unfortunately, i didn't find any syntax or options for the 'parameter'. We're
using --accept=socket,host=0,port=2002;urp;, but this implies UNO-marshalling,
which we want to get rid of for reasons outlined in the original mail.

Right now i hesitate to download the sources to check the file you've pointed me
at, mainly because LibreOffice is so huge. If the acceptor.[ch]xx files really 
contain
the relevant information for my purpose, please simply confirm, that this is 
the way
to go.

-- Lars
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sfx2/source

2013-08-16 Thread Tor Lillqvist

 sfx2/source/view/viewfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 61a2c9fbacebb15511dfc233ffbd25937ea2d04f
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Aug 16 16:48:08 2013 +0300

WaE: C4805: '==' : unsafe mix of type 'bool' and type 'sal_Bool' in 
operation

Change-Id: Ib4da1e4f488971d7508054159df3e277daea7e5f

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 79f6314..e1fcdc4 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2791,7 +2791,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest rReq )
 if (xSupplier.is())
 xRecorder = xSupplier-getDispatchRecorder();
 
-sal_Bool bIsRecording = xRecorder.is();
+bool bIsRecording = xRecorder.is();
 SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, SID_RECORDMACRO, 
sal_False);
 if ( pItem  pItem-GetValue() == bIsRecording )
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - package/source writerfilter/source

2013-08-16 Thread Michael Stahl

 package/source/xstor/xstorage.cxx   |6 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |   13 +++--
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
commit 5cc5a03d799434b51f67256a46d52b823870be94
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 16 12:35:26 2013 +0200

fdo#68084: OOXML import: handle exceptions if stream is missing

The bugdoc does not have a styles.xml but a stylesWithEffects.xml,
whatever that may mean.  (the app.xml contains Microsoft Macintosh Word)

Change-Id: If3d11c5d166dcaf3d94129339559787c20e6db46
(cherry picked from commit 6e3ac01f850228afb5c6cb1a33b101693aea8712)
Reviewed-on: https://gerrit.libreoffice.org/5450
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/package/source/xstor/xstorage.cxx 
b/package/source/xstor/xstorage.cxx
index bfd2302..a2e0350 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -2194,7 +2194,11 @@ SotElement_Impl* OStorage::OpenStreamElement_Impl( const 
::rtl::OUString aStrea
 if ( !( m_pImpl-m_nStorageMode  embed::ElementModes::WRITE )
   || (( nOpenMode  embed::ElementModes::WRITE ) != 
embed::ElementModes::WRITE )
   || ( nOpenMode  embed::ElementModes::NOCREATE ) == 
embed::ElementModes::NOCREATE )
-throw io::IOException( OSL_LOG_PREFIX, uno::Reference 
uno::XInterface () ); // TODO: access_denied
+{
+throw io::IOException(Element does not exist and cannot be 
+created: \ + aStreamName + \,
+uno::Reference uno::XInterface ()); // TODO: 
access_denied
+}
 
 // create a new StreamElement and insert it into the list
 pElement = m_pImpl-InsertStream( aStreamName, bEncr );
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index 29c64ad..58a1006 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -54,8 +54,17 @@ OOXMLDocumentImpl::~OOXMLDocumentImpl()
 void OOXMLDocumentImpl::resolveFastSubStream(Stream  rStreamHandler,
  OOXMLStream::StreamType_t nType)
 {
-OOXMLStream::Pointer_t pStream
-(OOXMLDocumentFactory::createStream(mpStream, nType));
+OOXMLStream::Pointer_t pStream;
+try
+{
+pStream = OOXMLDocumentFactory::createStream(mpStream, nType);
+}
+catch (uno::Exception const e)
+{
+SAL_INFO(writerfilter, resolveFastSubStream: exception while 
+resolving stream   (unsigned)nType   :   e.Message);
+return;
+}
 OOXMLStream::Pointer_t savedStream = mpStream;
 mpStream = pStream;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=6

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on|40788   |

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27 ba...@quipo.it changed:

   What|Removed |Added

 Depends on||40788

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'feature/cmis' - comphelper/source sfx2/source ucb/source

2013-08-16 Thread Cao Cuong Ngo

 comphelper/source/misc/mediadescriptor.cxx |5 
 sfx2/source/doc/docfile.cxx|5 
 ucb/source/ucp/cmis/cmis_content.cxx   |  148 ++---
 ucb/source/ucp/cmis/cmis_url.cxx   |6 -
 4 files changed, 61 insertions(+), 103 deletions(-)

New commits:
commit 414d36f7370bce34d3d3765aa4e85dd44603c17f
Author: Cao Cuong Ngo cao.cuong@gmail.com
Date:   Fri Aug 16 16:41:22 2013 +0200

CMIS: fix file saving issue

Change-Id: I60cccb841fea5ce493f004c73ecf50468019f860

diff --git a/comphelper/source/misc/mediadescriptor.cxx 
b/comphelper/source/misc/mediadescriptor.cxx
index 586f6fc..21102f2 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -470,8 +470,9 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool 
bLockFile )
 css::uno::Reference css::uno::XInterface ());
 
 // Parse URL! Only the main part has to be used further. E.g. a 
jumpmark can make trouble
-OUString sNormalizedURL = impl_normalizeURL( sURL );
-return impl_openStreamWithURL( sNormalizedURL, bLockFile );
+// We need to keep the full URL with Mark to store the Object ID
+// in CMIS UCB
+return impl_openStreamWithURL( sURL, bLockFile );
 }
 #if OSL_DEBUG_LEVEL  0
 catch(const css::uno::Exception ex)
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index c59675f..ebd03ea 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2492,7 +2492,7 @@ void SfxMedium::Init_Impl()
 {
 if ( aUrl.HasMark() )
 {
-pImp-m_aLogicName = aUrl.GetURLNoMark( 
INetURLObject::NO_DECODE );
+// keep the Mark to store the Document ID
 GetItemSet()-Put( SfxStringItem( SID_JUMPMARK, aUrl.GetMark() 
) );
 }
 
@@ -3007,8 +3007,7 @@ const INetURLObject SfxMedium::GetURLObject() const
 if (!pImp-m_pURLObj)
 {
 pImp-m_pURLObj = new INetURLObject( pImp-m_aLogicName );
-if (pImp-m_pURLObj-HasMark())
-*pImp-m_pURLObj = INetURLObject( pImp-m_aLogicName 
).GetURLNoMark();
+// keep the Mark to store the Document ID
 }
 
 return *pImp-m_pURLObj;
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx 
b/ucb/source/ucp/cmis/cmis_content.cxx
index c2266fb..6ac4106 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -415,7 +415,18 @@ namespace cmis
 {
 if ( !m_pObject.get() )
 {
-if ( !m_sObjectPath.isEmpty( ) )
+if ( !m_sObjectId.isEmpty( ) )
+{
+try
+{
+m_pObject = getSession( xEnv )-getObject( 
OUSTR_TO_STDSTR( m_sObjectId ) );
+}
+catch ( const libcmis::Exception )
+{
+throw libcmis::Exception( Object not found );
+}
+}
+else if ( !m_sObjectPath.isEmpty( ) )
 {
 try
 {
@@ -438,7 +449,7 @@ namespace cmis
 {
 vector libcmis::ObjectPtr  children = 
pParentFolder-getChildren( );
 for ( vector libcmis::ObjectPtr ::iterator it = 
children.begin( );
-  it != children.end()  !m_pObject; ++it )
+it != children.end()  !m_pObject; ++it )
 {
 if ( ( *it )-getName( ) == sName )
 m_pObject = *it;
@@ -449,8 +460,6 @@ namespace cmis
 throw libcmis::Exception( Object not found );
 }
 }
-else if (!m_sObjectId.isEmpty( ) )
-m_pObject = getSession( xEnv )-getObject( OUSTR_TO_STDSTR( 
m_sObjectId ) );
 else
 {
 m_pObject = getSession( xEnv )-getRootFolder( );
@@ -467,7 +476,9 @@ namespace cmis
 bool bIsFolder = false;
 try
 {
-bIsFolder = getObject( xEnv )-getBaseType( ) == cmis:folder;
+libcmis::ObjectPtr obj = getObject( xEnv );
+if ( obj )
+bIsFolder = obj-getBaseType( ) == cmis:folder;
 }
 catch ( const libcmis::Exception e )
 {
@@ -539,7 +550,9 @@ namespace cmis
 {
 try
 {
-xRow-appendBoolean( rProp, getObject( xEnv 
)-getBaseType( ) == cmis:document );
+libcmis::ObjectPtr obj = getObject( xEnv );
+if ( obj )
+xRow-appendBoolean( rProp, obj-getBaseType( ) == 
cmis:document );
 }
 catch ( const libcmis::Exception )
 {
@@ -553,7 +566,11 @@ namespace cmis
 {

[Libreoffice-commits] core.git: sd/source

2013-08-16 Thread siqi

 sd/source/ui/remotecontrol/OSXNetworkService.mm |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b44ee0a06b08ddae003d52035b9b8558b6c3ec3c
Author: siqi m...@siqi.fr
Date:   Fri Aug 16 16:49:47 2013 +0200

fix for OSXnetwork service

Change-Id: I62037134ad919dec0ea036a1660ce28426033a2d

diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.mm 
b/sd/source/ui/remotecontrol/OSXNetworkService.mm
index 8924399..c4d3bc3 100644
--- a/sd/source/ui/remotecontrol/OSXNetworkService.mm
+++ b/sd/source/ui/remotecontrol/OSXNetworkService.mm
@@ -17,24 +17,24 @@
 
 - (void) publishImpressRemoteServiceOnLocalNetworkWithName:(NSString *)sName
 {
-netService = [[NSNetService alloc] initWithDomain:@local type:@kREG_TYPE 
name:sName port:1599];
+netService = [[NSNetService alloc] initWithDomain:@local 
type:_impressremote._tcp name:sName port:1599];
 
-  if (netService != nil) 
+  if (netService != nil)
   {
 [netService setDelegate:self];
 [netService scheduleInRunLoop:[NSRunLoop currentRunLoop] 
forMode:NSDefaultRunLoopMode];
 [netService publish];
-  } 
+  }
 }
 
--(void)netService:(NSNetService *)aNetService 
+-(void)netService:(NSNetService *)aNetService
 didNotPublish:(NSDictionary *)dict {
 NSLog(@Service %p did not publish: %@, aNetService, dict);
 }
 
 - (void)dealloc {
 [netService stop];
-[netService release]; 
+[netService release];
 [super dealloc];
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

2013-08-16 Thread siqi

 sd/source/ui/remotecontrol/OSXNetworkService.mm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 106b788609596c90050b567dd5e497103f684daf
Author: siqi m...@siqi.fr
Date:   Fri Aug 16 16:53:16 2013 +0200

oups...forgot the @

Change-Id: Id409bf113d7181361c0565f7cd3fb63cd7bc5384

diff --git a/sd/source/ui/remotecontrol/OSXNetworkService.mm 
b/sd/source/ui/remotecontrol/OSXNetworkService.mm
index c4d3bc3..ef8c32f 100644
--- a/sd/source/ui/remotecontrol/OSXNetworkService.mm
+++ b/sd/source/ui/remotecontrol/OSXNetworkService.mm
@@ -17,7 +17,7 @@
 
 - (void) publishImpressRemoteServiceOnLocalNetworkWithName:(NSString *)sName
 {
-netService = [[NSNetService alloc] initWithDomain:@local 
type:_impressremote._tcp name:sName port:1599];
+netService = [[NSNetService alloc] initWithDomain:@local 
type:@_impressremote._tcp name:sName port:1599];
 
   if (netService != nil)
   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

2013-08-16 Thread Michael Stahl

 sw/source/core/doc/doc.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a8d35a87d65e6be12bcd3fc410ba32b2fb9ecd65
Author: Michael Stahl mst...@redhat.com
Date:   Wed Aug 14 12:27:29 2013 +0200

sw: do non-incremental word count in one step

Not sure if it solves a real problem, but seems sensible.

Change-Id: I3a75da924aaffb452da158a6e5c0b3465fe5687b
(cherry picked from commit 3f66fadc2ddbec42a5fd7ee34b18826ef4ede503)
Reviewed-on: https://gerrit.libreoffice.org/5410
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 1993018..8cf4f11 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1758,7 +1758,8 @@ void SwDoc::UpdateDocStat( bool bCompleteAsync, bool 
bFields )
 {
 if (!bCompleteAsync)
 {
-while (IncrementalDocStatCalculate(5000, bFields)) {}
+while (IncrementalDocStatCalculate(
+::std::numeric_limitslong::max(), bFields)) {}
 maStatsUpdateTimer.Stop();
 }
 else if (IncrementalDocStatCalculate(5000, bFields))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-08-16 Thread Caolán McNamara

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e51cfc1d950dcf1034dd2c93dd05f7d1b9dc60c
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 16 15:26:21 2013 +0100

Updated core
Project: help  3a430335a811b691797546d908081ab41d8ad69d

diff --git a/helpcontent2 b/helpcontent2
index b8c3f44..3a43033 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b8c3f4436f5c754a8d80433e0230cfd7f2a7ae36
+Subproject commit 3a430335a811b691797546d908081ab41d8ad69d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

2013-08-16 Thread Caolán McNamara

 helpers/help_hid.lst|   19 ---
 source/text/swriter/01/05060100.xhp |   31 ---
 2 files changed, 16 insertions(+), 34 deletions(-)

New commits:
commit 3a430335a811b691797546d908081ab41d8ad69d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 16 15:26:21 2013 +0100

update help ids for cui sw pos/size page .ui conversion

Change-Id: Ia145caf38dc724384a3ef27693fbc118a7ce2a19

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d06697b..36ef3c0 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3689,7 +3689,6 @@ HID_STYLIST_EDIT,33177,
 HID_STYLIST_NEW,33176,
 HID_SVXDLG_FILTER_WARNING,34195,
 HID_SVXPAGE_GRFCROP,34143,
-HID_SVXPAGE_SWPOSSIZE,39977,
 HID_SVXTBX_UNDO_REDO_CTRL,34189,
 HID_SVX_CHINESE_DICTIONARY_CB_REVERSE,40022,
 HID_SVX_CHINESE_DICTIONARY_LB_HEADER,40023,
@@ -6817,9 +6816,6 @@ 
svx_CheckBox_RID_SVXPAGE_OPTIONS_JAVA_CB_JAVA_ENABLE,704857099,
 svx_CheckBox_RID_SVXPAGE_POSITION_SIZE_CBX_SCALE,702137366,
 svx_CheckBox_RID_SVXPAGE_STD_PARAGRAPH_CB_AUTO,700810288,
 svx_CheckBox_RID_SVXPAGE_STD_PARAGRAPH_CB_REGISTER,700810324,
-svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_FOLLOW,705430559,
-svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_HORIMIRROR,705430552,
-svx_CheckBox_RID_SVXPAGE_SWPOSSIZE_CB_KEEPRATIO,705430534,
 svx_CheckBox_RID_SVXTABPAGE_GALLERYTHEME_FILES_CBX_PREVIEW,706675715,
 svx_CheckBox_RID_SVX_FONT_SUBSTITUTION_CB_NONPROP,701006873,
 svx_CheckBox_RID_SVX_FONT_SUBSTITUTION_CB_USETABLE,701006869,
@@ -7077,10 +7073,6 @@ 
svx_ListBox_RID_SVXPAGE_POSITION_SIZE_LB_ANCHOR,702139939,
 svx_ListBox_RID_SVXPAGE_POSITION_SIZE_LB_ORIENT,702139944,
 svx_ListBox_RID_SVXPAGE_SHADOW_LB_SHADOW_COLOR,701713930,
 svx_ListBox_RID_SVXPAGE_STD_PARAGRAPH_LB_LINEDIST,700812840,
-svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_HORI,705433107,
-svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_HORITO,705433111,
-svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_VERT,705433114,
-svx_ListBox_RID_SVXPAGE_SWPOSSIZE_LB_VERTTO,705433118,
 svx_ListBox_RID_SVXPAGE_TEXTANIMATION_LB_EFFECT,703729153,
 svx_ListBox_RID_SVXTBX_UNDO_REDO_CTRL_LB_SVXTBX_UNDO_REDO_CTRL,1788300811,
 svx_ListBox_RID_SVX_DLG_SHOWGRIDCOLUMNS_1,1368837633,
@@ -7171,10 +7163,6 @@ 
svx_MetricField_RID_SVXPAGE_STD_PARAGRAPH_ED_LINEDISTMETRIC,700815915,
 svx_MetricField_RID_SVXPAGE_STD_PARAGRAPH_ED_LINEDISTPERCENT,700815914,
 svx_MetricField_RID_SVXPAGE_STD_PARAGRAPH_ED_RIGHTINDENT,700815887,
 svx_MetricField_RID_SVXPAGE_STD_PARAGRAPH_ED_TOPDIST,700815893,
-svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_HEIGHT,705436165,
-svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_HORIBY,705436181,
-svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_VERTBY,705436188,
-svx_MetricField_RID_SVXPAGE_SWPOSSIZE_MF_WIDTH,705436163,
 svx_MetricField_RID_SVXPAGE_TEXTANIMATION_MTR_FLD_AMOUNT,703732225,
 svx_MetricField_RID_SVXPAGE_TEXTANIMATION_MTR_FLD_DELAY,703732226,
 svx_MetricField_RID_SVXPAGE_TEXTATTR_MTR_FLD_BOTTOM,703224324,
@@ -7415,11 +7403,6 @@ 
svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_EXACT,703332909,
 svx_RadioButton_RID_SVXPAGE_INET_SEARCH_RB_OR,703332908,
 svx_RadioButton_RID_SVXPAGE_KEYBOARD_RB_MODULE,705511981,
 svx_RadioButton_RID_SVXPAGE_KEYBOARD_RB_OFFICE,705511980,
-svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_ASCHAR,705430028,
-svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOCHAR,705430027,
-svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOFRAME,705430029,
-svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPAGE,705430025,
-svx_RadioButton_RID_SVXPAGE_SWPOSSIZE_RB_TOPARA,705430026,
 svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_DIRECT,1237795331,
 svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_MANUAL,1237795332,
 svx_RadioButton_RID_SVX_MDLG_ERR_REP_OPTIONS_BTN_ERROPT_SYSTEM,1237795330,
@@ -7456,8 +7439,6 @@ 
svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_AUTOGROW_WIDTH,702137869,
 svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_POSPROTECT,702137901,
 svx_TriStateBox_RID_SVXPAGE_POSITION_SIZE_TSB_SIZEPROTECT,702137902,
 svx_TriStateBox_RID_SVXPAGE_SHADOW_TSB_SHOW_SHADOW,701711874,
-svx_TriStateBox_RID_SVXPAGE_SWPOSSIZE_CB_POSITION,705431055,
-svx_TriStateBox_RID_SVXPAGE_SWPOSSIZE_CB_SIZE,705431056,
 svx_TriStateBox_RID_SVXPAGE_TEXTANIMATION_TSB_AUTO,703727109,
 svx_TriStateBox_RID_SVXPAGE_TEXTANIMATION_TSB_ENDLESS,703727107,
 svx_TriStateBox_RID_SVXPAGE_TEXTANIMATION_TSB_PIXEL,703727108,
diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index cc8885e..b3b1c8e 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -32,6 +32,7 @@
 bookmark_valueaspect ratio;resizing objects/bookmark_value
 /bookmarkcommentUFI: new index entries, see i54237/comment
 bookmark xml-lang=en-US 
branch=hid/modules/swriter/ui/frmtypepage/FrmTypePage id=bm_id3147406 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/cui/ui/swpossizepage/SwPosSizePage id=bm_id3147407 
localize=false/
 paragraph role=heading id=hd_id3151389 xml-lang=en-US level=1 
l10n=U oldref=1link

[Libreoffice-commits] core.git: svtools/source

2013-08-16 Thread Caolán McNamara

 svtools/source/dialogs/prnsetup.cxx |   74 ++--
 1 file changed, 37 insertions(+), 37 deletions(-)

New commits:
commit 2680e19419bbd49a30ea919c7a3eb4550c2f6f33
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Fri Aug 16 16:09:53 2013 +0100

make svtools XubString free

Change-Id: I27fc5b954ad90bebfd895d8b45f0c37875df6cdd

diff --git a/svtools/source/dialogs/prnsetup.cxx 
b/svtools/source/dialogs/prnsetup.cxx
index 4e2889d..87e14c6 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -123,92 +123,92 @@ void ImplPrnDlgUpdateQueueInfo( ListBox* pBox, QueueInfo 
rInfo )
 
 // ---
 
-static void ImplPrnDlgAddString( XubString rStr, const OUString rAddStr )
+static OUString ImplPrnDlgAddString(const OUString rStr, const OUString 
rAddStr)
 {
-if ( rStr.Len() )
-rStr.AppendAscii( ;  );
-rStr += rAddStr;
+OUString aStr(rStr);
+if (!aStr.isEmpty())
+aStr += ;  ;
+return aStr + rAddStr;
 }
 
 // ---
 
-static void ImplPrnDlgAddResString( XubString rStr, sal_uInt16 nResId )
+static OUString ImplPrnDlgAddResString(const OUString rStr, sal_uInt16 nResId)
 {
-ImplPrnDlgAddString( rStr, SVT_RESSTR(nResId) );
+return ImplPrnDlgAddString(rStr, SVT_RESSTR(nResId));
 }
 
 // ---
 
 OUString ImplPrnDlgGetStatusText( const QueueInfo rInfo )
 {
-XubString   aStr;
-sal_uLong   nStatus = rInfo.GetStatus();
+OUString aStr;
+sal_uLong nStatus = rInfo.GetStatus();
 
 // Default-Printer
 if ( !rInfo.GetPrinterName().isEmpty() 
  (rInfo.GetPrinterName() == Printer::GetDefaultPrinterName()) )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_DEFPRINTER );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_DEFPRINTER );
 
 // Status
 if ( nStatus  QUEUE_STATUS_READY )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_READY );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_READY );
 if ( nStatus  QUEUE_STATUS_PAUSED )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PAUSED );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PAUSED );
 if ( nStatus  QUEUE_STATUS_PENDING_DELETION )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PENDING );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PENDING );
 if ( nStatus  QUEUE_STATUS_BUSY )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_BUSY );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_BUSY );
 if ( nStatus  QUEUE_STATUS_INITIALIZING )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_INITIALIZING );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_INITIALIZING );
 if ( nStatus  QUEUE_STATUS_WAITING )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_WAITING );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_WAITING );
 if ( nStatus  QUEUE_STATUS_WARMING_UP )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_WARMING_UP );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_WARMING_UP );
 if ( nStatus  QUEUE_STATUS_PROCESSING )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PROCESSING );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PROCESSING );
 if ( nStatus  QUEUE_STATUS_PRINTING )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PRINTING );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PRINTING );
 if ( nStatus  QUEUE_STATUS_OFFLINE )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_OFFLINE );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_OFFLINE );
 if ( nStatus  QUEUE_STATUS_ERROR )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_ERROR );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_ERROR );
 if ( nStatus  QUEUE_STATUS_SERVER_UNKNOWN )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_SERVER_UNKNOWN );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_SERVER_UNKNOWN );
 if ( nStatus  QUEUE_STATUS_PAPER_JAM )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PAPER_JAM );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PAPER_JAM );
 if ( nStatus  QUEUE_STATUS_PAPER_OUT )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PAPER_OUT );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PAPER_OUT );
 if ( nStatus  QUEUE_STATUS_MANUAL_FEED )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_MANUAL_FEED );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_MANUAL_FEED );
 if ( nStatus  QUEUE_STATUS_PAPER_PROBLEM )
-ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PAPER_PROBLEM );
+aStr = ImplPrnDlgAddResString( aStr, STR_SVT_PRNDLG_PAPER_PROBLEM );
 if ( nStatus

[Libreoffice-commits] core.git: sw/inc sw/source

2013-08-16 Thread Matteo Casalin

 sw/inc/section.hxx |2 +-
 sw/source/core/docnode/section.cxx |   11 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 0f7de1dce1b8b6ce4ecb8cb9f70cb6f8bc9051a5
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Thu Aug 15 16:24:25 2013 +0200

Prefer mutable members to const_cast

Change-Id: Icca5d46b36efa6e8684eb9dd9ea44b496a1829b2
Reviewed-on: https://gerrit.libreoffice.org/5441
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 77fdd2a..db6ce8a 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -153,7 +153,7 @@ class SW_DLLPUBLIC SwSection
 friend class SwSectionFrm;
 
 private:
-SwSectionData m_Data;
+mutable SwSectionData m_Data;
 
 SwServerObjectRef m_RefObj; // Set if DataServer.
 ::sfx2::SvBaseLinkRef m_RefLink;
diff --git a/sw/source/core/docnode/section.cxx 
b/sw/source/core/docnode/section.cxx
index 54c3e58..d243448 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -277,12 +277,11 @@ bool SwSection::DataEquals(SwSectionData const rCmp) 
const
 (void) GetLinkFileName(); // updates m_sLinkFileName
 bool const bProtect(m_Data.IsProtectFlag());
 bool const bEditInReadonly(m_Data.IsEditInReadonlyFlag());
-const_castSwSection*(this)-m_Data.SetProtectFlag(IsProtect());
-const_castSwSection*(this)-m_Data
-.SetEditInReadonlyFlag(IsEditInReadonly());
+m_Data.SetProtectFlag(IsProtect());
+m_Data.SetEditInReadonlyFlag(IsEditInReadonly());
 bool const bResult( m_Data == rCmp );
-const_castSwSection*(this)-m_Data.SetProtectFlag(bProtect);
-
const_castSwSection*(this)-m_Data.SetEditInReadonlyFlag(bEditInReadonly);
+m_Data.SetProtectFlag(bProtect);
+m_Data.SetEditInReadonlyFlag(bEditInReadonly);
 return bResult;
 }
 
@@ -574,7 +573,7 @@ const String SwSection::GetLinkFileName() const
 break;
 default: break;
 }
-const_castSwSection*(this)-m_Data.SetLinkFileName(sTmp);
+m_Data.SetLinkFileName(sTmp);
 }
 return m_Data.GetLinkFileName();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-1' - sc/source

2013-08-16 Thread Eike Rathke

 sc/source/filter/excel/xetable.cxx |   66 ++---
 1 file changed, 33 insertions(+), 33 deletions(-)

New commits:
commit 17b9d3d0f951989495e9c15bf251a497ee713db4
Author: Eike Rathke er...@redhat.com
Date:   Thu Aug 15 01:03:00 2013 +0200

resolved fdo#67571 write flags and formula token array again

Regression introduced with 337066eb1fa395990b78d1032c399a4688d2a6f9,
flags and formula token array weren't written if the formula result was
an error value.

Change-Id: I8ccd55a7b43d5ceb79002e01f0b3d33d36d85538
(cherry picked from commit 25763e59625ce83de4b82927359108f9e7878744)
Reviewed-on: https://gerrit.libreoffice.org/5430
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Kohei Yoshida kohei.yosh...@suse.de
Tested-by: Kohei Yoshida kohei.yosh...@suse.de

diff --git a/sc/source/filter/excel/xetable.cxx 
b/sc/source/filter/excel/xetable.cxx
index 8694a49..0792318 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -936,45 +936,45 @@ void XclExpFormulaCell::WriteContents( XclExpStream 
rStrm )
  XclTools::GetXclErrorCode( nScErrCode )
  sal_uInt8( 0 )  sal_uInt16( 0 )
  sal_uInt16( 0x );
-
-return;
 }
-
-// result of the formula
-switch( mrScFmlaCell.GetFormatType() )
+else
 {
-case NUMBERFORMAT_NUMBER:
+// result of the formula
+switch( mrScFmlaCell.GetFormatType() )
 {
-// either value or error code
-rStrm  mrScFmlaCell.GetValue();
-}
-break;
+case NUMBERFORMAT_NUMBER:
+{
+// either value or error code
+rStrm  mrScFmlaCell.GetValue();
+}
+break;
 
-case NUMBERFORMAT_TEXT:
-{
-OUString aResult = mrScFmlaCell.GetString();
-if( !aResult.isEmpty() || (rStrm.GetRoot().GetBiff() = EXC_BIFF5) 
)
-{
-rStrm  EXC_FORMULA_RES_STRING;
-mxStringRec.reset( new XclExpStringRec( rStrm.GetRoot(), 
aResult ) );
-}
-else
-rStrm  EXC_FORMULA_RES_EMPTY; // BIFF8 only
-rStrm  sal_uInt8( 0 )  sal_uInt32( 0 )  sal_uInt16( 0x );
-}
-break;
+case NUMBERFORMAT_TEXT:
+{
+OUString aResult = mrScFmlaCell.GetString();
+if( !aResult.isEmpty() || (rStrm.GetRoot().GetBiff() = 
EXC_BIFF5) )
+{
+rStrm  EXC_FORMULA_RES_STRING;
+mxStringRec.reset( new XclExpStringRec( 
rStrm.GetRoot(), aResult ) );
+}
+else
+rStrm  EXC_FORMULA_RES_EMPTY; // BIFF8 only
+rStrm  sal_uInt8( 0 )  sal_uInt32( 0 )  sal_uInt16( 
0x );
+}
+break;
 
-case NUMBERFORMAT_LOGICAL:
-{
-sal_uInt8 nXclValue = (mrScFmlaCell.GetValue() == 0.0) ? 0 : 1;
-rStrm  EXC_FORMULA_RES_BOOL  sal_uInt8( 0 )
-   nXclValue  sal_uInt8( 0 )  sal_uInt16( 0 )
-   sal_uInt16( 0x );
-}
-break;
+case NUMBERFORMAT_LOGICAL:
+{
+sal_uInt8 nXclValue = (mrScFmlaCell.GetValue() == 0.0) ? 0 
: 1;
+rStrm  EXC_FORMULA_RES_BOOL  sal_uInt8( 0 )
+ nXclValue  sal_uInt8( 0 )  sal_uInt16( 0 )
+ sal_uInt16( 0x );
+}
+break;
 
-default:
-rStrm  mrScFmlaCell.GetValue();
+default:
+rStrm  mrScFmlaCell.GetValue();
+}
 }
 
 // flags and formula token array
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 67571, which changed state.

Bug 67571 Summary: FILESAVE: Saving to XLS format omits to save formula 
expressions of cells where the formula result is an error
https://bugs.freedesktop.org/show_bug.cgi?id=67571

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[MERGE FAILED] enable binary package option for a set of 'stable' libraries

2013-08-16 Thread Thorsten Behrens (via Code Review)

Thorsten Behrens has submitted this change and it FAILED to merge.

Change subject: enable binary package option for a set of 'stable' libraries
..


Your change could not be merged due to a path conflict.

Please merge (or rebase) the change locally and upload the resolution for 
review.

-- 
To view, visit https://gerrit.libreoffice.org/4765
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merge-failed
Gerrit-Change-Id: I8924ba22d178aa4d8e500ae3f484af654a37e87e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/inc sw/source

2013-08-16 Thread Matteo Casalin

 sw/inc/docsh.hxx   |   15 +
 sw/source/core/docnode/section.cxx |  108 -
 sw/source/ui/app/docsh2.cxx|   98 +
 sw/source/ui/uiview/view2.cxx  |   11 +--
 4 files changed, 117 insertions(+), 115 deletions(-)

New commits:
commit ad3188b5faf6db2ccab07a7a8901518e80e3ad25
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Thu Aug 15 13:39:11 2013 +0200

sw_FindDocShell(): better place and name + String to OUString

Change-Id: I345a2802b4428c607297cbe6972c5b7aebc5de0b
Reviewed-on: https://gerrit.libreoffice.org/5439
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index e060cb7..efa659b 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -305,6 +305,21 @@ class Graphic;
  /// implemented in source/ui/docvw/romenu.cxx
 String ExportGraphic( const Graphic rGraphic, const String rGrfName );
 
+/** Find the right DocShell and create a new one:
+The return value specifies what should happen to the Shell
+0 - Error, could not find the DocShell
+1 - DocShell is an existing Document
+2 - DocShell was created anew, thus it needs to be closed again
+(will be assigned to xLockRef additionally)
+*/
+int SwFindDocShell( SfxObjectShellRef xDocSh,
+SfxObjectShellLock xLockRef,
+const OUString rFileName,
+const OUString rPasswd,
+const OUString rFilter,
+sal_Int16 nVersion,
+SwDocShell* pDestSh );
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/docnode/section.cxx 
b/sw/source/core/docnode/section.cxx
index d243448..6f607e7 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1175,112 +1175,6 @@ static void lcl_UpdateLinksInSect( SwBaseLink rUpdLnk, 
SwSectionNode rSectNd )
 }
 
 
-// Find the right DocShell and create a new one:
-// The return value specifies what should happen to the Shell
-//  0 - Error, could not find the DocShell
-//  1 - DocShell is an existing Document
-//  2 - DocShell was created anew, thus it needs to be closed again
-//  (will be assigned to xLockRef additionally)
-int sw_FindDocShell( SfxObjectShellRef xDocSh,
-SfxObjectShellLock xLockRef,
-const String rFileName,
-const String rPasswd,
-String rFilter,
-sal_Int16 nVersion,
-SwDocShell* pDestSh )
-{
-if( !rFileName.Len() )
-return 0;
-
-// 1. Does the file already exist in the list of all Documents?
-INetURLObject aTmpObj( rFileName );
-aTmpObj.SetMark( aEmptyStr );
-
-// Iterate over the DocShell and get the ones with the name
-TypeId aType( TYPE(SwDocShell) );
-
-SfxObjectShell* pShell = pDestSh;
-bool bFirst = 0 != pShell;
-
-if( !bFirst )
-// No DocShell passed, starting with the first from the DocShell list
-pShell = SfxObjectShell::GetFirst( aType );
-
-while( pShell )
-{
-// We want this one
-SfxMedium* pMed = pShell-GetMedium();
-if( pMed  pMed-GetURLObject() == aTmpObj )
-{
-const SfxPoolItem* pItem;
-if( ( SFX_ITEM_SET == pMed-GetItemSet()-GetItemState(
-SID_VERSION, sal_False, pItem ) )
-? (nVersion == ((SfxInt16Item*)pItem)-GetValue())
-: !nVersion )
-{
-// Found, thus return
-xDocSh = pShell;
-return 1;
-}
-}
-
-if( bFirst )
-{
-bFirst = false;
-pShell = SfxObjectShell::GetFirst( aType );
-}
-else
-pShell = SfxObjectShell::GetNext( *pShell, aType );
-}
-
-// 2. Open the file ourselves
-SfxMedium* pMed = new SfxMedium( aTmpObj.GetMainURL(
- INetURLObject::NO_DECODE ), STREAM_READ );
-if( INET_PROT_FILE == aTmpObj.GetProtocol() )
-pMed-DownLoad(); // Touch the medium (download it)
-
-const SfxFilter* pSfxFlt = 0;
-if( !pMed-GetError() )
-{
-String 
sFactory(OUString::createFromAscii(SwDocShell::Factory().GetShortName()));
-SfxFilterMatcher aMatcher( sFactory );
-
-// No Filter, so search for it. Else test if the one passed is a valid 
one
-if( rFilter.Len() )
-{
-pSfxFlt = aMatcher.GetFilter4FilterName( rFilter );
-}
-
-if( nVersion )
-pMed-GetItemSet()-Put( SfxInt16Item( SID_VERSION, nVersion ));
-
-if( rPasswd.Len() )
-pMed-GetItemSet()-Put( SfxStringItem( SID_PASSWORD, rPasswd ));
-
-if( !pSfxFlt )
-aMatcher.DetectFilter(

[Libreoffice-commits] core.git: 2 commits - formula/source sc/source

2013-08-16 Thread Eike Rathke

 formula/source/core/api/FormulaCompiler.cxx |   11 ++-
 sc/source/filter/oox/formulabase.cxx|   14 --
 2 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit b24e3a6042ccfeee650664cc6fb244dfeea497cb
Author: Eike Rathke er...@redhat.com
Date:   Fri Aug 16 17:51:55 2013 +0200

differentiated warning for symbol/AddIn pair insertion, fdo#59727

Change-Id: I371bca810c40d4cfab0b9fcd47a070b4e68ee768

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 6556257..4cb1164 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -253,10 +253,19 @@ const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* 
pStr,sal_Unicode c )
 
 void FormulaCompiler::OpCodeMap::putExternal( const String  rSymbol, const 
String  rAddIn )
 {
+// Different symbols may map to the same AddIn, but the same AddIn may not
+// map to different symbols, the first pair wins. Same symbol of course may
+// not map to different AddIns, again the first pair wins and also the
+// AddIn-symbol mapping is not inserted in other cases.
 bool bOk = mpExternalHashMap-insert( ExternalHashMap::value_type( 
rSymbol, rAddIn)).second;
+SAL_WARN_IF( !bOk, formula.core, OpCodeMap::putExternal: symbol not 
inserted,   rSymbol   -   rAddIn);
 if (bOk)
+{
 bOk = mpReverseExternalHashMap-insert( ExternalHashMap::value_type( 
rAddIn, rSymbol)).second;
-DBG_ASSERT( bOk, OpCodeMap::putExternal: symbol not inserted);
+// Failed insertion of the AddIn is ok for different symbols mapping to
+// the same AddIn. Make this INFO only.
+SAL_INFO_IF( !bOk, formula.core, OpCodeMap::putExternal: AddIn not 
inserted,   rAddIn   -   rSymbol);
+}
 }
 
 void FormulaCompiler::OpCodeMap::putExternalSoftly( const String  rSymbol, 
const String  rAddIn )
commit 78c995a184115ef4ec1c348bd9b910a3791de550
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Fri Aug 16 09:45:41 2013 +0200

import .xlsx files saved by Calc before fdo#59727 was patched

Change-Id: Id1eedc86056f7de24913f8156a819f8a0695fd59

diff --git a/sc/source/filter/oox/formulabase.cxx 
b/sc/source/filter/oox/formulabase.cxx
index 3850383..00965d9 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -817,7 +817,7 @@ static const FunctionData saFuncTableOdf[] =
 { CHISQINV,   0,  NOID,   NOID,   2,  2, 
 V, { VR }, FUNCFLAG_MACROCALLODF }
 };
 
-/** Functions defined by calc, but not in OpenFormula nor supported by Excel. 
*/
+/** Functions defined by Calc, but not in OpenFormula nor supported by Excel. 
*/
 static const FunctionData saFuncTableOOoLO[] =
 {
 { ORG.OPENOFFICE.WEEKS,   ORG.OPENOFFICE.WEEKS,   NOID,   
NOID,   3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
@@ -827,7 +827,17 @@ static const FunctionData saFuncTableOOoLO[] =
 { ORG.OPENOFFICE.DAYSINMONTH, ORG.OPENOFFICE.DAYSINMONTH, NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
 { ORG.OPENOFFICE.DAYSINYEAR,  ORG.OPENOFFICE.DAYSINYEAR,  NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
 { ORG.OPENOFFICE.WEEKSINYEAR, ORG.OPENOFFICE.WEEKSINYEAR, NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
-{ ORG.OPENOFFICE.ROT13,   ORG.OPENOFFICE.ROT13,   NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL }
+{ ORG.OPENOFFICE.ROT13,   ORG.OPENOFFICE.ROT13,   NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+/* Next 8 lines are for importing from .xlsx files saved by Calc before
+ * fdo#59727 was patched with the entries above. */
+{ ORG.OPENOFFICE.WEEKS,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFWEEKS,   NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.MONTHS,  
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFMONTHS,  NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.YEARS,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFYEARS,   NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+   { ORG.OPENOFFICE.ISLEAPYEAR,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETISLEAPYEAR,  NOID,   NOID,   1,  1, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.DAYSINMONTH, 
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDAYSINMONTH, NOID,   NOID,   1,  1, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.DAYSINYEAR,  
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDAYSINYEAR,  NOID,   NOID,   1,  1, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.WEEKSINYEAR,

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - formula/source sc/source

2013-08-16 Thread Winfried Donkers

 formula/source/core/api/FormulaCompiler.cxx |   11 ++-
 sc/source/filter/oox/formulabase.cxx|   14 --
 2 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 27a5fa2c83c1acb119d5ae9000f040de3fb17c09
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Fri Aug 16 09:45:41 2013 +0200

import .xlsx files saved by Calc before fdo#59727 was patched

Change-Id: Id1eedc86056f7de24913f8156a819f8a0695fd59
(cherry picked from commit 78c995a184115ef4ec1c348bd9b910a3791de550)

Signed-off-by: Eike Rathke er...@redhat.com

differentiated warning for symbol/AddIn pair insertion, fdo#59727

Change-Id: I371bca810c40d4cfab0b9fcd47a070b4e68ee768
(cherry picked from commit b24e3a6042ccfeee650664cc6fb244dfeea497cb)

Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index afd6746..aecacd4 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -253,10 +253,19 @@ const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* 
pStr,sal_Unicode c )
 
 void FormulaCompiler::OpCodeMap::putExternal( const String  rSymbol, const 
String  rAddIn )
 {
+// Different symbols may map to the same AddIn, but the same AddIn may not
+// map to different symbols, the first pair wins. Same symbol of course may
+// not map to different AddIns, again the first pair wins and also the
+// AddIn-symbol mapping is not inserted in other cases.
 bool bOk = mpExternalHashMap-insert( ExternalHashMap::value_type( 
rSymbol, rAddIn)).second;
+SAL_WARN_IF( !bOk, formula.core, OpCodeMap::putExternal: symbol not 
inserted,   rSymbol   -   rAddIn);
 if (bOk)
+{
 bOk = mpReverseExternalHashMap-insert( ExternalHashMap::value_type( 
rAddIn, rSymbol)).second;
-DBG_ASSERT( bOk, OpCodeMap::putExternal: symbol not inserted);
+// Failed insertion of the AddIn is ok for different symbols mapping to
+// the same AddIn. Make this INFO only.
+SAL_INFO_IF( !bOk, formula.core, OpCodeMap::putExternal: AddIn not 
inserted,   rAddIn   -   rSymbol);
+}
 }
 
 void FormulaCompiler::OpCodeMap::putExternalSoftly( const String  rSymbol, 
const String  rAddIn )
diff --git a/sc/source/filter/oox/formulabase.cxx 
b/sc/source/filter/oox/formulabase.cxx
index 2b788de..d0db2e7 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -817,7 +817,7 @@ static const FunctionData saFuncTableOdf[] =
 { CHISQINV,   0,  NOID,   NOID,   2,  2, 
 V, { VR }, FUNCFLAG_MACROCALLODF }
 };
 
-/** Functions defined by calc, but not in OpenFormula nor supported by Excel. 
*/
+/** Functions defined by Calc, but not in OpenFormula nor supported by Excel. 
*/
 static const FunctionData saFuncTableOOoLO[] =
 {
 { ORG.OPENOFFICE.WEEKS,   ORG.OPENOFFICE.WEEKS,   NOID,   
NOID,   3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
@@ -827,7 +827,17 @@ static const FunctionData saFuncTableOOoLO[] =
 { ORG.OPENOFFICE.DAYSINMONTH, ORG.OPENOFFICE.DAYSINMONTH, NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
 { ORG.OPENOFFICE.DAYSINYEAR,  ORG.OPENOFFICE.DAYSINYEAR,  NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
 { ORG.OPENOFFICE.WEEKSINYEAR, ORG.OPENOFFICE.WEEKSINYEAR, NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
-{ ORG.OPENOFFICE.ROT13,   ORG.OPENOFFICE.ROT13,   NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL }
+{ ORG.OPENOFFICE.ROT13,   ORG.OPENOFFICE.ROT13,   NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+/* Next 8 lines are for importing from .xlsx files saved by Calc before
+ * fdo#59727 was patched with the entries above. */
+{ ORG.OPENOFFICE.WEEKS,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFWEEKS,   NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.MONTHS,  
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFMONTHS,  NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.YEARS,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFYEARS,   NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+   { ORG.OPENOFFICE.ISLEAPYEAR,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETISLEAPYEAR,  NOID,   NOID,   1,  1, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.DAYSINMONTH, 
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDAYSINMONTH, NOID,   NOID,   1,  1, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.DAYSINYEAR,  
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDAYSINYEAR,  NOID,   NOID,   1,  1, 
 V, { VR

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - formula/source sc/source

2013-08-16 Thread Winfried Donkers

 formula/source/core/api/FormulaCompiler.cxx |   11 ++-
 sc/source/filter/oox/formulabase.cxx|   14 --
 2 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 218728583950aed00be955b5ccdebec69986cff2
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date:   Fri Aug 16 09:45:41 2013 +0200

import .xlsx files saved by Calc before fdo#59727 was patched

Change-Id: Id1eedc86056f7de24913f8156a819f8a0695fd59
(cherry picked from commit 78c995a184115ef4ec1c348bd9b910a3791de550)

Signed-off-by: Eike Rathke er...@redhat.com

differentiated warning for symbol/AddIn pair insertion, fdo#59727

Change-Id: I371bca810c40d4cfab0b9fcd47a070b4e68ee768
(cherry picked from commit b24e3a6042ccfeee650664cc6fb244dfeea497cb)

Signed-off-by: Eike Rathke er...@redhat.com
(cherry picked from commit 27a5fa2c83c1acb119d5ae9000f040de3fb17c09)

Signed-off-by: Eike Rathke er...@redhat.com

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 5d38e6e..11a2034 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -253,10 +253,19 @@ const sal_Unicode* lcl_UnicodeStrChr( const sal_Unicode* 
pStr,sal_Unicode c )
 
 void FormulaCompiler::OpCodeMap::putExternal( const String  rSymbol, const 
String  rAddIn )
 {
+// Different symbols may map to the same AddIn, but the same AddIn may not
+// map to different symbols, the first pair wins. Same symbol of course may
+// not map to different AddIns, again the first pair wins and also the
+// AddIn-symbol mapping is not inserted in other cases.
 bool bOk = mpExternalHashMap-insert( ExternalHashMap::value_type( 
rSymbol, rAddIn)).second;
+SAL_WARN_IF( !bOk, formula.core, OpCodeMap::putExternal: symbol not 
inserted,   rSymbol   -   rAddIn);
 if (bOk)
+{
 bOk = mpReverseExternalHashMap-insert( ExternalHashMap::value_type( 
rAddIn, rSymbol)).second;
-DBG_ASSERT( bOk, OpCodeMap::putExternal: symbol not inserted);
+// Failed insertion of the AddIn is ok for different symbols mapping to
+// the same AddIn. Make this INFO only.
+SAL_INFO_IF( !bOk, formula.core, OpCodeMap::putExternal: AddIn not 
inserted,   rAddIn   -   rSymbol);
+}
 }
 
 void FormulaCompiler::OpCodeMap::putExternalSoftly( const String  rSymbol, 
const String  rAddIn )
diff --git a/sc/source/filter/oox/formulabase.cxx 
b/sc/source/filter/oox/formulabase.cxx
index 9879c46..5fb279d 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -793,7 +793,7 @@ static const FunctionData saFuncTableOdf[] =
 { XOR,0,  NOID,   NOID,   1,  
MX, V, { RX }, FUNCFLAG_MACROCALLODF }
 };
 
-/** Functions defined by calc, but not in OpenFormula nor supported by Excel. 
*/
+/** Functions defined by Calc, but not in OpenFormula nor supported by Excel. 
*/
 static const FunctionData saFuncTableOOoLO[] =
 {
 { ORG.OPENOFFICE.WEEKS,   ORG.OPENOFFICE.WEEKS,   NOID,   
NOID,   3,  3,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
@@ -803,7 +803,17 @@ static const FunctionData saFuncTableOOoLO[] =
 { ORG.OPENOFFICE.DAYSINMONTH, ORG.OPENOFFICE.DAYSINMONTH, NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
 { ORG.OPENOFFICE.DAYSINYEAR,  ORG.OPENOFFICE.DAYSINYEAR,  NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
 { ORG.OPENOFFICE.WEEKSINYEAR, ORG.OPENOFFICE.WEEKSINYEAR, NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
-{ ORG.OPENOFFICE.ROT13,   ORG.OPENOFFICE.ROT13,   NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL }
+{ ORG.OPENOFFICE.ROT13,   ORG.OPENOFFICE.ROT13,   NOID,   
NOID,   1,  1,  V, { VR }, FUNCFLAG_MACROCALL_NEW | FUNCFLAG_EXTERNAL },
+/* Next 8 lines are for importing from .xlsx files saved by Calc before
+ * fdo#59727 was patched with the entries above. */
+{ ORG.OPENOFFICE.WEEKS,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFWEEKS,   NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.MONTHS,  
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFMONTHS,  NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.YEARS,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDIFFYEARS,   NOID,   NOID,   3,  3, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+   { ORG.OPENOFFICE.ISLEAPYEAR,   
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETISLEAPYEAR,  NOID,   NOID,   1,  1, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL },
+{ ORG.OPENOFFICE.DAYSINMONTH, 
COM.SUN.STAR.SHEET.ADDIN.DATEFUNCTIONS.GETDAYSINMONTH, NOID,   NOID,   1,  1, 
 V, { VR }, FUNCFLAG_IMPORTONLY | FUNCFLAG_EXTERNAL

[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source sfx2/uiconfig

2013-08-16 Thread Krisztian Pinter

 include/sfx2/recentdocsview.hxx|   27 
 sfx2/source/control/recentdocsview.cxx |   67 +++-
 sfx2/source/dialog/backingwindow.cxx   |  108 ++---
 sfx2/source/dialog/backingwindow.hxx   |   14 ++--
 sfx2/uiconfig/ui/startcenter.ui|   16 ++--
 5 files changed, 126 insertions(+), 106 deletions(-)

New commits:
commit 454ff1a48ed21a8bff8373a1aa7707e286629e9a
Author: Krisztian Pinter pin.termina...@gmail.com
Date:   Tue Aug 13 17:56:46 2013 +0200

startcenter: Disable tabs for modules not installed

Change-Id: I74dbd1dab44efa87a78ad3268658895f2d1542db

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index cda286e..2e8afdf 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -70,21 +70,22 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
   sfx/ui/startcenter.ui,
   StartCenter );
 
-get(mpOpenButton,  open);
-get(mpTemplateButton,  templates);
+get(mpOpenButton,   open);
+get(mpTemplateButton,   templates);
 
-get(mpWriterButton,writer);
-get(mpCalcButton,  calc);
-get(mpImpressButton,   impress);
-get(mpDrawButton,  draw);
-get(mpDBButton,database);
-get(mpMathButton,  math);
+get(mpModuleNotebook,   modules_notebook);
+
+get(mpWriterButton, writer);
+get(mpCalcButton,   calc);
+get(mpImpressButton,impress);
+get(mpDrawButton,   draw);
+get(mpDBButton, database);
+get(mpMathButton,   math);
 
 get(mpExtensionsButton, extension);
 get(mpInfoButton,   info);
 get(mpTplRepButton, add_temp);
 
-
 get( mpAllRecentThumbnails, all_recent);
 get( mpWriterRecentThumbnails,  writer_recent);
 get( mpCalcRecentThumbnails,calc_recent);
@@ -93,23 +94,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 get( mpDatabaseRecentThumbnails,database_recent);
 get( mpMathRecentThumbnails,math_recent);
 
-mpAllRecentThumbnails   -addFileType(TYPE_WRITER | TYPE_CALC |
-TYPE_IMPRESS | TYPE_DRAW | TYPE_DATABASE | TYPE_MATH | TYPE_OTHER);
-mpWriterRecentThumbnails-addFileType(TYPE_WRITER);
-mpCalcRecentThumbnails  -addFileType(TYPE_CALC);
-mpImpressRecentThumbnails   -addFileType(TYPE_IMPRESS);
-mpDrawRecentThumbnails  -addFileType(TYPE_DRAW);
-mpDatabaseRecentThumbnails  -addFileType(TYPE_DATABASE);
-mpMathRecentThumbnails  -addFileType(TYPE_MATH);
-
-mpAllRecentThumbnails   -loadRecentDocs();
-mpWriterRecentThumbnails-loadRecentDocs();
-mpCalcRecentThumbnails  -loadRecentDocs();
-mpImpressRecentThumbnails   -loadRecentDocs();
-mpDrawRecentThumbnails  -loadRecentDocs();
-mpDatabaseRecentThumbnails  -loadRecentDocs();
-mpMathRecentThumbnails  -loadRecentDocs();
-
 try
 {
 mxContext.set( ::comphelper::getProcessComponentContext(), 
uno::UNO_SET_THROW );
@@ -211,23 +195,39 @@ void BackingWindow::initControls()
 aFileNewAppsAvailable.insert( sURL );
 }
 
-setupButton( mpWriterButton, WRITER_URL, aFileNewAppsAvailable,
- aModuleOptions, SvtModuleOptions::E_SWRITER );
-setupButton( mpDrawButton, DRAW_URL, aFileNewAppsAvailable,
- aModuleOptions, SvtModuleOptions::E_SDRAW );
-setupButton( mpCalcButton, CALC_URL, aFileNewAppsAvailable,
- aModuleOptions, SvtModuleOptions::E_SCALC );
-setupButton( mpDBButton, BASE_URL, aFileNewAppsAvailable,
- aModuleOptions, SvtModuleOptions::E_SDATABASE );
-setupButton( mpImpressButton, IMPRESS_WIZARD_URL, aFileNewAppsAvailable,
- aModuleOptions, SvtModuleOptions::E_SIMPRESS );
-setupButton( mpMathButton, MATH_URL, aFileNewAppsAvailable,
- aModuleOptions, SvtModuleOptions::E_SMATH );
-
-setupButton( mpOpenButton, , aFileNewAppsAvailable,
- aModuleOptions, SvtModuleOptions::E_SWRITER );
-setupButton( mpTemplateButton, , aFileNewAppsAvailable,
- aModuleOptions, SvtModuleOptions::E_SWRITER );
+setupModuleTab( tab_writer, mpWriterRecentThumbnails, TYPE_WRITER,
+WRITER_URL, aFileNewAppsAvailable, aModuleOptions,
+SvtModuleOptions::E_SWRITER );
+setupModuleTab( tab_calc, mpCalcRecentThumbnails, TYPE_CALC,
+DRAW_URL, aFileNewAppsAvailable, aModuleOptions,
+SvtModuleOptions::E_SDRAW );
+setupModuleTab( tab_impress, mpImpressRecentThumbnails, TYPE_IMPRESS,
+CALC_URL, aFileNewAppsAvailable, aModuleOptions,
+SvtModuleOptions::E_SCALC );
+setupModuleTab( tab_draw, mpDrawRecentThumbnails, TYPE_DRAW,
+BASE_URL, aFileNewAppsAvailable, aModuleOptions,
+SvtModuleOptions::E_SDATABASE );
+setupModuleTab( tab_database, mpDatabaseRecentThumbnails, TYPE_DATABASE,
+

[Libreoffice-commits] core.git: officecfg/registry sc/inc sc/source sc/uiconfig

2013-08-16 Thread Tomaž Vajngerl

 officecfg/registry/schema/org/openoffice/Office/Calc.xcs |8 +++
 sc/inc/inputopt.hxx  |3 +
 sc/inc/sc.hrc|3 +
 sc/source/core/tool/inputopt.cxx |   34 +--
 sc/source/ui/app/scmod.cxx   |   10 
 sc/source/ui/inc/tpview.hxx  |1 
 sc/source/ui/optdlg/tpview.cxx   |   14 ++
 sc/source/ui/view/tabview2.cxx   |   14 --
 sc/uiconfig/scalc/ui/scgeneralpage.ui|   20 
 9 files changed, 91 insertions(+), 16 deletions(-)

New commits:
commit 462b28770e4fa3dfa6fe4af71a6776cceb4c4640
Author: TomaÅ¾ Vajngerl qui...@gmail.com
Date:   Fri Aug 16 17:15:34 2013 +0200

fdo#37230 Add legacy cell selection behavior and config. option

When selecting cells with ctrl+shift, the legacy behaviour was to
take in account to which cell the cursor moved. This allowed the
user to make some convenient selections. This behaviour can now be
turned on with a switch in the configuration (Tools  Options 
Calc  General  Input Settings  Use legacy cursor movement
behavior when selecting).

Change-Id: I00ae7b4ee001b416cc680c7a650631daec71e51b

diff --git a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
index b396438..ada4416 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Calc.xcs
@@ -714,6 +714,14 @@
 /info
 valuetrue/value
   /prop
+  prop oor:name=LegacyCellSelection oor:type=xs:boolean 
oor:nillable=false
+!-- UIHints: Tools - Options - Spreadsheet - General - [Section] 
Input settings --
+info
+  descUse legacy behaviour when selecting cells/desc
+  labelUse legacy behaviour when selecting cells/label
+/info
+valuetrue/value
+  /prop
   prop oor:name=LastFunctions oor:type=oor:int-list 
oor:nillable=false
 !-- OldPath: Calc/Input --
 !-- OldLocation: Soffice.cfg --
diff --git a/sc/inc/inputopt.hxx b/sc/inc/inputopt.hxx
index be5095a..33e282a 100644
--- a/sc/inc/inputopt.hxx
+++ b/sc/inc/inputopt.hxx
@@ -38,6 +38,7 @@ private:
 sal_BoolbUseTabCol;
 sal_BoolbTextWysiwyg;
 sal_BoolbReplCellsWarn;
+sal_BoolbLegacyCellSelection;
 
 public:
 ScInputOptions();
@@ -66,6 +67,8 @@ public:
 sal_BoolGetTextWysiwyg() const  { return bTextWysiwyg;   }
 voidSetReplaceCellsWarn(sal_Bool bSet)  { bReplCellsWarn = bSet; }
 sal_BoolGetReplaceCellsWarn() const { return bReplCellsWarn; }
+voidSetLegacyCellSelection(sal_Bool bSet)   { bLegacyCellSelection 
= bSet; }
+sal_BoolGetLegacyCellSelection() const  { return 
bLegacyCellSelection; }
 
 const ScInputOptions   operator=   ( const ScInputOptions rOpt );
 };
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 8611337..ca208ea 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -84,6 +84,9 @@
 #define FID_SCALESTATUS (SC_VIEW_START + 10)
 #define SID_UPDATECHART (SC_VIEW_START + 13)
 
+// TabPage entry - Legacy selection
+#define SID_SC_INPUT_LEGACY_CELL_SELECTION (SC_VIEW_START + 15)
+
 // Format options
 #define SID_SCFORMULAOPTIONS(SC_VIEW_START + 20)
 #define SID_SCDEFAULTSOPTIONS   (SC_VIEW_START + 21)
diff --git a/sc/source/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx
index 6f056d6..da72057 100644
--- a/sc/source/core/tool/inputopt.cxx
+++ b/sc/source/core/tool/inputopt.cxx
@@ -68,6 +68,7 @@ void ScInputOptions::SetDefaults()
 bUseTabCol  = false;
 bTextWysiwyg= false;
 bReplCellsWarn  = sal_True;
+bLegacyCellSelection = false;
 }
 
 //
@@ -84,6 +85,7 @@ const ScInputOptions ScInputOptions::operator=( const 
ScInputOptions rCpy )
 bUseTabCol  = rCpy.bUseTabCol;
 bTextWysiwyg= rCpy.bTextWysiwyg;
 bReplCellsWarn  = rCpy.bReplCellsWarn;
+bLegacyCellSelection = rCpy.bLegacyCellSelection;
 
 return *this;
 }
@@ -95,17 +97,18 @@ const ScInputOptions ScInputOptions::operator=( const 
ScInputOptions rCpy )
 
 #define CFGPATH_INPUT   Office.Calc/Input
 
-#define SCINPUTOPT_MOVEDIR  0
-#define SCINPUTOPT_MOVESEL  1
-#define SCINPUTOPT_EDTEREDIT2
-#define SCINPUTOPT_EXTENDFMT3
-#define SCINPUTOPT_RANGEFIND4
-#define SCINPUTOPT_EXPANDREFS   5
-#define SCINPUTOPT_MARKHEADER   6
-#define SCINPUTOPT_USETABCOL7
-#define SCINPUTOPT_TEXTWYSIWYG  8
-#define SCINPUTOPT_REPLCELLSWARN9
-#define SCINPUTOPT_COUNT10
+#define SCINPUTOPT_MOVEDIR0
+#define SCINPUTOPT_MOVESEL1

[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - 2 commits - sc/source

2013-08-16 Thread Akash Shetye

 sc/source/core/tool/dbdataformatting.cxx |8 
 sc/source/filter/inc/stylesbuffer.hxx|2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 051317604e9ffdea9e5a4dc1004eced7409cf767
Author: Akash Shetye shetyeak...@gmail.com
Date:   Thu Aug 15 22:36:20 2013 +0530

Gave default values to dbdataformatting style names and other variables

Change-Id: I7bba3443ca06a4e7ceff401584ba2bec372d42a3

diff --git a/sc/source/core/tool/dbdataformatting.cxx 
b/sc/source/core/tool/dbdataformatting.cxx
index 24fde5e..4ca3ef3 100644
--- a/sc/source/core/tool/dbdataformatting.cxx
+++ b/sc/source/core/tool/dbdataformatting.cxx
@@ -22,6 +22,14 @@
 
 ScDBDataFormatting::ScDBDataFormatting()
 {
+//Avoiding problems caused by uninitialized values
+maTableStyleName = Default;
+maFirstRowStripeStyle = Default;
+maSecondRowStripeStyle = Default;
+maFirstColStripeStyle = Default;
+maSecondColStripeStyle = Default;
+bBandedRows = false;
+bBandedColumns = false;
 }
 
 ScDBDataFormatting::ScDBDataFormatting(const OUString rTableStyleName, const 
OUString rFirstRowStripeStyle, const OUString rSecondRowStripeStyle, const 
OUString rFirstColStripeStyle, const OUString rSecondColStripeStyle, bool 
bBRows, bool bBCols) :
commit 947b34d805413aa3fb3e447b8c6bedefd441e8c7
Author: Akash Shetye shetyeak...@gmail.com
Date:   Thu Aug 15 22:33:59 2013 +0530

Corrected a typo

Change-Id: Ie967a5a781d1e0ed7393a1afbafafad758b36795

diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index fb6a67f..c274d2d 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -789,7 +789,7 @@ typedef ::boost::shared_ptr Dxf  DxfRef;
 
 struct TableStyleElementModel
 {
-sal_int32 maDxfId;
+sal_Int32 maDxfId;
 OUString maStyleElementType;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: icon-themes/galaxy

2013-08-16 Thread Siqi LIU

 icon-themes/galaxy/sd/res/pointericon.png |binary
 1 file changed

New commits:
commit fc395e6b312f80976b25a25990791e7fa3d2aa39
Author: Siqi LIU m...@siqi.fr
Date:   Sat Aug 17 00:44:37 2013 +0800

pointericon png

Change-Id: I18f86c35b8efaeb70ba03b37cecb0cef00757ca2

diff --git a/icon-themes/galaxy/sd/res/pointericon.png 
b/icon-themes/galaxy/sd/res/pointericon.png
new file mode 100644
index 000..4184c06
Binary files /dev/null and b/icon-themes/galaxy/sd/res/pointericon.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

2013-08-16 Thread Tor Lillqvist

 cui/source/options/optlingu.cxx |2 +-
 cui/source/tabpages/chardlg.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 682dff097be62a325945c5edd7b81f076a8ef106
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Aug 16 20:45:53 2013 +0300

WaE: C4805: unsafe mix of type 'bool' and type 'sal_Bool' in operation

Change-Id: Icdc6189be1c8126f83e8585513709d44dfa6ec35

diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f0ca449..3a497f5 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1334,7 +1334,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet 
rCoreSet )
 
 
 // automatic spell checking
-sal_Bool bNewAutoCheck = aLinguOptionsCLB.IsChecked( (sal_uInt16) 
EID_SPELL_AUTO );
+bool bNewAutoCheck = aLinguOptionsCLB.IsChecked( (sal_uInt16) 
EID_SPELL_AUTO );
 const SfxPoolItem* pOld = GetOldItem( rCoreSet, SID_AUTOSPELL_CHECK );
 if ( !pOld || ( (SfxBoolItem*)pOld )-GetValue() != bNewAutoCheck )
 {
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 8167a91..4996fd9 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -147,7 +147,7 @@ static sal_uInt16 pTwoLinesRanges[] =
 
 // C-Funktion 
 
-inline sal_Bool StateToAttr( TriState aState )
+inline bool StateToAttr( TriState aState )
 {
 return ( STATE_CHECK == aState );
 }
@@ -2274,7 +2274,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet 
rSet )
 if ( pOld )
 {
 const SvxWordLineModeItem rItem = *( (const SvxWordLineModeItem*)pOld 
);
-if ( rItem.GetValue() == m_pIndividualWordsBtn-IsChecked() )
+if ( rItem.GetValue() == (bool) m_pIndividualWordsBtn-IsChecked() )
 bChanged = false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - include/oox oox/source sw/qa sw/source

2013-08-16 Thread Miklos Vajna

 include/oox/vml/vmlshape.hxx  |4 +
 oox/source/vml/vmlshape.cxx   |   19 
 oox/source/vml/vmlshapecontext.cxx|4 +
 sw/qa/extras/ooxmlexport/data/table-floating-margins.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   30 ++
 sw/source/filter/ww8/docxattributeoutput.cxx  |6 ++
 6 files changed, 62 insertions(+), 1 deletion(-)

New commits:
commit e41ce95ca86d37af35e7725edc2f63bd6634051e
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Aug 16 17:50:11 2013 +0200

DOCX export: fix bottom paragraph margin inside text frame

Having non-null mpParentFrame during the export of text (not during the
export of the frame properties) resulted in getting the frame margins as
an SvxULSpaceItem, not the real paragraph margins.

Change-Id: Icab8906ef7935a86098d7340f5469e732393663c

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c5b1419..2db8917 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -46,6 +46,7 @@
 class Test : public SwModelTestBase
 {
 public:
+Test();
 void testZoom();
 void defaultTabStopNotInStyles();
 void testFdo38244();
@@ -125,8 +126,15 @@ private:
  */
 xmlDocPtr parseExport();
 void assertXPath(xmlDocPtr pXmlDoc, OString aXPath, OString aAttribute = 
OString(), OUString aExpectedValue = OUString());
+/// If the XPath test for now runs only after one export iteration, check 
for this variable.
+bool m_bImport;
 };
 
+Test::Test()
+: m_bImport(false)
+{
+}
+
 void Test::run()
 {
 MethodEntryTest aMethods[] = {
@@ -204,9 +212,11 @@ void Test::run()
 {
 MethodEntryTest rEntry = aMethods[i];
 load(/sw/qa/extras/ooxmlexport/data/, rEntry.pName);
+m_bImport = true;
 // If the testcase is stored in some other format, it's pointless to 
test.
 if (OString(rEntry.pName).endsWith(.docx)  
std::find(vBlacklist.begin(), vBlacklist.end(), rEntry.pName) == 
vBlacklist.end())
 (this-*rEntry.pMethod)();
+m_bImport = false;
 reload(Office Open XML Text);
 (this-*rEntry.pMethod)();
 finish();
@@ -242,6 +252,7 @@ void Test::assertXPath(xmlDocPtr pXmlDoc, OString aXPath, 
OString aAttribute, OU
 {
 xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pXmlDoc);
 xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(w), 
BAD_CAST(http://schemas.openxmlformats.org/wordprocessingml/2006/main;));
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(v), 
BAD_CAST(urn:schemas-microsoft-com:vml));
 xmlXPathObjectPtr pXmlXpathObj = 
xmlXPathEvalExpression(BAD_CAST(aXPath.getStr()), pXmlXpathCtx);
 xmlNodeSetPtr pXmlNodes = pXmlXpathObj-nodesetval;
 CPPUNIT_ASSERT_EQUAL(1, xmlXPathNodeSetGetLength(pXmlNodes));
@@ -1156,6 +1167,13 @@ void Test::testTableFloatingMargins()
 // These were 0, due to lack of import/export.
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1000), getPropertysal_Int32(xFrame, 
TopMargin));
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), getPropertysal_Int32(xFrame, 
BottomMargin));
+
+if (m_bImport)
+{
+// Paragraph bottom margin wasn't 0 in the A1 cell of the floating 
table.
+xmlDocPtr pXmlDoc = parseExport();
+assertXPath(pXmlDoc, 
/w:document/w:body/w:p/w:r/w:pict/v:rect/v:textbox/w:txbxContent/w:tbl/w:tr[1]/w:tc[1]/w:p/w:pPr/w:spacing,
 after, 0);
+}
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index dd88b38..869db45 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -330,6 +330,7 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 m_pTextboxAttrList = NULL;
 m_bTextFrameSyntax = false;
 m_pFlyFrameSize = 0;
+m_rExport.mpParentFrame = NULL;
 
 m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
 m_pSerializer-startElementNS( XML_w, XML_pict, FSEND );
@@ -360,7 +361,6 @@ void DocxAttributeOutput::EndParagraph( 
ww8::WW8TableNodeInfoInner::Pointer_t pT
 
 m_rExport.RestoreData();
 
-m_rExport.mpParentFrame = NULL;
 }
 
 m_pSerializer-endElementNS( XML_w, XML_p );
commit cea495b0dbb6dcace3a3b46f88f7084d127c0482
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Aug 16 16:23:13 2013 +0200

DOCX export: implement wrap distance of Writer textframes

Change-Id: Ia4a36f18495de9f8a2fb0d2b6691231c7bcbcce4

diff --git a/sw/qa/extras/ooxmlexport/data/table-floating-margins.docx 
b/sw/qa/extras/ooxmlexport/data/table-floating-margins.docx
new file mode 100755
index 000..81f6f6c
Binary files /dev/null and 
b/sw/qa/extras/ooxmlexport/data/table-floating-margins.docx differ
diff --git

[Libreoffice-commits] core.git: solenv/gbuild

2013-08-16 Thread Tor Lillqvist

 solenv/gbuild/platform/IOS_ARM_GCC.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 7896f21f803de529ffb9bf54b39e6db24633d5f8
Author: Tor Lillqvist t...@iki.fi
Date:   Tue Jun 25 20:27:46 2013 +0300

Use -O3 when optimising

Change-Id: If5aae1394fa93942736c61d0fd47b75f5a6d509a

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index bd73801..3ad06e5 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -28,6 +28,8 @@ ifeq ($(CXX),)
 $(error You must set CXX in the environment. See README.cross for example.)
 endif
 
+gb_COMPILERDEFAULTOPTFLAGS := -O3
+
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
 # Darwin mktemp -t expects a prefix, not a pattern
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-1' - desktop/source

2013-08-16 Thread Caolán McNamara

 desktop/source/deployment/misc/dp_version.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 25fd578d313962855626dc6426612a401b8099e1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Aug 15 11:50:47 2013 +0100

Resolves: fdo#67539 intermittent crash on failed empty response during 
update

version1 is empty and version2 is not, so on second segment of version2 the 
i1
is already -1 from the first segment check - kaboom

(cherry picked from commit 3bb28b5aaef5e85a981dc9411db1f05524aeedf6)
Reviewed-on: https://gerrit.libreoffice.org/5436
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
(cherry picked from commit b6842e227d979c24b50fe5971d183f58df4788e3)

Change-Id: Ic19511a3b150f40d3cd9cf66bf9d86c94f3f9187
Reviewed-on: https://gerrit.libreoffice.org/5451
Reviewed-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/desktop/source/deployment/misc/dp_version.cxx 
b/desktop/source/deployment/misc/dp_version.cxx
index b6595a4..51add94 100644
--- a/desktop/source/deployment/misc/dp_version.cxx
+++ b/desktop/source/deployment/misc/dp_version.cxx
@@ -43,8 +43,8 @@ namespace dp_misc {
 OUString const  version1, OUString const  version2)
 {
 for (::sal_Int32 i1 = 0, i2 = 0; i1 = 0 || i2 = 0;) {
-OUString e1(getElement(version1, i1));
-OUString e2(getElement(version2, i2));
+OUString e1(i1 = 0 ? getElement(version1, i1) : OUString());
+OUString e2(i2 = 0 ? getElement(version2, i2) : OUString());
 if (e1.getLength()  e2.getLength()) {
 return ::dp_misc::LESS;
 } else if (e1.getLength()  e2.getLength()) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/svx sw/source

2013-08-16 Thread Miklos Vajna

 cui/source/tabpages/backgrnd.cxx |   14 +++---
 include/svx/svxids.hrc   |2 ++
 sw/source/core/bastyp/init.cxx   |4 ++--
 sw/source/ui/frmdlg/frmdlg.cxx   |4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit f694f14ab64f48e40365fd877e201a0382297368
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Aug 16 21:03:18 2013 +0200

fdo#66827 sw: rename SID_ATTR_FILL_GRADIENT to SID_SW_ATTR_FILL_GRADIENT

Change-Id: Ieff7fc6a5b718e11de7d1e4ec2087d64a8a13cae

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 2b80d10..b1dae28 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -807,16 +807,16 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet 
rCoreSet )
 else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( 
nWhich, sal_False ) )
 rCoreSet.ClearItem( nWhich );
 // Handle XFILL_GRADIENT - XFILL_SOLID
-XFillStyleItem aFillStyleItem(XFILL_SOLID, 
GetWhich(SID_ATTR_FILL_STYLE));
+XFillStyleItem aFillStyleItem(XFILL_SOLID, 
GetWhich(SID_SW_ATTR_FILL_STYLE));
 rCoreSet.Put(aFillStyleItem);
 }
 else
 {
-XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_ATTR_FILL_STYLE));
+XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_SW_ATTR_FILL_STYLE));
 rCoreSet.Put(aFillStyleItem);
 
 const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)m_rXFillSet.Get(XATTR_FILLGRADIENT);
-XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_ATTR_FILL_GRADIENT));
+XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_SW_ATTR_FILL_GRADIENT));
 rCoreSet.Put(aFillGradientItem);
 }
 }
@@ -871,11 +871,11 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet 
rCoreSet )
 if (bIsGradient)
 {
 // Handle XFILL_BITMAP - XFILL_GRADIENT
-XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_ATTR_FILL_STYLE));
+XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_SW_ATTR_FILL_STYLE));
 rCoreSet.Put(aFillStyleItem);
 
 const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)m_rXFillSet.Get(XATTR_FILLGRADIENT);
-XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_ATTR_FILL_GRADIENT));
+XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_SW_ATTR_FILL_GRADIENT));
 rCoreSet.Put(aFillGradientItem);
 }
 }
@@ -1959,9 +1959,9 @@ void SvxBackgroundTabPage::PageCreated (SfxAllItemSet 
aSet)
 // If we get a gradient list, also read fill and gradient style.
 m_pGradientList = pGradientListItem-GetGradientList();
 m_pLbGradients-Fill(m_pGradientList);
-const XFillStyleItem rFillStyleItem = (const 
XFillStyleItem)aSet.Get(SID_ATTR_FILL_STYLE);
+const XFillStyleItem rFillStyleItem = (const 
XFillStyleItem)aSet.Get(SID_SW_ATTR_FILL_STYLE);
 m_rXFillSet.Put(XFillStyleItem(rFillStyleItem.GetValue()));
-const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)aSet.Get(SID_ATTR_FILL_GRADIENT);
+const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)aSet.Get(SID_SW_ATTR_FILL_GRADIENT);
 m_rXFillSet.Put(XFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue()));
 }
 else
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 8aa8807..bace052 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -954,6 +954,8 @@
 
 #define FN_SVX_SET_NUMBER   (SID_SVX_START+1136)
 #define FN_SVX_SET_BULLET   (SID_SVX_START+1137)
+#define SID_SW_ATTR_FILL_STYLE  (SID_SVX_START+1138)
+#define SID_SW_ATTR_FILL_GRADIENT   (SID_SVX_START+1139)
 
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index abd7120..812f169 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -383,8 +383,8 @@

[Libreoffice-commits] core.git: sd/source

2013-08-16 Thread Ivan Timofeev

 sd/source/ui/dlg/dlgass.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit af5c477748057903320df8a3df9901c91f820f2b
Author: Ivan Timofeev timofeev@gmail.com
Date:   Fri Aug 16 23:35:26 2013 +0400

WaE: unused variable 'aFile'

Change-Id: I87486de9af7fee8d06cc97fb104de2e2a978de45

diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx
index 3bedd26..892d64e 100644
--- a/sd/source/ui/dlg/dlgass.cxx
+++ b/sd/source/ui/dlg/dlgass.cxx
@@ -1006,7 +1006,6 @@ OUString AssistentDlgImpl::GetDocFileName()
 
 OUString AssistentDlgImpl::GetLayoutFileName()
 {
-OUString aFile;
 const sal_uInt16 nEntry = mpPage2LayoutLB-GetSelectEntryPos();
 TemplateEntry* pEntry = NULL;
 if(nEntry != (sal_uInt16)-1  nEntry  0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - connectivity/source

2013-08-16 Thread Andrzej J . R . Hunt

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx|   22 ++-
 connectivity/source/drivers/firebird/Statement.cxx   |4 ++
 connectivity/source/drivers/firebird/StatementCommonBase.cxx |   14 +++
 3 files changed, 30 insertions(+), 10 deletions(-)

New commits:
commit 985df3aa867a5ebba22e3d7805baa53022c1ee2a
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Fri Aug 16 12:18:15 2013 +0100

Free SQLDA if statement preparation fails. (firebird-sdbc)

Otherwise we are left with an invalid sqlda which cannot be safely
used later.

Change-Id: I506a17266da798fa6ed46c65f3838bb8fafbe241

diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx 
b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 632962a..f7a3a3c 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -145,9 +145,13 @@ void 
OStatementCommonBase::prepareAndDescribeStatement(const OUString sql,
m_aStatementHandle);
 
 if (aErr)
+{
+free(pOutSqlda);
+pOutSqlda = 0;
 evaluateStatusVector(m_statusVector,
  isc_dsql_allocate_statement,
  *this);
+}
 
 aErr = isc_dsql_prepare(m_statusVector,
 m_pConnection-getTransaction(),
@@ -158,9 +162,14 @@ void 
OStatementCommonBase::prepareAndDescribeStatement(const OUString sql,
 pInSqlda);
 
 if (aErr)
+{
+// TODO: free statement handle?
+free(pOutSqlda);
+pOutSqlda = 0;
 evaluateStatusVector(m_statusVector,
  isc_dsql_prepare,
  *this);
+}
 
 aErr = isc_dsql_describe(m_statusVector,
  m_aStatementHandle,
@@ -169,9 +178,14 @@ void 
OStatementCommonBase::prepareAndDescribeStatement(const OUString sql,
 
 
 if (aErr)
+{
+// TODO: free statement handle, etc.?
+free(pOutSqlda);
+pOutSqlda = 0;
 evaluateStatusVector(m_statusVector,
  isc_dsql_describe,
  *this);
+}
 
 // Ensure we have enough space in pOutSqlda
 if (pOutSqlda-sqld  pOutSqlda-sqln)
commit 23cb9490087776c0d594465d86576853550872f9
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Fri Aug 16 12:12:53 2013 +0100

Add some debug output. (firebird-sdbc)

Change-Id: I72a9992005b42a7a9ef86946bbd3301a711d

diff --git a/connectivity/source/drivers/firebird/Statement.cxx 
b/connectivity/source/drivers/firebird/Statement.cxx
index 5a6d85f..32b6243 100644
--- a/connectivity/source/drivers/firebird/Statement.cxx
+++ b/connectivity/source/drivers/firebird/Statement.cxx
@@ -100,6 +100,8 @@ sal_Int32 SAL_CALL OStatement::executeUpdate(const 
OUString sql)
 MutexGuard aGuard(m_pConnection-getMutex());
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
+SAL_INFO(connectivity.firebird, executeUpdate(  sql  ));
+
 int aErr = isc_dsql_execute_immediate(m_statusVector,
   m_pConnection-getDBHandle(),
   m_pConnection-getTransaction(),
@@ -124,6 +126,8 @@ uno::Reference XResultSet  SAL_CALL 
OStatement::executeQuery(const OUString s
 MutexGuard aGuard(m_pConnection-getMutex());
 checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
 
+SAL_INFO(connectivity.firebird, executeQuery(  sql  ));
+
 ISC_STATUS aErr = 0;
 
 disposeResultSet();
commit 4365e13a0cde6934c07b64c4e9dc1b91e3614958
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Fri Aug 16 12:08:54 2013 +0100

Enable Core SQL Grammar. (firebird-sdbc)

This is needed e.g. to enable primary keys.

Change-Id: I400637550b96d6e0aa880edea9678024f300f616

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index 664144e..6aac8e7 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -292,6 +292,18 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::storesUpperCaseIdentifiers()
 }
 
 //  SQL Feature Support ---
+sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar()
+throw(SQLException, RuntimeException)
+{
+return sal_True;
+}
+
+sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar()
+throw(SQLException, RuntimeException)
+{
+return sal_True;
+}
+
 sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn()
 throw(SQLException, RuntimeException)
 {
@@ -705,16 +717,6 @@ sal_Bool SAL_CALL 
ODatabaseMetaData::supportsExtendedSQLGrammar(  ) throw(SQLExc
 return sal_False;
 }
 //

[Libreoffice-commits] core.git: sw/inc sw/source

2013-08-16 Thread Matteo Casalin

 sw/inc/section.hxx |2 +
 sw/source/core/docnode/section.cxx |   35 +++--
 sw/source/ui/dialog/uiregionsw.cxx |   39 +
 3 files changed, 45 insertions(+), 31 deletions(-)

New commits:
commit 714b30109d0f145d669aebdf08ded251c7f78d52
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Thu Aug 15 20:10:00 2013 +0200

String to OUString and use helper function

Change-Id: I4c554eb5bf8f15eece755453398d1f1bce24b98b
Reviewed-on: https://gerrit.libreoffice.org/5442
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index db6ce8a..0aea68b 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -142,6 +142,8 @@ public:
 
 bool IsConnectFlag() const  { return m_bConnectFlag; }
 void SetConnectFlag(bool const bFlag = true){ m_bConnectFlag = bFlag; }
+
+static OUString CollapseWhiteSpaces(const OUString sName);
 };
 
 class SW_DLLPUBLIC SwSection
diff --git a/sw/source/core/docnode/section.cxx 
b/sw/source/core/docnode/section.cxx
index 6f607e7..bc22f90 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -180,6 +180,23 @@ bool SwSectionData::operator==(SwSectionData const 
rOther) const
 // FIXME: old code ignored m_bCondHiddenFlag m_bHiddenFlag m_bConnectFlag
 }
 
+OUString SwSectionData::CollapseWhiteSpaces(const OUString sName)
+{
+const sal_Int32 nLen = sName.getLength();
+const sal_Unicode cRef = ' ';
+OUStringBuffer aBuf(nLen+1);
+for (sal_Int32 i = 0; inLen; )
+{
+const sal_Unicode cCur = sName[i++];
+aBuf.append(cCur);
+if (cCur!=cRef)
+continue;
+while (inLen  sName[i]==cRef)
+++i;
+}
+return aBuf.makeStringAndClear();
+}
+
 // SwSection ===
 
 SwSection::SwSection(
@@ -1512,11 +1529,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
 SwIntrnlSectRefLink *const pLnk =
 static_castSwIntrnlSectRefLink*( m_RefLink);
 
-String sCmd( m_Data.GetLinkFileName() );
-xub_StrLen nPos;
-while( STRING_NOTFOUND != (nPos = sCmd.SearchAscii()) )
-sCmd.Erase( nPos, 1 );
-
+const OUString 
sCmd(SwSectionData::CollapseWhiteSpaces(m_Data.GetLinkFileName()));
 pLnk-SetUpdateMode( nUpdateType );
 pLnk-SetVisible( pFmt-GetDoc()-IsVisibleLinks() );
 
@@ -1529,13 +1542,15 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
 case FILE_LINK_SECTION:
 {
 pLnk-SetContentType( FORMAT_FILE );
-String sFltr( sCmd.GetToken( 1, sfx2::cTokenSeparator ) );
-String sRange( sCmd.GetToken( 2, sfx2::cTokenSeparator ) );
+sal_Int32 nIndex = 0;
+const OUString sFile(sCmd.getToken( 0, sfx2::cTokenSeparator, 
nIndex ));
+const OUString sFltr(sCmd.getToken( 0, sfx2::cTokenSeparator, 
nIndex ));
+const OUString sRange(sCmd.getToken( 0, sfx2::cTokenSeparator, 
nIndex ));
 pFmt-GetDoc()-GetLinkManager().InsertFileLink( *pLnk,
 static_castsal_uInt16(m_Data.GetType()),
-sCmd.GetToken( 0, sfx2::cTokenSeparator ),
-( sFltr.Len() ? sFltr : 0 ),
-( sRange.Len() ? sRange : 0 ) );
+sFile,
+( !sFltr.isEmpty() ? sFltr : 0 ),
+( !sRange.isEmpty() ? sRange : 0 ) );
 }
 break;
 default:
diff --git a/sw/source/ui/dialog/uiregionsw.cxx 
b/sw/source/ui/dialog/uiregionsw.cxx
index 6f90f31..b3a3b4d 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1168,13 +1168,13 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit )
 m_pSubRegionED-Clear();
 if (m_pDDECB-IsChecked())
 {
-String sLink( pEdit-GetText() );
-sal_uInt16 nPos = 0;
-while( STRING_NOTFOUND != (nPos = sLink.SearchAscii(   , nPos )) 
)
-sLink.Erase( nPos--, 1 );
-
-nPos = sLink.SearchAndReplace( ' ', sfx2::cTokenSeparator );
-sLink.SearchAndReplace( ' ', sfx2::cTokenSeparator, nPos );
+OUString sLink( 
SwSectionData::CollapseWhiteSpaces(pEdit-GetText()) );
+sal_Int32 nPos = 0;
+sLink = sLink.replaceFirst(  , OUString(sfx2::cTokenSeparator), 
nPos );
+if (nPos=0)
+{
+sLink = sLink.replaceFirst(  , 
OUString(sfx2::cTokenSeparator), nPos );
+}
 
 pSectRepr-GetSectionData().SetLinkFileName( sLink );
 pSectRepr-GetSectionData().SetType( DDE_LINK_SECTION );
@@ -1635,17 +1635,16 @@ sal_Bool SwInsertSectionTabPage::FillItemSet( 
SfxItemSet )

[Libreoffice-commits] core.git: 2 commits - include/svl svl/source

2013-08-16 Thread Michael Stahl

 include/svl/itempool.hxx  |   16 
 svl/source/items/itempool.cxx |   55 ++
 2 files changed, 56 insertions(+), 15 deletions(-)

New commits:
commit 7e7a83b73dad2a9a2c73826f61a81c4c774d2c9d
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 16 22:15:49 2013 +0200

SfxItemPool: detect duplicate SlotId mappings

... to prevent problems like fdo#66827.

Sadly the EditEngineItemPool has loads of duplicate slotids already...

Change-Id: I737d71519ce4af06c81f7ecf183cfa6c367026db

diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index b50bcb2..6eddcba 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -213,8 +213,7 @@ public:
 boolIsItemFlag( sal_uInt16 nWhich, sal_uInt16 
nFlag ) const;
 boolIsItemFlag( const SfxPoolItem rItem, 
sal_uInt16 nFlag ) const
 { return IsItemFlag( rItem.Which(), nFlag 
); }
-voidSetItemInfos( const SfxItemInfo *pInfos )
-{ pItemInfos = pInfos; }
+voidSetItemInfos( const SfxItemInfo *pInfos );
 sal_uInt16  GetWhich( sal_uInt16 nSlot, sal_Bool bDeep 
= sal_True ) const;
 sal_uInt16  GetSlotId( sal_uInt16 nWhich, sal_Bool 
bDeep = sal_True ) const;
 sal_uInt16  GetTrueWhich( sal_uInt16 nSlot, sal_Bool 
bDeep = sal_True ) const;
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 50e47cb..83e2e12 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -28,6 +28,53 @@
 #include poolio.hxx
 
 
+#if OSL_DEBUG_LEVEL  0
+#include map
+
+static void
+lcl_CheckSlots2(std::mapsal_uInt16, sal_uInt16  rSlotMap,
+SfxItemPool const rPool, SfxItemInfo const* pInfos)
+{
+if (!pInfos)
+return; // may not be initialized yet
+if (rPool.GetName() == EditEngineItemPool)
+return; // HACK: this one has loads of duplicates already, ignore it :(
+sal_uInt16 const nFirst(rPool.GetFirstWhich());
+sal_uInt16 const nCount(rPool.GetLastWhich() - rPool.GetFirstWhich() + 1);
+for (sal_uInt16 n = 0; n  nCount; ++n)
+{
+sal_uInt16 const nSlotId(pInfos[n]._nSID);
+if (nSlotId != 0
+ nSlotId != 10883  // preexisting duplicate SID_ATTR_GRAF_CROP
+ nSlotId != 10024) // preexisting duplicate SID_ATTR_BORDER_OUTER
+{   // check for duplicate slot-id mapping
+std::mapsal_uInt16, sal_uInt16::const_iterator const iter(
+rSlotMap.find(nSlotId));
+sal_uInt16 const nWhich(nFirst + n);
+if (iter != rSlotMap.end())
+{
+SAL_WARN(svl, SfxItemPool: duplicate SlotId   nSlotId
+  mapped to   iter-second   and   nWhich);
+assert(false);
+}
+rSlotMap.insert(std::make_pair(nSlotId, nWhich));
+}
+}
+}
+
+#define CHECK_SLOTS() \
+do { \
+std::mapsal_uInt16, sal_uInt16 slotmap; \
+for (SfxItemPool * p = pImp-mpMaster; p; p = p-pImp-mpSecondary) \
+{ \
+lcl_CheckSlots2(slotmap, *p, p-pItemInfos); \
+} \
+} while (false)
+
+#else
+#define CHECK_SLOTS() do {} while (false)
+#endif
+
 
 void SfxItemPool::AddSfxItemPoolUser(SfxItemPoolUser rNewUser)
 {
@@ -433,6 +480,14 @@ void SfxItemPool::SetSecondaryPool( SfxItemPool *pPool )
 
 // neuen Secondary-Pool merken
 pImp-mpSecondary = pPool;
+
+CHECK_SLOTS();
+}
+
+void SfxItemPool::SetItemInfos(SfxItemInfo const*const pInfos)
+{
+pItemInfos = pInfos;
+CHECK_SLOTS();
 }
 
 // ---
commit 253df56952654a571abc76c5ced8af0e2ad72698
Author: Michael Stahl mst...@redhat.com
Date:   Fri Aug 16 21:46:58 2013 +0200

svl: remove unused SFX_ITEM_USERFLAG[0-B]

Change-Id: Iffc767630a8d30bd684fd03ece66cee5cd38a022

diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 80c1faf..b50bcb2 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -41,19 +41,6 @@ DBG_NAMEEX(SfxItemPool)
 #define SFX_ITEM_POOLABLE   0x0001
 #define SFX_ITEM_NOT_POOLABLE   0x0002
 
-#define SFX_ITEM_USERFLAG0  0x0100
-#define SFX_ITEM_USERFLAG1  0x0200
-#define SFX_ITEM_USERFLAG2  0x0400
-#define SFX_ITEM_USERFLAG3  0x0800
-#define SFX_ITEM_USERFLAG4  0x1000
-#define SFX_ITEM_USERFLAG5  0x2000
-#define SFX_ITEM_USERFLAG6  0x4000
-#define SFX_ITEM_USERFLAG7  0x8000
-#define SFX_ITEM_USERFLAG8  0x0010
-#define SFX_ITEM_USERFLAG9  0x0020
-#define SFX_ITEM_USERFLAGA  0x0040
-#define SFX_ITEM_USERFLAGB  0x0080
-
 //
 
 struct

[Libreoffice-commits] core.git: 3 commits - sc/source sd/source

2013-08-16 Thread Tor Lillqvist

 sc/source/ui/view/editsh.cxx|   12 +++-
 sd/source/ui/remotecontrol/WINNetworkService.cxx|7 ++-
 sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c |   11 ---
 3 files changed, 21 insertions(+), 9 deletions(-)

New commits:
commit 4a01706377c6e1e7528f0536e4edf60d4cff5504
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Aug 16 23:46:27 2013 +0300

WaE: C4204: nonstandard extension used : non-constant aggregate initializer

Change-Id: I5f34209ad4ea5b97e12cb7073fcf1cf2264ebcf3

diff --git a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c 
b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
index fb4ae95..5dcc196 100755
--- a/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
+++ b/sd/source/ui/remotecontrol/mDNSResponder/dnssd_clientstub.c
@@ -1492,7 +1492,9 @@ DNSServiceErrorType DNSSD_API DNSServiceRegister
 size_t len;
 ipc_msg_hdr *hdr;
 DNSServiceErrorType err;
-union { uint16_t s; u_char b[2]; } port = { PortInNetworkByteOrder };
+union { uint16_t s; u_char b[2]; } port;
+
+port.s = PortInNetworkByteOrder;
 
 if (!name) name = ;
 if (!regtype) return kDNSServiceErr_BadParam;
@@ -1975,12 +1977,15 @@ DNSServiceErrorType DNSSD_API 
DNSServiceNATPortMappingCreate
 char *ptr;
 size_t len;
 ipc_msg_hdr *hdr;
-union { uint16_t s; u_char b[2]; } internalPort = { 
internalPortInNetworkByteOrder };
-union { uint16_t s; u_char b[2]; } externalPort = { 
externalPortInNetworkByteOrder };
+union { uint16_t s; u_char b[2]; } internalPort;
+union { uint16_t s; u_char b[2]; } externalPort;
 
 DNSServiceErrorType err = ConnectToServer(sdRef, flags, 
port_mapping_request, handle_port_mapping_response, callBack, context);
 if (err) return err;// On error ConnectToServer leaves *sdRef set to 
NULL
 
+internalPort.s = internalPortInNetworkByteOrder;
+externalPort.s = externalPortInNetworkByteOrder;
+
 len = sizeof(flags);
 len += sizeof(interfaceIndex);
 len += sizeof(protocol);
commit ddba5a4360e88ac4f6f848ac74ab1f350b9b7d5f
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Aug 16 23:42:22 2013 +0300

SAL_INFO is not available here

Change-Id: Ic40cb29d9ade32690903bfa0f3993782711cc53f

diff --git a/sd/source/ui/remotecontrol/WINNetworkService.cxx 
b/sd/source/ui/remotecontrol/WINNetworkService.cxx
index 6e35f05..144b33a 100755
--- a/sd/source/ui/remotecontrol/WINNetworkService.cxx
+++ b/sd/source/ui/remotecontrol/WINNetworkService.cxx
@@ -7,13 +7,10 @@ void sd::WINNetworkService::setup()
 {
 DNSServiceErrorType err = DNSServiceRegister(client, 0, 0, NULL, 
kREG_TYPE, local, NULL, 1599, 1, , NULL, this );
 
-if ( err == 0 ) {
-SAL_INFO(sd, Windows bonjour service setup);
-} // Fail silently otherwise
+// Fail silently
 }
 
 void sd::WINNetworkService::clear()
 {
 DNSServiceRefDeallocate(client);
-SAL_INFO(sd, Windows mDNSResponder removed);
-}
\ No newline at end of file
+}
commit a0161828b8ea4d68fb34f02656b9a4f8604129ab
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Aug 16 22:17:44 2013 +0300

WaE: C4305: 'argument' : truncation from 'int' to 'const bool'

Change-Id: I92729c7272e87c2aede6cd5134c84d17b466e57f

diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 76a9529..a4b45a9 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -670,7 +670,17 @@ void ScEditShell::GetState( SfxItemSet rSet )
 if ( pActiveView )
 rSet.Put( SfxBoolItem( nWhich, 
pActiveView-IsInsertMode() ) );
 else
-rSet.Put( SfxBoolItem( nWhich, 42 ) );
+{
+// Here the code used to pass the value 42 and it used
+// to work without warnings because the SfxBoolItem
+// was based on 'sal_Bool', which is actually 'unsigned
+// char'. But now it uses actual 'bool', and passing 42
+// for a 'bool' parameter causes a warning at least 
with
+// MSVC.  So use 'true'. I really really hope there is
+// not code somewhere that retrieves this boolean 
item
+// and checks it value for the magic value 42...
+rSet.Put( SfxBoolItem( nWhich,  true) );
+}
 }
 break;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx

2013-08-16 Thread Michael Stahl

 include/svx/svxids.hrc |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 405951c23c6429d166c45a8dda289db813483000
Author: Michael Stahl mst...@redhat.com
Date:   Sat Aug 17 00:52:59 2013 +0200

adjust SID_SVX_FIRSTFREE to f694f14ab64f48e40365fd877e201a0382297368

Change-Id: Ieb194b11b96e96f8b2fbbb8b7916acb6a116f368

diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index bace052..c6fb25f 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -959,7 +959,7 @@
 
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE   (FN_SVX_SET_BULLET + 1)
+#define SID_SVX_FIRSTFREE   
(SID_SW_ATTR_FILL_GRADIENT + 1)
 
 // --
 // Overflow check for slot IDs
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source include/svx sw/source

2013-08-16 Thread Miklos Vajna

 cui/source/tabpages/backgrnd.cxx |   14 +++---
 include/svx/svxids.hrc   |2 ++
 sw/source/core/bastyp/init.cxx   |4 ++--
 sw/source/ui/frmdlg/frmdlg.cxx   |4 ++--
 4 files changed, 13 insertions(+), 11 deletions(-)

New commits:
commit 823cab696bdaa059e5d1243a636e7d975b2110cc
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Aug 16 21:03:18 2013 +0200

fdo#66827 sw: rename SID_ATTR_FILL_GRADIENT to SID_SW_ATTR_FILL_GRADIENT

Change-Id: Ieff7fc6a5b718e11de7d1e4ec2087d64a8a13cae
(cherry picked from commit f694f14ab64f48e40365fd877e201a0382297368)
Signed-off-by: Michael Stahl mst...@redhat.com

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index a8ce0a7..bf6174a 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -806,16 +806,16 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet 
rCoreSet )
 else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( 
nWhich, sal_False ) )
 rCoreSet.ClearItem( nWhich );
 // Handle XFILL_GRADIENT - XFILL_SOLID
-XFillStyleItem aFillStyleItem(XFILL_SOLID, 
GetWhich(SID_ATTR_FILL_STYLE));
+XFillStyleItem aFillStyleItem(XFILL_SOLID, 
GetWhich(SID_SW_ATTR_FILL_STYLE));
 rCoreSet.Put(aFillStyleItem);
 }
 else
 {
-XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_ATTR_FILL_STYLE));
+XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_SW_ATTR_FILL_STYLE));
 rCoreSet.Put(aFillStyleItem);
 
 const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)m_rXFillSet.Get(XATTR_FILLGRADIENT);
-XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_ATTR_FILL_GRADIENT));
+XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_SW_ATTR_FILL_GRADIENT));
 rCoreSet.Put(aFillGradientItem);
 }
 }
@@ -870,11 +870,11 @@ sal_Bool SvxBackgroundTabPage::FillItemSet( SfxItemSet 
rCoreSet )
 if (bIsGradient)
 {
 // Handle XFILL_BITMAP - XFILL_GRADIENT
-XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_ATTR_FILL_STYLE));
+XFillStyleItem aFillStyleItem(((const 
XFillStyleItem)m_rXFillSet.Get(XATTR_FILLSTYLE)).GetValue(), 
GetWhich(SID_SW_ATTR_FILL_STYLE));
 rCoreSet.Put(aFillStyleItem);
 
 const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)m_rXFillSet.Get(XATTR_FILLGRADIENT);
-XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_ATTR_FILL_GRADIENT));
+XFillGradientItem 
aFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue(), GetWhich(SID_SW_ATTR_FILL_GRADIENT));
 rCoreSet.Put(aFillGradientItem);
 }
 }
@@ -1936,9 +1936,9 @@ void SvxBackgroundTabPage::PageCreated (SfxAllItemSet 
aSet)
 // If we get a gradient list, also read fill and gradient style.
 m_pGradientList = pGradientListItem-GetGradientList();
 m_pLbGradients-Fill(m_pGradientList);
-const XFillStyleItem rFillStyleItem = (const 
XFillStyleItem)aSet.Get(SID_ATTR_FILL_STYLE);
+const XFillStyleItem rFillStyleItem = (const 
XFillStyleItem)aSet.Get(SID_SW_ATTR_FILL_STYLE);
 m_rXFillSet.Put(XFillStyleItem(rFillStyleItem.GetValue()));
-const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)aSet.Get(SID_ATTR_FILL_GRADIENT);
+const XFillGradientItem rFillGradientItem = (const 
XFillGradientItem)aSet.Get(SID_SW_ATTR_FILL_GRADIENT);
 m_rXFillSet.Put(XFillGradientItem(rFillGradientItem.GetName(), 
rFillGradientItem.GetGradientValue()));
 }
 else
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6f91c28..5c2412b 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -955,6 +955,8 @@
 
 #define FN_SVX_SET_NUMBER   (SID_SVX_START+1136)
 #define FN_SVX_SET_BULLET   (SID_SVX_START+1137)
+#define SID_SW_ATTR_FILL_STYLE  (SID_SVX_START+1138)
+#define SID_SW_ATTR_FILL_GRADIENT   (SID_SVX_START+1139)
 
 
 // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index

[Libreoffice-commits] core.git: 2 commits - sc/source

2013-08-16 Thread Takeshi Abe

 sc/source/core/tool/consoli.cxx  |   22 +--
 sc/source/core/tool/interpr1.cxx |2 -
 sc/source/ui/app/rfindlst.cxx|2 -
 sc/source/ui/navipi/content.cxx  |   28 +++
 sc/source/ui/unoobj/styleuno.cxx |   30 
 sc/source/ui/view/output.cxx |   72 +++
 6 files changed, 78 insertions(+), 78 deletions(-)

New commits:
commit 92eaf78fd4485037f8721cba04affc947dd92a71
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Sat Aug 17 08:03:41 2013 +0900

sal_Bool to bool

Change-Id: I85995bc3e1fc3c1f01b4d9bded3707ea0b296fa9

diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx
index 137f5f3..8630a01 100644
--- a/sc/source/core/tool/consoli.cxx
+++ b/sc/source/core/tool/consoli.cxx
@@ -267,10 +267,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB 
nTab,
 aTitle = pSrcDoc-GetString(nCol, nRow1, nTab);
 if (aTitle.Len())
 {
-sal_Bool bFound = false;
+bool bFound = false;
 for (SCSIZE i=0; inColCount  !bFound; i++)
 if ( *ppColHeaders[i] == aTitle )
-bFound = sal_True;
+bFound = true;
 if (!bFound)
 lcl_AddString( ppColHeaders, nColCount, aTitle );
 }
@@ -284,10 +284,10 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB 
nTab,
 aTitle = pSrcDoc-GetString(nCol1, nRow, nTab);
 if (aTitle.Len())
 {
-sal_Bool bFound = false;
+bool bFound = false;
 for (SCSIZE i=0; inRowCount  !bFound; i++)
 if ( *ppRowHeaders[i] == aTitle )
-bFound = sal_True;
+bFound = true;
 if (!bFound)
 lcl_AddString( ppRowHeaders, nRowCount, aTitle );
 }
@@ -539,12 +539,12 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
 SCCOL nPos = SC_CONS_NOTFOUND;
 if (aTitle.Len())
 {
-sal_Bool bFound = false;
+bool bFound = false;
 for (SCSIZE i=0; inColCount  !bFound; i++)
 if ( *ppColHeaders[i] == aTitle )
 {
 nPos = static_castSCCOL(i);
-bFound = sal_True;
+bFound = true;
 }
 OSL_ENSURE(bFound, column not found);
 }
@@ -560,12 +560,12 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
 SCROW nPos = SC_CONS_NOTFOUND;
 if (aTitle.Len())
 {
-sal_Bool bFound = false;
+bool bFound = false;
 for (SCSIZE i=0; inRowCount  !bFound; i++)
 if ( *ppRowHeaders[i] == aTitle )
 {
 nPos = static_castSCROW(i);
-bFound = sal_True;
+bFound = true;
 }
 OSL_ENSURE(bFound, row not found);
 }
@@ -577,7 +577,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab,
 
 //  Daten
 
-sal_Bool bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 );
+bool bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 );
 for (nCol=nCol1; nCol=nCol2; nCol++)
 {
 SCCOL nArrX = nCol-nCol1;
@@ -794,7 +794,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, 
SCCOL nCol, SCROW nRow,
 for (SCSIZE nPos=0; nPosnDataCount; nPos++)
 {
 SCSIZE nTPos = ppTitlePos[nArrY][nPos];
-sal_Bool bDo = sal_True;
+bool bDo = true;
 if (nPos+1nDataCount)
 if (ppTitlePos[nArrY][nPos+1] == nTPos)
 bDo = false;   
 // leer
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index a464d77..bf275d1 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -348,7 +348,7 @@ void ScContentTree::MouseButtonDown( const MouseEvent 
rMEvt )
 
 void ScContentTree::KeyInput( const KeyEvent rKEvt )
 {
-sal_Bool bUsed = false;
+bool bUsed = false;
 
 const KeyCode aCode = rKEvt.GetKeyCode();
 if (aCode.GetCode() == KEY_RETURN)
@@ -357,7 +357,7 @@ void ScContentTree::KeyInput( const KeyEvent rKEvt )
 {
 case KEY_MOD1:
 ToggleRoot();   // toggle root mode (as in Writer)
-bUsed = sal_True;
+bUsed = true;
 break;
 case 0:
 {
@@ -379,7 +379,7 @@ void ScContentTree::KeyInput( const KeyEvent rKEvt )
 ContentDoubleClickHdl(0);  // select content as if

[Libreoffice-commits] core.git: sw/inc sw/source

2013-08-16 Thread Matteo Casalin

 sw/inc/pagedesc.hxx|   21 ++---
 sw/source/core/layout/pagedesc.cxx |4 ++--
 sw/source/core/unocore/unoobj.cxx  |5 ++---
 3 files changed, 14 insertions(+), 16 deletions(-)

New commits:
commit 077c80b9d2ed863d881627a1e14ae5b6f84277b8
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sat Aug 17 01:16:25 2013 +0200

String to OUString

Change-Id: Idaf974536036d40d60a43b32a7104e2ead075b48
Reviewed-on: https://gerrit.libreoffice.org/5466
Reviewed-by: Matteo Casalin matteo.casa...@yahoo.com
Tested-by: Matteo Casalin matteo.casa...@yahoo.com

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 45ca5df..a132378 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -16,12 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _PAGEDESC_HXX
-#define _PAGEDESC_HXX
+#ifndef PAGEDESC_HXX
+#define PAGEDESC_HXX
 
 #include tools/fract.hxx
 #include tools/color.hxx
-#include tools/string.hxx
 #include swdllapi.h
 #include swtypes.hxx  /// For SwTwips.
 #include frmfmt.hxx
@@ -132,7 +131,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
 {
 friend class SwDoc;
 
-String  aDescName;
+OUStringaDescName;
 SvxNumberType   aNumType;
 SwFrmFmtaMaster;
 SwFrmFmtaLeft;
@@ -154,14 +153,14 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
 
 SW_DLLPRIVATE void ResetAllAttr( sal_Bool bLeft );
 
-SW_DLLPRIVATE SwPageDesc(const String, SwFrmFmt*, SwDoc *pDc );
+SW_DLLPRIVATE SwPageDesc(const OUString, SwFrmFmt*, SwDoc *pDc );
 
 protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue 
);
 
 public:
-const String GetName() const { return aDescName; }
-  voidSetName( const String rNewName ) { aDescName = rNewName; }
+OUString GetName() const { return aDescName; }
+void SetName( const OUString rNewName ) { aDescName = rNewName; }
 
 sal_Bool GetLandscape() const { return bLandscape; }
 void SetLandscape( sal_Bool bNew ) { bLandscape = bNew; }
@@ -316,7 +315,7 @@ class SwPageDescExt
 {
 SwPageDesc aPageDesc;
 SwDoc * pDoc;
-String sFollow;
+OUString sFollow;
 
 void SetPageDesc(const SwPageDesc  aPageDesc);
 
@@ -328,14 +327,14 @@ public:
 SwPageDescExt  operator = (const SwPageDescExt  rSrc);
 SwPageDescExt  operator = (const SwPageDesc  rSrc);
 
-const String  GetName() const;
+OUString GetName() const;
 
 operator SwPageDesc() const; // #i7983#
 };
 
 
-SwPageDesc* GetPageDescByName_Impl(SwDoc rDoc, const String rName);
+SwPageDesc* GetPageDescByName_Impl(SwDoc rDoc, const OUString rName);
 
-#endif  //_PAGEDESC_HXX
+#endif  //PAGEDESC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/pagedesc.cxx 
b/sw/source/core/layout/pagedesc.cxx
index 33aecbf..79410e7 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
 
 
 
-SwPageDesc::SwPageDesc( const String rName, SwFrmFmt *pFmt, SwDoc *pDc ) :
+SwPageDesc::SwPageDesc( const OUString rName, SwFrmFmt *pFmt, SwDoc *pDc ) :
 SwModify( 0 ),
 aDescName( rName ),
 aMaster( pDc-GetAttrPool(), rName, pFmt ),
@@ -463,7 +463,7 @@ SwPageDescExt::~SwPageDescExt()
 {
 }
 
-const String  SwPageDescExt::GetName() const
+OUString SwPageDescExt::GetName() const
 {
 return aPageDesc.GetName();
 }
diff --git a/sw/source/core/unocore/unoobj.cxx 
b/sw/source/core/unocore/unoobj.cxx
index f898d1c..c049ddd 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -668,7 +668,7 @@ SwUnoCursorHelper::GetCurTxtFmtColl(SwPaM  rPaM, const 
bool bConditional)
 /* --
  *  Hilfsfunktion fuer PageDesc
  * --*/
-SwPageDesc* GetPageDescByName_Impl(SwDoc rDoc, const String rName)
+SwPageDesc* GetPageDescByName_Impl(SwDoc rDoc, const OUString rName)
 {
 SwPageDesc* pRet = 0;
 sal_uInt16 nDCount = rDoc.GetPageDescCnt();
@@ -687,8 +687,7 @@ SwPageDesc* GetPageDescByName_Impl(SwDoc rDoc, const 
String rName)
 {
 for(i = RC_POOLPAGEDESC_BEGIN; i = STR_POOLPAGE_LANDSCAPE; ++i)
 {
-const String aFmtName(SW_RES(i));
-if(aFmtName == rName)
+if (rName==SW_RESSTR(i))
 {
 pRet = rDoc.GetPageDescFromPool( static_cast sal_uInt16 (
 RES_POOLPAGE_BEGIN + i - RC_POOLPAGEDESC_BEGIN) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Performance Issue on Loading Expert Config (a.k.a About Config Utility)

2013-08-16 Thread Efe Gürkan YALAMAN

Hi all,

Expert Config page is now working(unstable) with an edit button as I
mentioned my last GSOC report. So I am currently chasing performance issues
on the page.

I have some questions about it.

Note: I am not good at naming things. I will call the
org.openoffice.Office/ part as toplevel below. :)

So-

Current situation on master:
-We are not traversing all of the settings. There are hardcoded randomly
chosen 3 toplevels which returns about 100-120(don't know how much exactly)
options. [1]
-Giving the root as only toplevel causes about 20 minutes of waiting to
page load.

Did some profiling with a few more toplevels given:
-Page load is too slow because of CuiAboutConfigTabPage::FillItems.[2]
-Figured out ListBox is the main cause of the issue.
-Thorsten sent a patch about this issue to me. It was putting toggles for
setting update mode.[3]
-I put it outside of the method on local. It improved performance. Reduced
the wait time from ~20mins to ~15sec with / as an only toplevel.

So-
Traversing the options doesn't takes too much actually. Main problem is
listbox. You can make try it with clicking on header bar for changing sort
order. It is also causes same waiting time on page load.

What should I do next:
1-Put a checkbox with a warning. Like fontsubs page.
2-Don't list all returned options directly.
3-Something else?


Best,

[1]
http://opengrok.libreoffice.org/xref/core/cui/source/options/optaboutconfig.cxx#117
[2]
http://opengrok.libreoffice.org/xref/core/cui/source/options/optaboutconfig.cxx#159
[3]
http://opengrok.libreoffice.org/xref/core/cui/source/options/optaboutconfig.cxx#165,
http://opengrok.libreoffice.org/xref/core/cui/source/options/optaboutconfig.cxx#279

-- 
Efe Gürkan YALAMAN
http://about.me/efegurkan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 5 commits - include/xmloff xmloff/source

2013-08-16 Thread Kohei Yoshida

 include/xmloff/xmlexppr.hxx  |   14 +--
 xmloff/source/chart/PropertyMaps.cxx |6 -
 xmloff/source/draw/sdpropls.cxx  |2 
 xmloff/source/style/impastp1.cxx |   31 +-
 xmloff/source/style/impastp3.cxx |   36 +++
 xmloff/source/style/impastp4.cxx |  152 +
 xmloff/source/style/impastpl.hxx |   82 -
 xmloff/source/style/xmlaustp.cxx |2 
 xmloff/source/style/xmlexppr.cxx |  161 ---
 9 files changed, 210 insertions(+), 276 deletions(-)

New commits:
commit defbcb229a08f0a147cfdc2c8476684694ad184f
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Aug 16 20:21:19 2013 -0400

Using ptr_vector for this simplifes it a bit...

Change-Id: Id772a260475de7e9c8599616eff189851af6b356

diff --git a/xmloff/source/style/impastp3.cxx b/xmloff/source/style/impastp3.cxx
index c99fd9e..e9baa3c 100644
--- a/xmloff/source/style/impastp3.cxx
+++ b/xmloff/source/style/impastp3.cxx
@@ -22,14 +22,8 @@
 
 using namespace std;
 
-// Class SvXMLAutoStylePoolParent_Impl
-// dtor class SvXMLAutoStylePoolParent_Impl
-
 SvXMLAutoStylePoolParentP_Impl::~SvXMLAutoStylePoolParentP_Impl()
 {
-for( size_t i = maPropertiesList.size(); i  0;  )
-delete maPropertiesList[ --i ];
-maPropertiesList.clear();
 }
 
 // Adds a array of XMLPropertyState ( vector XMLPropertyState  ) to list
@@ -39,13 +33,11 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( 
XMLFamilyData_Impl rFamilyData, c
 {
 sal_Bool bAdded = sal_False;
 SvXMLAutoStylePoolPropertiesP_Impl *pProperties = 0;
-size_t i = 0;
 sal_Int32 nProperties = rProperties.size();
-size_t nCount = maPropertiesList.size();
-
-for( i = 0; i  nCount; i++ )
+size_t i = 0;
+for (size_t n = maPropertiesList.size(); i  n; ++i)
 {
-SvXMLAutoStylePoolPropertiesP_Impl *pIS = maPropertiesList[ i ];
+SvXMLAutoStylePoolPropertiesP_Impl* pIS = maPropertiesList[i];
 if( nProperties  (sal_Int32)pIS-GetProperties().size() )
 {
 continue;
@@ -64,7 +56,7 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( 
XMLFamilyData_Impl rFamilyData, c
 if( !pProperties )
 {
 pProperties = new SvXMLAutoStylePoolPropertiesP_Impl( rFamilyData, 
rProperties );
-SvXMLAutoStylePoolPropertiesPList_Impl::iterator it = 
maPropertiesList.begin();
+PropertiesListType::iterator it = maPropertiesList.begin();
 ::std::advance( it, i );
 maPropertiesList.insert( it, pProperties );
 bAdded = sal_True;
@@ -84,13 +76,11 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::Add( 
XMLFamilyData_Impl rFamilyData, c
 sal_Bool SvXMLAutoStylePoolParentP_Impl::AddNamed( XMLFamilyData_Impl 
rFamilyData, const vector XMLPropertyState  rProperties, const OUString 
rName )
 {
 sal_Bool bAdded = sal_False;
-size_t i = 0;
 sal_Int32 nProperties = rProperties.size();
-size_t nCount = maPropertiesList.size();
-
-for( i = 0; i  nCount; i++ )
+size_t i = 0;
+for (size_t n = maPropertiesList.size(); i  n; ++i)
 {
-SvXMLAutoStylePoolPropertiesP_Impl *pIS = maPropertiesList[ i ];
+SvXMLAutoStylePoolPropertiesP_Impl* pIS = maPropertiesList[i];
 if( nProperties  (sal_Int32)pIS-GetProperties().size() )
 {
 continue;
@@ -107,7 +97,7 @@ sal_Bool SvXMLAutoStylePoolParentP_Impl::AddNamed( 
XMLFamilyData_Impl rFamilyDa
 new SvXMLAutoStylePoolPropertiesP_Impl( rFamilyData, 
rProperties );
 // ignore the generated name
 pProperties-SetName( rName );
-SvXMLAutoStylePoolPropertiesPList_Impl::iterator it = 
maPropertiesList.begin();
+PropertiesListType::iterator it = maPropertiesList.begin();
 ::std::advance( it, i );
 maPropertiesList.insert( it, pProperties );
 bAdded = sal_True;
@@ -124,10 +114,9 @@ OUString SvXMLAutoStylePoolParentP_Impl::Find( const 
XMLFamilyData_Impl rFamily
 {
 OUString sName;
 vector XMLPropertyState::size_type nItems = rProperties.size();
-size_t nCount = maPropertiesList.size();
-for( size_t i = 0; i  nCount; i++ )
+for (size_t i = 0, n = maPropertiesList.size(); i  n; ++i)
 {
-SvXMLAutoStylePoolPropertiesP_Impl *pIS = maPropertiesList[ i ];
+const SvXMLAutoStylePoolPropertiesP_Impl* pIS = maPropertiesList[i];
 if( nItems  pIS-GetProperties().size() )
 {
 continue;
diff --git a/xmloff/source/style/impastp4.cxx b/xmloff/source/style/impastp4.cxx
index 5f5dffa..3c4aeb1 100644
--- a/xmloff/source/style/impastp4.cxx
+++ b/xmloff/source/style/impastp4.cxx
@@ -292,7 +292,7 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
 for( size_t j = 0; j  nProperties; j++ )
 {
 const SvXMLAutoStylePoolPropertiesP_Impl* pProperties =
-rParent.GetPropertiesList()[ j ];
+rParent.GetPropertiesList()[j];

[PATCH] enable binary package option for a set of 'stable' libraries

2013-08-16 Thread David Ostrovsky (via Code Review)

Hello LibreOffice gerrit bot, Thorsten Behrens,

I'd like you to reexamine a change.  Please visit

https://gerrit.libreoffice.org/4765

to look at the new patch set (#2).

Change subject: enable binary package option for a set of 'stable' libraries
..

enable binary package option for a set of 'stable' libraries

Change-Id: I8924ba22d178aa4d8e500ae3f484af654a37e87e
---
M apache-commons/Module_apache-commons.mk
M apache-commons/UnpackedTarball_apache_commons_httpclient.mk
M apache-commons/UnpackedTarball_apache_commons_lang.mk
M apache-commons/UnpackedTarball_apache_commons_logging.mk
M beanshell/UnpackedTarball_beanshell.mk
M cairo/UnpackedTarball_cairo.mk
M cairo/UnpackedTarball_pixman.mk
M cppunit/UnpackedTarball_cppunit.mk
M curl/UnpackedTarball_curl.mk
M epm/UnpackedTarball_epm.mk
M fontconfig/UnpackedTarball_fontconfig.mk
M freetype/UnpackedTarball_freetype.mk
M harfbuzz/UnpackedTarball_harfbuzz.mk
M hsqldb/UnpackedTarball_hsqldb.mk
M liblangtag/UnpackedTarball_langtag.mk
M libxml2/UnpackedTarball_xml2.mk
M libxmlsec/UnpackedTarball_xmlsec.mk
M openldap/UnpackedTarball_openldap.mk
M openssl/UnpackedTarball_openssl.mk
M poppler/UnpackedTarball_poppler.mk
M postgresql/UnpackedTarball_postgresql.mk
M python3/UnpackedTarball_python3.mk
M redland/UnpackedTarball_raptor.mk
M redland/UnpackedTarball_rasqal.mk
M redland/UnpackedTarball_redland.mk
M rhino/UnpackedTarball_rhino.mk
M tomcat/UnpackedTarball_tomcat.mk
27 files changed, 28 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/4765/2
-- 
To view, visit https://gerrit.libreoffice.org/4765
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I8924ba22d178aa4d8e500ae3f484af654a37e87e
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com
Gerrit-Reviewer: Thorsten Behrens tbehr...@suse.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-qa] Report Builder Bug #68190

2013-08-16 Thread Dan Lewis

 I have just filed this bug about a property for header, Detail, 
and footer sections of the Report Builder. The problem is with the 
*Force New Page* property. This sets the page breaks for a report. For 
LibreOffice 4.1.0.4, the names used in this property do not match where 
the page breaks appear.


What I get are the following results:

None: the page breaks appears after the last control of the section.
Before: the page break appears before and after the section.
After: the page break appears before the section.
Before and after: no page breaks appear.

 It would be nice is some developer could rearrange the order so 
the names match the location of the page breaks.


--Dan
___
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] Report Builder Bug #68190

2013-08-16 Thread Robert Großkopf

Hello Dan,

   I have just filed this bug about a property for header, Detail, 
 and footer sections of the Report Builder. The problem is with the 
 *Force New Page* property. This sets the page breaks for a report. For 
 LibreOffice 4.1.0.4, the names used in this property do not match where 
 the page breaks appear.

This bugreport is a duplicate of
https://bugs.freedesktop.org/show_bug.cgi?id=67109

So I have to close the bug as duplicate.

I have added Lionel to CC of the bug. I hope he could help ...

Regards

Robert
___
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 44887] Enhancement request: Coretext rendering on Mac OS X

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=44887

--- Comment #7 from Tor Lillqvist tlillqv...@suse.com ---
*This* bug report is already resolved, will stay that way as LibreOffice now
does use CoreText. Handyman, please open a detailed new bug specifically for
your fuzziness issue, and please provide a screenshot.

Note that nobody else has mentioned any fuzziness problem in relation to the
CoreText code. The known problems with (CoreText-based) text rendering in some
contexts in LibreOffice, some of which might already be fixed, are all related
to placement of glyphs, that is suboptimal, jumpy when text is edited or
added, or broken, especially for complex text (Arabic etc).

-- 
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 64438] Dockable panels in LibreOffice not dockable using KDE or Unity

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=64438

--- Comment #5 from Jesus Jimenez jesjime...@gmail.com ---
Doesn't work with KDE SC 4.10.5 and LO 4.0.2. Perhaps this bug started in some
KWin version between 4.8 and 4.10?

-- 
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 68172] New: FILEOPEN : cell border shows dashed line than continous line while opening xls

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68172

  Priority: medium
Bug ID: 68172
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FILEOPEN : cell border shows dashed line than
continous line while opening xls
  Severity: normal
Classification: Unclassified
OS: All
  Reporter: ja...@rinac.com
  Hardware: Other
Status: UNCONFIRMED
   Version: 4.1.0.4 release
 Component: Spreadsheet
   Product: LibreOffice

Created attachment 84122
  -- https://bugs.freedesktop.org/attachment.cgi?id=84122action=edit
dashed border in xls than thin line border

cell border shows dashed line than continous line while opening xls. Actually
formatting is continous line around the cell.


Pictures attached. All old files having same issue.


If I change border to contious in Libreoffice  save. Open again contious line
shown in xls file.

-- 
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 68172] FILEOPEN : cell border shows dashed line than continous line while opening xls

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68172

--- Comment #1 from Jaise James ja...@rinac.com ---
Created attachment 84123
  -- https://bugs.freedesktop.org/attachment.cgi?id=84123action=edit
sample picture

-- 
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 51923] Usability issue: Make the list of headings in Target in document window (for links) more like the list in the Navigator

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=51923

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
Summary|Usability issue: Make the   |Usability issue: Make the
   |list of headings in Target |list of headings in Target
   |in document window more|in document window (for
   |like the list in the|links) more like the list
   |Navigator   |in the Navigator
 Ever confirmed|0   |1

--- Comment #5 from Cor Nouws c...@nouenoff.nl ---
should simply be set to new

-- 
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 40084] Access existing bookmarks from outside Navigator - maybe via the dialog InsertBookmark ?

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=40084

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

Summary|Access existing bookmarks   |Access existing bookmarks
   |from outside Navigator  |from outside Navigator -
   ||maybe via the dialog
   ||InsertBookmark ?

-- 
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 68173] New: document gets dim while trying to open and freezes

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68173

  Priority: medium
Bug ID: 68173
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: document gets dim while trying to open and freezes
  Severity: normal
Classification: Unclassified
OS: other
  Reporter: sand...@hotmail.com
  Hardware: Other
Status: UNCONFIRMED
   Version: unspecified
 Component: Libreoffice
   Product: LibreOffice

i am a new user of ubuntu. my son saved a document (with some pictures) for his
school work. it was in fact the first time we had used libreoffice writer. the
document shows 48 kb data. when i try to open the document, after few seconds
the office stops and its screen dims automatically and then the whole screen
freezes with no mouse or keyboard control.

-- 
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 68167] Create an outline view similar to that in MS Word and Apple Pages

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68167

Cor Nouws c...@nouenoff.nl changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
 CC||c...@nouenoff.nl
Version|4.1.0.4 release |3.3.0 release
 Ever confirmed|0   |1

--- Comment #1 from Cor Nouws c...@nouenoff.nl ---
Hi UCLAgeek,

welcome in Bugzilla and thanks for the issue.

Of course the outline view is great - that stands even without your examples.
So I set this issue to New as enhancement. 
Version to 3.3.0: it reflects the oldest version of LibreOffice with the
behaviour that you want to change.

For the rest I find it a pity that - reading from your description - you have
little or maybe no experience with the Navigator yourself. Which if course is
strange as you write this plea for a new function. 
And also a pity for your own work ;) course it is a handy tool that offers more
then the outline view.

Kind regards,
Cor

-- 
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 34411] External and internal HSQLDB must be usable in different versions

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=34411

--- Comment #12 from rob...@familiegrosskopf.de ---
(In reply to comment #8)
 The issue with dual version HSQLDB will be fixed with the release of 2.3.0.
 An alternative jar will be released at the same time as the standard jar.
 This can be used side-by-side with an HSLQDB jar of an earlier version.

Hi Fred,

where do I get this alternative *.jar-file. I have just tested the hsqldb.jar
from 2.3.0 and it works the same as before. Adding it to the classpath will
destroy the version of internal hsqldb of LO.

-- 
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 68174] New: Use large icons by default on OS X

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68174

  Priority: medium
Bug ID: 68174
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: Use large icons by default on OS X
  Severity: enhancement
Classification: Unclassified
OS: Mac OS X (All)
  Reporter: emir_s...@msn.com
  Hardware: Other
Status: UNCONFIRMED
   Version: 4.2.0.0.alpha0+ Master
 Component: UI
   Product: LibreOffice

On OS X, LibreOffice uses small icons by default. However, this does not
provide a pleasant look on OS X, where application icons are generally bigger,
and concentrated on details. 

Comparison screenshots attached.

-- 
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 68174] Use large icons by default on OS X

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68174

Emir Sarı emir_s...@msn.com changed:

   What|Removed |Added

 QA Contact||emir_s...@msn.com
 CC||jore...@libreoffice.org

-- 
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 68174] Use large icons by default on OS X

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68174

--- Comment #1 from Emir Sarı emir_s...@msn.com ---
Created attachment 84124
  -- https://bugs.freedesktop.org/attachment.cgi?id=84124action=edit
Sifr small icons

-- 
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 68174] Use large icons by default on OS X

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68174

--- Comment #2 from Emir Sarı emir_s...@msn.com ---
Created attachment 84125
  -- https://bugs.freedesktop.org/attachment.cgi?id=84125action=edit
Sifr large icons

-- 
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 68174] Use large icons by default on OS X

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68174

--- Comment #3 from Emir Sarı emir_s...@msn.com ---
Created attachment 84126
  -- https://bugs.freedesktop.org/attachment.cgi?id=84126action=edit
Tango small icons

-- 
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 68173] document gets dim while trying to open and freezes

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68173

--- Comment #1 from sand...@hotmail.com ---
The screen comes back to life after few minutes of non-activity.When I tried to
recover the file , after clicking 'finish' , the screen (only the pop-up
window) goes back to black again and comes back to life with a message telling
that its not possible to recover the particular file.

-- 
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 68174] Use large icons by default on OS X

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68174

--- Comment #4 from Emir Sarı emir_s...@msn.com ---
Created attachment 84127
  -- https://bugs.freedesktop.org/attachment.cgi?id=84127action=edit
Tango large icons

-- 
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 68137] ODT Document crash when editing script fields / script editor

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68137

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

  Attachment #84089|text/plain  |application/vnd.oasis.opend
  mime type||ocument.text

--- Comment #4 from Julien Nabet serval2...@yahoo.fr ---
Comment on attachment 84089
  -- https://bugs.freedesktop.org/attachment.cgi?id=84089
File to reproduce the bug

Mimetype fixed

-- 
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 68137] ODT Document crash when editing script fields / script editor

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68137

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 CC||serval2...@yahoo.fr
 Ever confirmed|0   |1

--- Comment #5 from Julien Nabet serval2...@yahoo.fr ---
On pc Debian x86-64 with master sources updated today or with 4.0.3 Debian
testing LO package, each time with a brand new LO profile, I don't reproduce
this.

Stefan: for the test, could you rename your LO directory profile and give it a
new try? (see https://wiki.documentfoundation.org/UserProfile)

-- 
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 53555] SLIDESHOW: LibreOffice Impress crashes (segfault) on View Slide show (F5)

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=53555

tbehr...@suse.com changed:

   What|Removed |Added

 Status|NEEDINFO|NEW

--- Comment #26 from tbehr...@suse.com ---
Looks actually like a duplicate to bug 56583 then - can you try 4.0.5 RC1, that
has it fixed, available here: http://www.libreoffice.org/download/pre-releases/
?

-- 
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 61239] FILESAVE, FORMATTING: Change record mode: paragraph deleted, next paragraph switched to the stylesheet format of the deleted paragraph, when file saved

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=61239

Harald Koester harald.koes...@mail.de changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #2 from Harald Koester harald.koes...@mail.de ---


*** This bug has been marked as a duplicate of bug 54819 ***

-- 
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 54819] EDITING: with track changes the paragraph following a deleted paragraph changes its style

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54819

Harald Koester harald.koes...@mail.de changed:

   What|Removed |Added

 CC||juergen.sa...@web.de

--- Comment #2 from Harald Koester harald.koes...@mail.de ---
*** Bug 61239 has been marked as a duplicate of this bug. ***

-- 
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 54819] EDITING: with track changes the paragraph following a deleted paragraph changes its style

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=54819

Harald Koester harald.koes...@mail.de changed:

   What|Removed |Added

   Hardware|x86-64 (AMD64)  |All
 OS|Linux (All) |All
 CC||harald.koes...@mail.de

--- Comment #3 from Harald Koester harald.koes...@mail.de ---
Reproduced with Version 4.0.1.4. and 3.5.3 on Win7. Hence Platform changed to
All.

-- 
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 67539] 4.1 segfaults when checking for extension updates

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=67539

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

 CC||caol...@redhat.com,
   ||serval2...@yahoo.fr

--- Comment #1 from Julien Nabet serval2...@yahoo.fr ---
Caolán: do you think it could be solved with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=3bb28b5aaef5e85a981dc9411db1f05524aeedf6
(and
http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-1id=b6842e227d979c24b50fe5971d183f58df4788e3
for 4.1)?

-- 
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 67841] LO crashes if Java-dependent extensions, such as Zotero, are installed on 64-bit Kubuntu systems

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=67841

Julien Nabet serval2...@yahoo.fr changed:

   What|Removed |Added

 CC||serval2...@yahoo.fr

--- Comment #4 from Julien Nabet serval2...@yahoo.fr ---
pavel223344: I know it's too late now but next time you'll give it a try, it
could be useful to retrieve a backtrace (see
https://wiki.documentfoundation.org/QA/BugReport/Debug_Information#GNU.2FLinux:_How_to_get_a_backtrace).
Also, if you have machine with another distrib than X/K/Ubuntu, it could be
useful to give it a try. Indeed, it could be an Ubuntu package problem.

-- 
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 67810] SUMIFS, AVERAGEIFS, COUNTIFS functions have wrong description

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=67810

Eike Rathke er...@redhat.com changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Whiteboard||target:4.2.0
 Resolution|--- |FIXED
   Assignee|libreoffice-b...@lists.free |er...@redhat.com
   |desktop.org |

--- Comment #1 from Eike Rathke er...@redhat.com ---
Resolved with
http://cgit.freedesktop.org/libreoffice/core/commit/?id=bae4f0448349e86202977bba8f12f8fed16148cc

-- 
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 68176] New: FILEOPEN: Incorrect import of formula when .ods created with MSO Excel 2007

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68176

  Priority: medium
Bug ID: 68176
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FILEOPEN: Incorrect import of formula when .ods
created with MSO Excel 2007
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: popin...@gmail.com
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.1.0.4 release
 Component: Spreadsheet
   Product: LibreOffice

Created attachment 84130
  -- https://bugs.freedesktop.org/attachment.cgi?id=84130action=edit
Test file created in Excel 2007 based on Kohei's test file, but only 87 rows

Problem description: 
When you open a .ods created with Excel, LibreOffice appends msoxl: before
the formula. A =A1*1.1 thus becomes msoxl:=A1*1.1, which can only be
evaluated as text.

Steps to reproduce:
1. Excel 2007: Create a new worksheet
2. Excel 2007: Enter formulas as per Kohei's shared-formula-memory-test.ods
(see http://kohei.us/2013/08/15/shared-formula-to-reduce-memory-usage/;)
3. Excel 2007: File  Save As  Open Document Spreadsheet
4. LibreOffice 4.1: Open the above document

Current behavior:
Cells contain text that can not be evaluated as formula. Example for row B,
in column order:
msoxl:=A1+1, msoxl:=A2*1.1, msoxl:=B2/100*PI(), msoxl:=SUM(A2:C2)
Expected behavior:
Cells should contain formulas. Example for row B, in column order:
=A1+1, =A2*1.1, =B2/100*PI(), =SUM(A2:C2)
System:
Windows 7 SP1 64-bit [en], MSO Excel 2007 SP3 [sl], LibreOffice 4.1.0.4 Release
[en]

Operating System: Windows 7
Version: 4.1.0.4 release

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 35243] Paste not working, paste special first row is empty

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=35243

--- Comment #8 from sasha.libreoff...@gmail.com ---
Problem with paste special- empty first variant reproducible in 3.5.0 beta 3 
on Windows XP 32 bit (only * there)

Reproduced in 4.0.4 on Windows XP 32 bit (locale of win is Russian) and in LO
tested Russian and Belorussian. In both cases first row is empty as on
screenshot.
Reproduced in 4.0.4 on Fedora RFR 64 bit (Russian locale of LO)

On English locale is not reproducible.

-- 
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 46447] Embedded Pictures disappear from document (presentation, .odp) contents

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=46447

Sebastian Hölz sho...@geomar.de changed:

   What|Removed |Added

Version|3.3.2 release   |4.1.0.4 release

--- Comment #63 from Sebastian Hölz sho...@geomar.de ---
Hi,

I just experienced a similar problem and found a way to fix it.

Problem
===
Win 7, LibreOffice 4.1, Impress, large presentation
(D:/Dokumente/Dokumente/Report_Phase1/report.odp, ~100 slides) with lots of
linked images. Everything worked just fine until this morning. I think the
program just knew that today is my deadline ... when I opened up the file: all
links broken, no images displayed anymore.

I noticed on funny thing: In the missing file frame, the link was pointing to
the some target e.g.:
file:///D:/Dokumente/Dokumente/Report_Phase1/Figures/CSEM/image.png

At a first glance this looked OK, but looking closer I noticed the
Dokumente/Dokumente, which is incorrect. In fact, the true path should have
been something like:
file:///D:/Dokumente/Report_Phase1/Figures/CSEM/image.png

TRACKING DOWN THE PROBLEM
=
I opened a new file (odp) and copied one slide containing a broken image link
from the original presentation to the new test file. On a second slide I used
the dialog (Insert - Picture - from File) to again link to that same image.

I then saved the presentation and re-opened it with the result that the link on
the first page was still broken, but the second link worked just fine. I then
unzipped the odp-file and took a look at the content.xml file. The two links
looked as follows:
../../../../Dokumente/Report_Phase1/Figures/CSEM/image.png (broken link)
../Figures/CSEM/image.png (new working link).

NOTE: the actual paths were much longer, I have shortened them a bit for this
post.

BUG FIX
===
I used find  replace (../../../../Dokumente/Report_Phase1/Figures -
../Figures) to replace the incorrect links in the content.xml file and
re-integrated this file into the unzipped odp-file ... problem solved.

OK, neither do I know, if this bug fully relates to the ones described above
nor do I don't know, why Impress is doing this to us, but at least I found a
way to fix this problem for me.

Hope this is helpful to track down the problem, because this is REALLY
annoying.

Cheers

Sebastian

-- 
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 68179] New: EDITING: Index editing

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68179

  Priority: medium
Bug ID: 68179
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: EDITING: Index editing
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: holzi...@googlemail.com
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.0.4.2 release
 Component: Writer
   Product: LibreOffice

Problem description: 
when editing an index entry it will be deleted.
I'm using the german version, so I have to guess about the english
menue-structure and order-names.

Steps to reproduce:
1. right click on an existing index entry
2. in the context menue chose Indexentry...
3. edit the entry, then click OK, then click close
4. the entry is deleted
5. to proof click Edit and look what the last undo reads
6. btw - undo doesn't work, too for this

Current behavior:
Editing an index entry deletes it

Expected behavior:
The index entry should have the typed contents instead of beeing deleted.

Operating System: Windows 8
Version: 4.0.4.2 release

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 34204] Postscript PRINTING cripples particular DRAW object

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=34204

sasha.libreoff...@gmail.com changed:

   What|Removed |Added

 OS|Windows (All)   |All

--- Comment #19 from sasha.libreoff...@gmail.com ---
Reproduced in 4.1.0 on Fedora RFR 64 bit
Steps to reproduce:
0. Open sample.odt file form first attachment
1. Export it as PDF
2. open produced PDF and see on picture of envelope near top of first page
But if we disable option PDF/A-1a then it exports correctly.
IMHO it is not a bug. But some improvement is still needed.

-- 
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 68176] FILEOPEN: Incorrect import of formula when .ods created with MSO Excel 2007

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68176

Eike Rathke er...@redhat.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #1 from Eike Rathke er...@redhat.com ---
Excel 2007 and 2010 write only ODF 1.0/1.1 ISO/IEC 26300:2006 and write formula
expressions in their own msoxl namespace, syntax and semantics. We do not
support that.

Excel 2013 properly supports ODF 1.2 including the OpenFormula (ODFF)
specification.

-- 
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 68176] FILEOPEN: Incorrect import of formula when .ods created with MSO Excel 2007

2013-08-16 Thread bugzilla-daemon

https://bugs.freedesktop.org/show_bug.cgi?id=68176

Eike Rathke er...@redhat.com changed:

   What|Removed |Added

 Status|RESOLVED|CLOSED

-- 
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

1 2 3 >

1 - 100 of 218 matches

Mail list logo