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

[Matteo Casalin]

 sw/source/ui/uiview/srcview.cxx |   46 +---
 1 file changed, 25 insertions(+), 21 deletions(-)

New commits:
commit a59504bfb06d57ddb0e1f4cfc0022fa68da1
Author: Matteo Casalin 
Date:   Wed Oct 2 08:42:21 2013 +0200

Fix typo in comment

Change-Id: I78b3e37d261d5c82795c40c9eb3de2731b8edd83

diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index f44fc64..cefbd34 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -694,7 +694,7 @@ sal_Int32 SwSrcView::PrintSource(
 if (!pOutDev || nPage <= 0)
 return 0;
 
-//! This logarithm for printing the n-th page is very poor since it
+//! This algorithm for printing the n-th page is very poor since it
 //! needs to go over the text of all previous pages to get to the correct 
one.
 //! But since HTML source code is expected to be just a small number of 
pages
 //! even this poor algorithm should be enough...
commit 31eb55e55103e83025bffacafa7832e4c2575e9a
Author: Matteo Casalin 
Date:   Wed Oct 2 08:41:33 2013 +0200

Do print empty lines or beyond end of text

Change-Id: I706faba95ca6b3034b2293f3dcc15b9f124014be

diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index f93cb1b..f44fc64 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -721,7 +721,8 @@ sal_Int32 SwSrcView::PrintSource(
 
 // nLinepPage is not true, if lines have to be wrapped...
 sal_uInt16 nLinespPage = (sal_uInt16) (aPaperSz.Height() / nLineHeight);
-sal_uInt16 nCharspLine = (sal_uInt16) (aPaperSz.Width()  / 
pOutDev->GetTextWidth(OUString('X')));
+const sal_Int32 nCharspLine =
+static_cast(aPaperSz.Width() / pOutDev->GetTextWidth("X"));
 sal_uInt16 nParas = static_cast< sal_uInt16 >( 
pTextEngine->GetParagraphCount() );
 
 sal_uInt16 nPages = (sal_uInt16) (nParas / nLinespPage + 1 );
@@ -735,7 +736,8 @@ sal_Int32 SwSrcView::PrintSource(
 for ( sal_uInt16 nPara = 0; nPara < nParas; ++nPara )
 {
 const OUString aLine( lcl_ConvertTabsToSpaces(pTextEngine->GetText( 
nPara )) );
-sal_Int32 nLines = aLine.getLength() / nCharspLine + 1;
+const sal_Int32 nLineLen = aLine.getLength();
+const sal_Int32 nLines = (nLineLen+nCharspLine-1) / nCharspLine;
 for ( sal_Int32 nLine = 0; nLine < nLines; ++nLine )
 {
 aPos.Y() += nLineHeight;
@@ -747,7 +749,11 @@ sal_Int32 SwSrcView::PrintSource(
 aPos = aStartPos;
 }
 if (!bCalcNumPagesOnly && nPage == nCurPage)
-pOutDev->DrawText( aPos, aLine.copy(nLine * nCharspLine, 
nCharspLine) );
+{
+const sal_Int32 nStart = nLine * nCharspLine;
+const sal_Int32 nLen = std::min(nLineLen-nStart, nCharspLine);
+pOutDev->DrawText( aPos, aLine.copy(nStart, nLen) );
+}
 }
 aPos.Y() += nParaSpace;
 }
commit 06941b060bab0b5941b619441ecf767c6a0ab23d
Author: Matteo Casalin 
Date:   Wed Oct 2 02:09:36 2013 +0200

String to OUString

Change-Id: I03949be73025d8b58ee35648d95e76b3ac1df2b8

diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx
index 02762d5..f93cb1b 100644
--- a/sw/source/ui/uiview/srcview.cxx
+++ b/sw/source/ui/uiview/srcview.cxx
@@ -192,26 +192,26 @@ static rtl_TextEncoding 
lcl_GetStreamCharSet(rtl_TextEncoding eLoadEncoding)
 return eRet;
 }
 
-static void lcl_ConvertTabsToSpaces( String& rLine )
+static OUString lcl_ConvertTabsToSpaces( OUString sLine )
 {
-if ( rLine.Len() )
+if (!sLine.isEmpty())
 {
-sal_uInt16 nPos = 0;
-sal_uInt16 nMax = rLine.Len();
-while ( nPos < nMax )
+const sal_Unicode aPadSpaces[4] = {' ', ' ', ' ', ' '};
+sal_Int32 nPos = 0;
+for (;;)
 {
-if ( rLine.GetChar(nPos) == '\t' )
+nPos = sLine.indexOf('\t', nPos);
+if (nPos<0)
 {
-// Not 4 blanks, but on 4th TabPos:
-OUStringBuffer aBlanker;
-comphelper::string::padToLength(aBlanker, ( 4 - ( nPos % 4 ) 
), ' ');
-rLine.Erase( nPos, 1 );
-rLine.Insert(aBlanker.makeStringAndClear(), nPos);
-nMax = rLine.Len();
+break;
 }
-nPos++; // Not optimally, if tab, but not wrong...
+// Not 4 blanks, but on 4th TabPos:
+const sal_Int32 nPadLen = 4 - (nPos % 4);
+sLine.replaceAt(nPos, 1, OUString(aPadSpaces, nPadLen));
+nPos += nPadLen;
 }
 }
+return sLine;
 }
 
 SwSrcView::SwSrcView(SfxViewFrame* pViewFrame, SfxViewShell*) :
@@ -734,12 +734,10 @@ sal_Int32 SwSrcView::PrintSource(
 Point aPos( aStartPos );
 for ( sal_uInt16 nPara = 0; nPara < nParas; ++nPara )
 {
-String aLine( pText

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-shared-string' - 2 commits - editeng/source include/editeng include/svl sc/inc sc/source svl/Library_svl.mk svl/source

[Kohei Yoshida]

 editeng/source/editeng/editobj.cxx   |   21 +
 editeng/source/editeng/editobj2.hxx  |   10 ++
 include/editeng/editobj.hxx  |   13 +
 include/svl/stringpool.hxx   |   34 ++
 sc/inc/formulagroup.hxx  |7 +++
 sc/source/core/data/column2.cxx  |8 
 sc/source/core/tool/formulagroup.cxx |   17 -
 svl/Library_svl.mk   |1 +
 svl/source/misc/stringpool.cxx   |   35 +++
 9 files changed, 121 insertions(+), 25 deletions(-)

New commits:
commit 19f7989c1689b009d1cd15e88d2b5386ee23165c
Author: Kohei Yoshida 
Date:   Tue Oct 1 21:51:50 2013 -0400

Add method to normalize strings in EditTextObject.

Change-Id: I1adb57279db0afeb8387599ec11984380e5a2e4a

diff --git a/editeng/source/editeng/editobj.cxx 
b/editeng/source/editeng/editobj.cxx
index 8e35a57..aaf5e5f 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -44,6 +44,7 @@
 
 #include 
 #include 
+#include "svl/stringpool.hxx"
 #include 
 #include 
 
@@ -148,6 +149,11 @@ ContentInfo::~ContentInfo()
 aAttribs.clear();
 }
 
+void ContentInfo::NormalizeString( svl::StringPool& rPool )
+{
+aText = OUString(rPool.intern(aText));
+}
+
 const WrongList* ContentInfo::GetWrongList() const
 {
 return mpWrongs.get();
@@ -316,6 +322,11 @@ editeng::FieldUpdater EditTextObject::GetFieldUpdater()
 return mpImpl->GetFieldUpdater();
 }
 
+void EditTextObject::NormalizeString( svl::StringPool& rPool )
+{
+mpImpl->NormalizeString(rPool);
+}
+
 const SfxItemPool* EditTextObject::GetPool() const
 {
 return mpImpl->GetPool();
@@ -602,6 +613,16 @@ void EditTextObjectImpl::SetUserType( sal_uInt16 n )
 nUserType = n;
 }
 
+void EditTextObjectImpl::NormalizeString( svl::StringPool& rPool )
+{
+ContentInfosType::iterator it = aContents.begin(), itEnd = aContents.end();
+for (; it != itEnd; ++it)
+{
+ContentInfo& rInfo = *it;
+rInfo.NormalizeString(rPool);
+}
+}
+
 bool EditTextObjectImpl::IsVertical() const
 {
 return bVertical;
diff --git a/editeng/source/editeng/editobj2.hxx 
b/editeng/source/editeng/editobj2.hxx
index b704e48..c331134 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -35,6 +35,12 @@ struct Section;
 
 }
 
+namespace svl {
+
+class StringPool;
+
+}
+
 class XEditAttribute
 {
 private:
@@ -136,6 +142,8 @@ private:
 public:
 ~ContentInfo();
 
+void NormalizeString( svl::StringPool& rPool );
+
 const XEditAttributesType& GetAttribs() const { return aAttribs; }
 XEditAttributesType& GetAttribs() { return aAttribs; }
 
@@ -198,6 +206,8 @@ public:
 sal_uInt16 GetUserType() const;
 void SetUserType( sal_uInt16 n );
 
+void NormalizeString( svl::StringPool& rPool );
+
 boolIsVertical() const;
 voidSetVertical( bool b );
 
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index cdb8fbb..36392e2 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -49,6 +49,12 @@ struct Section;
 
 }
 
+namespace svl {
+
+class StringPool;
+
+}
+
 class EditTextObjectImpl;
 
 class EDITENG_DLLPUBLIC EditTextObject : public SfxItemPoolUser
@@ -72,6 +78,13 @@ public:
 EditTextObject( const EditTextObject& r );
 virtual ~EditTextObject();
 
+/**
+ * Set paragraph strings to the shared string pool.
+ *
+ * @param rPool shared string pool.
+ */
+void NormalizeString( svl::StringPool& rPool );
+
 const SfxItemPool* GetPool() const;
 sal_uInt16 GetUserType() const;// For OutlinerMode, it can however not 
save in compatible format
 void SetUserType( sal_uInt16 n );
commit 703f13ca8545271c5b4265d4e9ff18f751f30d9f
Author: Kohei Yoshida 
Date:   Tue Oct 1 20:57:56 2013 -0400

Move this string pool code to svl.

Change-Id: I1379fbc377607be8831133d64db2e14f8c75bff8

diff --git a/include/svl/stringpool.hxx b/include/svl/stringpool.hxx
new file mode 100644
index 000..643c846
--- /dev/null
+++ b/include/svl/stringpool.hxx
@@ -0,0 +1,34 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SVL_STRINGPOOL_HXX
+#define SVL_STRINGPOOL_HXX
+
+#include "svl/svldllapi.h"
+#include "rtl/ustring.hxx"
+
+#include 
+
+namespace svl {
+
+class SVL_DLLPUBLIC StringPool
+{
+typedef boost::unordered_set StrHashType;
+StrHashType maStrPool;
+public:
+StringPool();
+
+rtl_uString* intern( const OUString& rStr );
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtab

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

[Takeshi Abe]

 basic/source/basmgr/basicmanagerrepository.cxx |4 +--
 basic/source/basmgr/basmgr.cxx |   20 +++
 basic/source/classes/sbunoobj.cxx  |   10 +++
 basic/source/classes/sbxmod.cxx|   26 ++--
 basic/source/comp/exprnode.cxx |   26 ++--
 basic/source/comp/exprtree.cxx |   32 -
 basic/source/comp/loops.cxx|8 +++---
 basic/source/comp/parser.cxx   |8 +++---
 8 files changed, 67 insertions(+), 67 deletions(-)

New commits:
commit ea1e3b77d43f770715e796d64e4054cec651898f
Author: Takeshi Abe 
Date:   Tue Oct 1 23:16:43 2013 +0900

sal_Bool to bool

Change-Id: I16ddbcf100e21d6c05fccbe24faca2932a605902

diff --git a/basic/source/basmgr/basicmanagerrepository.cxx 
b/basic/source/basmgr/basicmanagerrepository.cxx
index d7a7bf1..4aece49 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -442,7 +442,7 @@ namespace basic
 SotStorageRef xDummyStor = new SotStorage( OUString() );
 _out_rpBasicManager = new BasicManager( *xDummyStor, OUString() /* 
TODO/LATER: xStorage */,
 pAppBasic,
-&aAppBasicDir, 
sal_True );
+&aAppBasicDir, 
true );
 if ( !_out_rpBasicManager->GetErrors().empty() )
 {
 // handle errors
@@ -467,7 +467,7 @@ namespace basic
 // create new BASIC-manager
 StarBASIC* pBasic = new StarBASIC( pAppBasic );
 pBasic->SetFlag( SBX_EXTSEARCH );
-_out_rpBasicManager = new BasicManager( pBasic, NULL, sal_True );
+_out_rpBasicManager = new BasicManager( pBasic, NULL, true );
 }
 
 // knit the containers with the BasicManager
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index 6621a40..1b31518 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -874,7 +874,7 @@ void BasicManager::LoadBasicManager( SotStorage& rStorage, 
const OUString& rBase
 {
 INetURLObject aObj( aRealStorageName, INET_PROT_FILE );
 aObj.removeSegment();
-bool bWasAbsolute = sal_False;
+bool bWasAbsolute = false;
 aObj = aObj.smartRel2Abs( pInfo->GetRelStorageName(), bWasAbsolute 
);
 
 //*** TODO: Replace if still necessary
@@ -960,7 +960,7 @@ void BasicManager::LoadOldBasicManager( SotStorage& 
rStorage )
 
 INetURLObject aLibRelStorage( aStorName );
 aLibRelStorage.removeSegment();
-bool bWasAbsolute = sal_False;
+bool bWasAbsolute = false;
 aLibRelStorage = aLibRelStorage.smartRel2Abs( aLibRelStorageName, 
bWasAbsolute);
 DBG_ASSERT(!bWasAbsolute, "RelStorageName was absolute!" );
 
@@ -971,11 +971,11 @@ void BasicManager::LoadOldBasicManager( SotStorage& 
rStorage )
 }
 else
 {
-xStorageRef = new SotStorage( sal_False, 
aLibAbsStorage.GetMainURL
-( INetURLObject::NO_DECODE ), eStorageReadMode, sal_True );
+xStorageRef = new SotStorage( false, aLibAbsStorage.GetMainURL
+( INetURLObject::NO_DECODE ), eStorageReadMode, true );
 if ( xStorageRef->GetError() != ERRCODE_NONE )
-xStorageRef = new SotStorage( sal_False, aLibRelStorage.
-GetMainURL( INetURLObject::NO_DECODE ), eStorageReadMode, 
sal_True );
+xStorageRef = new SotStorage( false, aLibRelStorage.
+GetMainURL( INetURLObject::NO_DECODE ), eStorageReadMode, 
true );
 }
 if ( xStorageRef.Is() )
 {
@@ -1077,7 +1077,7 @@ sal_Bool BasicManager::ImpLoadLibrary( BasicLibInfo* 
pLibInfo, SotStorage* pCurS
 
 if ( !xStorage.Is() )
 {
-xStorage = new SotStorage( sal_False, aStorageName, eStorageReadMode );
+xStorage = new SotStorage( false, aStorageName, eStorageReadMode );
 }
 SotStorageRef xBasicStorage = xStorage->OpenSotStorage( 
OUString(szBasicStorage), eStorageReadMode, sal_False );
 
@@ -1328,11 +1328,11 @@ sal_Bool BasicManager::RemoveLib( sal_uInt16 nLib, 
sal_Bool bDelBasicFromStorage
 SotStorageRef xStorage;
 if ( !pLibInfo->IsExtern() )
 {
-xStorage = new SotStorage( sal_False, GetStorageName() );
+xStorage = new SotStorage( false, GetStorageName() );
 }
 else
 {
-xStorage = new SotStorage( sal_False, pLibInfo->GetStorageName() );
+xStorage = new SotStorage( false, pLibInfo->GetStorageName() );
 }
 
 if ( xSto

Advice on adding Smart-Art related settings

[Andres Gomez]

Forwarding as it seems it didn't arrive ...

 Forwarded Message 
From: Jacobo Aragunde Pérez 
Subject: Advice on adding Smart-Art related settings
Date: Tue, 01 Oct 2013 17:49:26 +0200

Hi :)

Lately we have been working on SmartArt support on Writer. As you know,
in 4.1 and prior the SmartArt figures were imported to LO shapes but
they weren't exported back when saving to docx, causing data loss.

Our first approach, which is already pushed to master, was saving the
full SmartArt information in the InteropGrabBag of the shapes and save
it back when exporting to docx. In this situation, users are allowed to
do changes to the shapes but these changes are not saved back.

That takes us to the next step: we want to make imported SmartArt
immutable, so users are aware that they can change the document but not
the shapes. We would like to add a configuration setting to enable or
disable this behaviour, and we have thought of doing it at Options ->
Load/Save -> MS Office. We have some doubts on how to call this
parameter and what should be the default behaviour.

Following the existing conventions in that dialog, we could call the
option "OOXML Smart-Art to LibreOfficeDev".

Right now we think that the proper way would be to mark the load option
always, making the option read only, so the user would not be able to
modify it and will be aware that OOXML SmartArt would always be loaded
and converted.

The second option, saving, would be the selectable one. If we would mark
the option, the Smart-Art will be converted into basic shapes and saved
as such. If it would not be marked, the Smart-Art will be saved as such
in the OOXML documents and, to avoid user modifications, it will be
converted to a bitmap in the UI and saved as such if saved as an
OpenDocument format.

Another topic is whether it would be desirable to let the user select
this option per application. This way, we would have 3 options:
 * "WinWord OOXML Smart-Art to LibreOfficeDev Writer".
 * "Excel OOXML Smart-Art to LibreOfficeDev Calc".
 * "PowerPoint OOXML Smart-Art to LibreOfficeDev Impress".

In the future, if we would have a decent implementation of a similar
functionality of Smart-Art for the OpenDocuments, we would have both
options selectable and the options would say:
 * "WinWord OOXML Smart-Art to LibreOfficeDev Writer or reverse".

Comments? Suggestions?

-- 
Jacobo Aragunde
Software Engineer at Igalia

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

Re: [Libreoffice-ux-advise] Advice on adding Smart-Art related settings

[Andres Gomez]

Hi,

On Tue, 2013-10-01 at 17:49 +0200, Jacobo Aragunde Pérez wrote:
...
> That takes us to the next step: we want to make imported SmartArt
> immutable, so users are aware that they can change the document but not
> the shapes. We would like to add a configuration setting to enable or
> disable this behaviour, and we have thought of doing it at Options ->
> Load/Save -> MS Office. We have some doubts on how to call this
> parameter and what should be the default behaviour.
...

Actually, I've been reading in LibO's Help which is the purpose of the
options under "Options -> Load/Save -> MS Office" and they seem to be
really attached to OLE importing/exporting.

Therefore, maybe this is not the best place in which to implement this
option.

The best and most obvious option seems to be "Options -> [Text Document|
Spreadsheet|Presentation] Options -> Compatibility". However, proper UI
with check boxes seems to be only "Text Document". "Spreadsheet"
"Compatibility" subcategory is quite different and it doesn't really
seem to face the task of selecting compatibility options among document
formats. "Presentation" doesn't even have a "Compatibility" subcategory.

In any case, my best guess is that we should go with these
subcategories. As we are facing now just Writer I suppose we can just
add another checkable option and, once we start implement similar
compatibility for "Calc" and "Impress" we can also add the needed items
and subcategories.

What do you think?

Br.
-- 
Andres Gomez
Computer Science Engineer
mailto:ago...@igalia.com
http://blogs.igalia.com/agomez/category/igaliacom/
IGALIA, S.L. http://www.igalia.com


signature.asc
Description: This is a digitally signed message part
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Samuel Mehrbrodt]

 cui/source/options/optsave.cxx |   11 --
 cui/source/options/optsave.hxx |1 
 cui/uiconfig/ui/optsavepage.ui |   43 -
 3 files changed, 13 insertions(+), 42 deletions(-)

New commits:
commit 111a2b94fd6f217d91c9a057086b3d2dfa752c5b
Author: Samuel Mehrbrodt 
Date:   Thu Sep 26 20:56:15 2013 +0200

fdo#54812 Remove option 'Size optimization for ODF format'

Change-Id: I1aee738a0ecd761efaecf4b1b1c53918d8f9cf01
Reviewed-on: https://gerrit.libreoffice.org/6044
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 094f636..31a164d 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -98,7 +98,6 @@ SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const 
SfxItemSet& rCoreSet ) :
 get(aRelativeInetCB, "relative_inet");
 
 get(aODFVersionLB, "odfversion");
-get(aSizeOptimizationCB, "sizeoptimization");
 get(aWarnAlienFormatCB, "warnalienformat");
 get(aDocTypeLB, "doctype");
 get(aSaveAsFT, "saveas_label");
@@ -271,12 +270,6 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
 bModified |= sal_True;
 }
 
-if ( aSizeOptimizationCB->IsChecked() != 
aSizeOptimizationCB->GetSavedValue() )
-{
-rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PRETTYPRINTING ), 
!aSizeOptimizationCB->IsChecked() ) );
-bModified |= sal_True;
-}
-
 if ( aAutoSaveCB->IsChecked() != aAutoSaveCB->GetSavedValue() )
 {
 rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
@@ -478,9 +471,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
 aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat());
 
aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
 
-// the pretty printing
-aSizeOptimizationCB->Check( !aSaveOpt.IsPrettyPrinting());
-
 aAutoSaveEdit->SetValue( aSaveOpt.GetAutoSaveTime() );
 
 // save relatively
@@ -497,7 +487,6 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
 aDocInfoCB->SaveValue();
 aBackupCB->SaveValue();
 aWarnAlienFormatCB->SaveValue();
-aSizeOptimizationCB->SaveValue();
 aAutoSaveCB->SaveValue();
 aAutoSaveEdit->SaveValue();
 
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index eef46ba..69dfbb0 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -55,7 +55,6 @@ private:
 CheckBox*   aRelativeInetCB;
 
 ListBox*aODFVersionLB;
-CheckBox*   aSizeOptimizationCB;
 CheckBox*   aWarnAlienFormatCB;
 ListBox*aDocTypeLB;
 FixedText*  aSaveAsFT;
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index cfaffad..afedb0b 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -1,6 +1,13 @@
 
 
   
+  
+1
+60
+15
+1
+10
+  
   
 True
 False
@@ -287,23 +294,6 @@
 6
 12
 
-  
-Size 
optimization for ODF format
-True
-True
-False
-True
-0
-True
-  
-  
-0
-1
-2
-1
-  
-
-
   
 Warn when not 
saving in ODF or default format
 True
@@ -315,7 +305,7 @@
   
   
 0
-2
+1
 2
 1
   
@@ -355,7 +345,7 @@
   
   
 0
-5
+4
 2
 1
   
@@ -407,7 +397,7 @@
   
   
 0
-4
+3
 1
 1
   
@@ -430,7 +420,7 @@
   
   
 1
-3
+2
 1
 1
   
@@ -444,7 +434,7 @@
   
   
 1
-4
+3
 1
 1
   
@@ -460,7 +450,7 @@
   
   
 0
-3
+2
 1
 1
   
@@ -488,11 +478,4 @@
   
 
   
-  
-1
-60
-15
-1
-10
-  
 
___
Libreoffice-commits mailing

About Clang headers on Debian

[julien2412]

Hello,

On pc Debian x86-64 testing updated today, I tried to build with clang.
But I got this warning after autogen.sh
Cannot find Clang headers to build compiler plugins, plugins disabled

Checking in configure.ac, I found this:
   5625 CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include
-I$CLANGDIR/tools/clang/include -I$CLANGBUILD/include
-I$CLANGBUILD/tools/clang/include -D__STDC_CONSTANT_MACROS
-D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
   5626 AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
   5627 [COMPILER_PLUGINS=TRUE],
   5628 [
   5629 if test "$compiler_plugins" = "yes"; then
   5630 AC_MSG_ERROR([Cannot find Clang headers to build
compiler plugins.])

So I checked which package provided "RecursiveASTVisitor.h"
root@julienPC:/home/julien# apt-file search RecursiveASTVisitor.h
libclang-3.4-dev: /usr/lib/llvm-3.4/include/clang/AST/RecursiveASTVisitor.h
libclang-dev: /usr/lib/llvm-3.2/include/clang/AST/RecursiveASTVisitor.h

But this package is already installed:
root@julienPC:/home/julien# apt-get install libclang-dev
Reading package lists... Done
Building dependency tree   
Reading state information... Done
libclang-dev is already the newest version.
0 upgraded, 0 newly installed, 0 to remove and 1 not upgraded.

Should I create a symlink or should I override CLANGBUILD or CLANGBUILD so
autogen.sh can find:
/usr/lib/llvm-3.2/include/clang/AST/RecursiveASTVisitor.h
?
Is/are Debian package(s) for clang/llvm buggy? 

Julien



--
View this message in context: 
http://nabble.documentfoundation.org/About-Clang-headers-on-Debian-tp4075924.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: PATCH - SDRemote LO

[Andrzej Hunt]

Hi Junior,

Unfortunately your patch includes a lot of unnecessary reformatting
(space indentation replaced with tab-stops),
specifically in SlideShowActivity.java it's impossible to see what has
changed since the whole file has had all space-indentation replaced with
tab-indentation (i.e. git thinks the whole file has been removed and
recreated).

(There are also a few cases of lines with trailing space which the git
commit-hooks would usually complain about.)

No idea which editor/IDE you use, but if you could change back to space
indentation that would be hugely simplify reviewing the patch -- it
should probably be enough to configure it to use spaces for indentation
(four spaces per tab) and then reformat the file (I'm guessing you might
be using Eclipse?) which would remove most of the reformatting in the
patch.

Cheers,

Andrzej

On Tue, 2013-10-01 at 14:49 -0300, Junior Cesar Oliveira wrote:
> I declare that all of my past & future contributions to LibreOffice
> may be licensed under
> the MPL/LGPLv3+ dual license.
> 
> 
> Hello, the patch is attached to the resolution of bug 61570 SDremote
> project. The patch has been created for the following academic
> UTFPR-Brazil: Junior Cesar de Oliveira, Ana Claudia Maciel, Willyan
> Schultz Dworak.
> 
> 
> 
> 
> 
> Junior.
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

Re: Build windows failed on 4.0.5 branch

[Michael Stahl]

On 01/10/13 16:07, Gay, Matthieu wrote:
> 
> But when I try to build on windows I have this following error:
> 
> pdfwriter_impl.cxx(77) : fatal error C1083: Cannot open include file:
> 'nss.h': No such file or directory
> 

> 
> [build CXX] vcl/source/gdi/pdfwriter_impl.cxx
> [build JAR] unoil
> F:/git/libo_master_windows/vcl/source/gdi/pdfwriter_impl.cxx(79) : fatal
> error C1083: Cannot open include file: 'nss.h': No such file or directory
> make[2]: ***
> [F:/git/libo_master_windows/workdir/wntmsci12.pro/CxxObject/vcl/source/gdi/pdfwriter_impl.o]

can't see how that is possible... can you check that you have this file
nss.h as solver/*/inc/mozilla/nss/nss.h?

it should have been copied there by the "nss" module.

also can you check that you have the solver/*/inc/mozilla/nss directory
as an include path in the compile command (see it via "make vcl
VERBOSE=t"; it should be added by the line 65 ("nss3") of the
Library_vcl.mk and the gb_LinkTarget__use_nss3 in RepositoryExternal.mk.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 starmath/source/mathmlexport.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2fb543496a61974edd15c2bfefbc83abe225a85a
Author: Tor Lillqvist 
Date:   Tue Oct 1 17:47:17 2013 +0300

Add sanity check to avoid crash

I got a crash when saving doc from fdo#45349 as .fodt.

Change-Id: I704d86e846e78848d914de7b48da6c9fa4075150

diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 4e9e4ec..7fffe8f 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -861,6 +861,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int 
nLevel)
 {
 const SmNode *pLine = pNode->GetSubNode(nSize-1);
 if (pLine->GetType() == NLINE && pLine->GetNumSubNodes() == 1 &&
+pLine->GetSubNode(0) != NULL &&
 pLine->GetSubNode(0)->GetToken().eType == TNEWLINE)
 --nSize;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Question to code-insider: maximum numbers

[Kohei Yoshida]

On Thu, 2013-09-26 at 09:36 +0200, Thomas Krumbein wrote:
> Question Calc (spreadsheet):
> 
> How many datapoints can be access for charts?
> Means: How many lines can be maximum used for one chart? Is there a
> physical border (maximum number?). As I remember, Excel 2003 or 2007
> has
> a maximum number of 3200 datapoints.

I'm not aware of any explicit upper bound for data points. But since the
data points are stored in an STL array internally, it is subject to the
upper bounds of the platform (typically the max value of either size_t
or signed 32-bit integer).  In practice, it is far larger than 3200, and
probably so large that you would never hit that theoretical maximum
value.

Having said that, the current chart implementation is very susceptible
to poor performance when passing a large data set, in practice you
wouldn't want to pass too many data points, else Calc's run time
performance would suffer.  How many data points would be considered too
many is pretty much dependent on your PC.

HTH,

Kohei



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

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

[Tor Lillqvist]

 cppuhelper/source/shlib.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ecbe980c609de8e719243d6bd4f75d3e9c4aec61
Author: Tor Lillqvist 
Date:   Tue Oct 1 20:46:40 2013 +0300

WaE: 'rPath' : unreferenced formal parameter

Change-Id: I35aee7a1f8c2d79ac275262ba0cd002e4d034c95

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 9ffb8c1..e9e021f 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -409,6 +409,7 @@ void SAL_CALL writeSharedLibComponentInfo(
 Reference< registry::XRegistryKey > const & xKey )
 SAL_THROW( (registry::CannotRegisterImplementationException) )
 {
+(void) rPath;
 assert(rPath.isEmpty());
 oslModule lib = osl_loadModule(
 uri.pData, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

PATCH - SDRemote LO

[Junior Cesar Oliveira]

I declare that all of my past & future contributions to LibreOffice
may be licensed under
the MPL/LGPLv3+ dual license.

Hello, the patch is attached to the resolution of bug 61570 SDremote
project. The patch has been created for the following academic
UTFPR-Brazil: Junior Cesar de Oliveira, Ana Claudia Maciel, Willyan Schultz
Dworak.


Junior.


sdremote.patch
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 2 commits - helpcontent2 instsetoo_native/util solenv/inc

[Christian Lohmaier]

 helpcontent2 |2 -
 instsetoo_native/util/openoffice.lst |   40 +--
 solenv/inc/minor.mk  |2 -
 3 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 20496991d00e62a2cb27ecaf77ed2c29646a23c1
Author: Christian Lohmaier 
Date:   Tue Oct 1 18:28:19 2013 +0200

bump product version to 4.0.7.0+, reset number to 0

Change-Id: I19edf97ee1e4011c953cac7c63acb0c2ce4e8559

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index e9d726c..14fa7e0 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 4.0.6.0
+UREPACKAGEVERSION 4.0.7.0
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .7.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.6.0
+ABOUTBOXPRODUCTVERSION 4.0.7.0
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.7.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .7.0
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.6.0
+ABOUTBOXPRODUCTVERSION 4.0.7.0
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.7.0
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.7.0
 PACKAGEREVISION 1
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .7.0
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .7.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.7.0
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .7.0
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.7.0
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .7.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.7.0
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .7.0
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-PAC

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-6' - instsetoo_native/util solenv/inc

[Christian Lohmaier]

 instsetoo_native/util/openoffice.lst |   40 +--
 solenv/inc/minor.mk  |4 +--
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit f09a3640729e9b834ea16cbc0d31fa43ace5ef99
Author: Christian Lohmaier 
Date:   Tue Oct 1 18:39:29 2013 +0200

bump product version to 4.0.6.1+, release number to 1

Change-Id: Ia95aac911fc7a0aa45ab1c4aa6c97837e304a3c8

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index e9d726c..b45897f 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -4,7 +4,7 @@ Globals
 {
 variables
 {
-UREPACKAGEVERSION 4.0.6.0
+UREPACKAGEVERSION 4.0.6.1
 URELAYERVERSION 1
 REFERENCEOOOMAJORMINOR 3.4
 UNIXBASISROOTNAME libreoffice4.0
@@ -50,12 +50,12 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .6.1
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.6.0
+ABOUTBOXPRODUCTVERSION 4.0.6.1
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
@@ -65,7 +65,7 @@ LibreOffice
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.6.1
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -100,13 +100,13 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .6.1
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
-ABOUTBOXPRODUCTVERSION 4.0.6.0
+ABOUTBOXPRODUCTVERSION 4.0.6.1
 ABOUTBOXPRODUCTVERSIONSUFFIX +
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
@@ -121,7 +121,7 @@ LibreOffice_Dev
 FILEFORMATNAME OpenOffice.org
 FILEFORMATVERSION 1.0
 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.6.1
 PACKAGEREVISION {buildid}
 LICENSENAME LGPL
 GLOBALFILEGID gid_File_Lib_Vcl
@@ -159,9 +159,9 @@ URE
 {
 PRODUCTNAME URE
 PRODUCTVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.6.1
 PACKAGEREVISION 1
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .6.1
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,11 +192,11 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .6.1
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.6.1
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION SDK
@@ -231,12 +231,12 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .6.1
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.6.1
 PACKAGEREVISION {buildid}
 BASISPACKAGEPREFIX lodevbasis
 UREPACKAGEPREFIX lodev
@@ -276,11 +276,11 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .6.1
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVERSION 4.0.6.1
 PACKAGEREVISION {buildid}
 PACK_INSTALLED 1
 DMG_VOLUMEEXTENSION TEST
@@ -315,12 +315,12 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION .6.0
+PRODUCTEXTENSION .6.1
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
-PACKAGEVERSION 4.0.6.0
+PACKAGEVER

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.0.6.1'

[Christian Lohmaier]

Tag 'libreoffice-4.0.6.1' created by Christian Lohmaier 
 at 2013-10-01 17:36 -0700

Tag libreoffice-4.0.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSSvoTAAoJEPQ0oe+v7q6jNvYP/Rs6UrhLek80d9cwC6YJRHdE
KOsMz1Bx6o1aHfEtNXj7MvNXHAG8/wvl5s7C+KKJwh/HtTYVNW2LeTUG/ej6Kggj
eJYZr1uCgtJLTLibhn15Cbm/BscLVy7AugLujvZdKHN5tMoBpAxxZDcGDKTf6sAw
X3iBKirdJXBOLjgVUKzlYzy73bF27xh9A0dYORBPsWXkSaFLWWTTgRijyN/D8X/t
0hiltMkOnKGXw5YuZUQk1rvBMIw9vqaEPz4gI7UlJRCIBhRd3+g+ez/KKKR8ijxg
SSVbLDW5JInzV9MLKgDYmmPxPPktvbM+RV9QdBu5ZdM5NtAtJt7mGD4BmjOPEB5Q
xZ0osbMxLjrSUeTiSgeOYXkXv/rJTxHjdnqlDH8H1ucMjCryHrqjiVV2D18xuA5z
yWk/9bAIrALofNLOT1JHRdJTWqBSvm8+bJbv750e68hYMVRGvWxr+InkPNEyeT6I
2X3NBknOO617XlSXsuzNJXKZGnnc9UNvEEgB9k9RhTaDrz4m5n/JEVLWsyGghTqV
nbKdPV57uGvWscSfuNtgQftZRksdv+Ivb+3VdHqDim3lWIbY7XewibjwZJUMwtiN
LEgj03lTeBvWc+1p3jQZvsEif1BCZsRHVLsi2yne0PvqOJvMHeKk64DswSgxvD+j
kqWagVBsppfAOpfP6h69
=S8Ow
-END PGP SIGNATURE-

Changes since sdremote-1.0.2-9:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.0.6.1'

[Christian Lohmaier]

Tag 'libreoffice-4.0.6.1' created by Christian Lohmaier 
 at 2013-10-01 17:36 -0700

Tag libreoffice-4.0.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSSvobAAoJEPQ0oe+v7q6jOe8P/R+A6jli+se2uOEQu5QZ7P0Z
Z0++mPFbP34jA0mpAYD8509qLYEKQAXmws1m1W2g9LR73VdVv1jmop+tLhC1KYSL
1+y15qSj8TsR0MHq2r1GMg0LIjZKUJphpumoTf+V+ehGVqbOMwc4uFbak9tPx0/w
RvnbudWHVs7ohtWv9gKsXftkilguVxrRAErBb01iB/I+JA1ZQHfm0lAWqksVxTX6
tFhPTDd4izU6IjoUCGvFz1UCma3z9D5rXjVK8UFEbEJlnkbW9/40WpZGuWVfhzoL
UGqMfreWQTAJ/IcELRX1838yuQQdJrGMuPUhdYpEpmmt8Re1FEjR+FcKb6Ma15GY
GiV9BzI8daOiI0xfbW0ETUaRFaufJqM6JyXCZNz7TCRr2zLyaDpFbDgl4ZiMfd2y
bYkqbansacu9a9qgAQiOtxi+8PYgYuoWFXmi/mA39s0i5Tk1IhhxEPUycC91dd/A
Gevl6xH6594Y+jEROirhpuSASLj2T0tsCsibXmWNwjGm0DuuuIdqcOFtVN5+Awi6
WMY4f+R6ylbQQQRVyJChXTdPcjhug531HDQRi3ZkFyhRij+qJMtVJNtd72gEs+Ul
rjsHOjPkDp3+tbTIArr8wBuyD/QfkKShe20q1zpVIZbuGfnkuzr49Y14+Kj/HNry
gFwGK2s+ad9LyrcV7y+G
=KNqd
-END PGP SIGNATURE-

Changes since sdremote-1.0.0-872:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.0.6.1'

[Christian Lohmaier]

Tag 'libreoffice-4.0.6.1' created by Christian Lohmaier 
 at 2013-10-01 17:36 -0700

Tag libreoffice-4.0.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSSvoNAAoJEPQ0oe+v7q6jXKQP/Rp+VOC4EGe6ABE0XzgWDr2x
lNAfdQ29q2v8TmExwDy90Ky7+D0oMW+ndYkDSMH7yAFGzI0RRKKb/YC7BuijZGCl
P4BB6/+HiCJ5rOFncfqPVSnhERh4x4MUm2jtiGGKCB81TUl/xxDY/IGpBDUYlLlD
wBdGOc44GOX3VhN4R74hdmvc4CWB1/8N9E3z8GoOvdqus7dxzkMBks0Vrt8iN9uL
sycj3LlxiVXlPdsjcbILiale7iPqzRr3f/lDeWtGgIivhNs4WKxraDtyEnnrEddy
jEj/+GLS33z/PZY5Mey/rxaJ+W7pT2XUJQPdIPe5keUIwfCd2R1X5AXvPAB9SLHZ
Vho6VH0nfFVTNaTagl26ZKo6I5DMwYMgrmFW7cv3cczE8cXfTCImwW4TpmUz5M4E
gaWULN2t5smpqQoV8ihkKritTOi3B/WoBGDOr+0NzEiw8u2eSlmSkMfs+Ooklb+n
51tRgj38YTsgtG1PSM1T/7xlWzekgyQMJva5NZzERFpY9OOO30mjwx1oqK6vdl18
5cq8jVGG/OzwscYYeaYj/AsEvs3pF7kL1GWzIbiS9SArIEsmIH63px1BMQgu8fAW
C4nQTMttekSSapapLk+YZc34fCIdZJAgN8fcTjQ78QcYUjkajDFX7P2ViZYWRN4s
Qe3fkgIVUxBRb+ImiY8t
=/W5D
-END PGP SIGNATURE-

Changes since sdremote-1.0.2-17:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.0.6.1'

[Christian Lohmaier]

Tag 'libreoffice-4.0.6.1' created by Christian Lohmaier 
 at 2013-10-01 17:36 -0700

Tag libreoffice-4.0.6.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSSvoXAAoJEPQ0oe+v7q6jiEEP/jeepuj0Pf3p9a3QO/GkCQZJ
jq7g+wm6xwtBfSz7JZKC+MRjUfHOLervCnqMENS5LGrOqq5mG/CJoZOrjrCyO/ee
1eAPj60y5BRumZP/Se0Ku2GDEwjOPwJvkBU8Y1/g236CIQt5kgoh8tUfq+IpTAQ9
H8WfcHb+Li2jUhGKwN04+vmd1P1W4iRd+Xq2b0kCOLs3djL2BANidCVjhHuDOCLg
QhFl6QwLB1K3otMeqK2+hrjwjJSUIfE+PudgRxJyoUiY5I0XCMWTTNgf1hAh7pjD
CVJiuyMQLNCXeeOsKekWlQSJiaUjs2FNUKz340qvj+hE7BZq0g9m6p5oqm2tmApk
SXsspr/GErg2zg8Jr+mhmFilZ3HAS2l+2hEXrKNjYIq6BEZRVi5lyFpB9EMPNBuB
XptIJweIT/J1F672/lG/1RKttjPNGCweCTcH1orhyPwhbLp8NasoLWq/eg+uhpDw
/Fwj8sNMCP6OpyUgQYQwohxsSbqvD8lXkX5C68zmdlhw62ioUkGy3ZTVWMTJEVOp
HFWJFXQfidvheOvRsN17Jq++6pJw4bUzwwXQePcItvZQLpD1W2rXuRk4qHbhedE1
a0EIRjdERq1c326gQ2UEXLrW4P/bDIQ3W8acP3e8ewknvTbWYSA9xz+xZz61xEIT
Yasuelj2ZCbTytQ5AGu4
=DeUd
-END PGP SIGNATURE-

Changes since sdremote-1.0.2-17:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OUString replace(sal_Unicode, sal_Unicode)

[Matteo Casalin]

Hi Stephan,

On Tue, 01 Oct 2013 18:13:39 +0200
Stephan Bergmann  wrote:

> On 10/01/2013 05:05 PM, Matteo Casalin wrote:
> >  OUString provides the metod replace(sal_Unicode, sal_Unicode), which 
> > seems to be not widely used, while there are for sure some replaceAll("a", 
> > "b") calls here and there.
> > Would it be fine to rename the former to replaceAll(sal_Unicode, 
> > sal_Unicode) for consistency, fix the current calls and then slowly convert 
> > all of the call-places of the latter (which I think to be be less 
> > efficient)?
> > If any backward compatibility is needed, replace could be kept and just 
> > call the related replaceAll.
> 
> Not too sure that would really be worth it:
> 
> * Single-character replacement is different from multi-character 
> replacement in that it doesn't need to specify how to handle cases where 
> one replacement gives rise to further replacement opportunities. 
> (That's why there originally only was a replaceFirst for the 
> multi-character case, to avoid having to make a decision.)
> 
> * There is no support for fromIndex in replace.
> 
> * replace is an inline function, so it could be replaced (no pun 
> intended) with "only" becoming build-time, not runtime incompatible. 
> Keeping it around and having two inline functions doing the same trivial 
> thing to avoid that looks like a bit too much overhead to me.
> 
> * The underlying C function is called rtl_uString_newReplace, not 
> ..._rewReplaceAll (and /that/ couldn't be changed without breaking ABI).
> 
> Stephan

Your rationale really overcomes my simple "it changes All of the occurrences" :)
I will reduce the task to just not introducing any new replaceAll("a", "b") and 
by replacing the existing ones with replace('a', 'b'), when I find any.

Many thanks for the quick and detailed reply!
Matteo


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

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

[Stephan Bergmann]

 sc/source/ui/dbgui/consdlg.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ffa4798d1f9b1c94278b180482b2e0ef7f6c1481
Author: Stephan Bergmann 
Date:   Tue Oct 1 18:28:25 2013 +0200

-Werror,-Wuninitialized

Change-Id: Ibb71a19867546d212b1f6fcbea3a274556b4f18e

diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx
index 23e2b23..8094c1c 100644
--- a/sc/source/ui/dbgui/consdlg.cxx
+++ b/sc/source/ui/dbgui/consdlg.cxx
@@ -82,9 +82,7 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, 
SfxChildWindow* pCW, Window
 pRangeUtil  ( new ScRangeUtil ),
 pAreaData   ( NULL ),
 nAreaDataCount  ( 0 ),
-nWhichCons  ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) ),
-
-pRefInputEdit   ( pEdDataArea )
+nWhichCons  ( rArgSet.GetPool()->GetWhich( SID_CONSOLIDATE ) )
 {
 get(pLbFunc,"func");
 get(pLbConsAreas,"consareas");
@@ -93,6 +91,8 @@ ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, 
SfxChildWindow* pCW, Window
 get(pEdDataArea,"eddataarea");
 get(pRbDataArea,"rbdataarea");
 
+pRefInputEdit = pEdDataArea;
+
 get(pLbDestArea,"lbdestarea");
 get(pEdDestArea,"eddestarea");
 get(pRbDestArea,"rbdestarea");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-0-6'

[Christian Lohmaier]

New branch 'libreoffice-4-0-6' available with the following commits:
commit 90411c3f10e1efecb9963a452d2d9a0893984b58
Author: Christian Lohmaier 
Date:   Tue Oct 1 18:20:33 2013 +0200

Branch libreoffice-4-0-6

This is 'libreoffice-4-0-6' - the stable branch for the 4.0.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.0.x release,
please use the 'libreoffice-4-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I45aa3d2d72a1d7cd75df6b9007469da7642c5b0f

commit 4500d5b3c0867b8d3416ef4a61ef059da64b61fc
Author: Christian Lohmaier 
Date:   Tue Oct 1 18:11:14 2013 +0200

bring helpcontent2 to libreoffice-4-0 branch

Change-Id: I0aaa58ba4ac11d56a2ea8203bf16c3f4c782d2dc

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-0-6'

[Christian Lohmaier]

New branch 'libreoffice-4-0-6' available with the following commits:
commit 7ba2edd74698962eeec74a3de1904ef17b4d01a8
Author: Christian Lohmaier 
Date:   Tue Oct 1 18:20:31 2013 +0200

Branch libreoffice-4-0-6

This is 'libreoffice-4-0-6' - the stable branch for the 4.0.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.0.x release,
please use the 'libreoffice-4-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I8637367c14ac5c538215e02519b5557f84eca74f

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-0-6'

[Christian Lohmaier]

New branch 'libreoffice-4-0-6' available with the following commits:
commit 6f847248e9916cfff3e015ff14a53209d1b4815d
Author: Christian Lohmaier 
Date:   Tue Oct 1 18:20:31 2013 +0200

Branch libreoffice-4-0-6

This is 'libreoffice-4-0-6' - the stable branch for the 4.0.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.0.x release,
please use the 'libreoffice-4-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Id9d92f570ee73595a2a56f16acff3971ea6532ff

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-0-6'

[Christian Lohmaier]

New branch 'libreoffice-4-0-6' available with the following commits:
commit 81b711a8b943a511caabdcb4ed625daf7a721e66
Author: Christian Lohmaier 
Date:   Tue Oct 1 18:20:31 2013 +0200

Branch libreoffice-4-0-6

This is 'libreoffice-4-0-6' - the stable branch for the 4.0.6 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.0.x release,
please use the 'libreoffice-4-0' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: If88ede0904fa5a8664741e6429f35967ae48ef25

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OUString replace(sal_Unicode, sal_Unicode)

[Stephan Bergmann]

On 10/01/2013 05:05 PM, Matteo Casalin wrote:

 OUString provides the metod replace(sal_Unicode, sal_Unicode), which seems to be not widely 
used, while there are for sure some replaceAll("a", "b") calls here and there.
Would it be fine to rename the former to replaceAll(sal_Unicode, sal_Unicode) 
for consistency, fix the current calls and then slowly convert all of the 
call-places of the latter (which I think to be be less efficient)?
If any backward compatibility is needed, replace could be kept and just call 
the related replaceAll.


Not too sure that would really be worth it:

* Single-character replacement is different from multi-character 
replacement in that it doesn't need to specify how to handle cases where 
one replacement gives rise to further replacement opportunities. 
(That's why there originally only was a replaceFirst for the 
multi-character case, to avoid having to make a decision.)


* There is no support for fromIndex in replace.

* replace is an inline function, so it could be replaced (no pun 
intended) with "only" becoming build-time, not runtime incompatible. 
Keeping it around and having two inline functions doing the same trivial 
thing to avoid that looks like a bit too much overhead to me.


* The underlying C function is called rtl_uString_newReplace, not 
..._rewReplaceAll (and /that/ couldn't be changed without breaking ABI).


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - translations

[Christian Lohmaier]

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

New commits:
commit 40e5e298533ce91e5b6ed7e19bb6d9dbc09f4e9d
Author: Christian Lohmaier 
Date:   Tue Oct 1 17:44:19 2013 +0200

Updated core
Project: translations  06359830b9ee9f304f01ccd9e2fe063c6d256b08

diff --git a/translations b/translations
index 83cf8a2..0635983 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 83cf8a270e2e6b2dabecb9eee97faa879542787c
+Subproject commit 06359830b9ee9f304f01ccd9e2fe063c6d256b08
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sw/qa vcl/unx writerfilter/source

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/bnc779620.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   10 ++
 vcl/unx/generic/app/saldisp.cxx  |   21 +---
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   25 ++-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|   18 ++
 writerfilter/source/dmapper/PropertyMap.cxx  |   15 +
 6 files changed, 70 insertions(+), 19 deletions(-)

New commits:
commit bbef85c157169efa958ea1014d91d467cb243e6f
Author: Miklos Vajna 
Date:   Tue Oct 1 16:57:56 2013 +0200

bnc#779620 DOCX import: try harder to convert floating tables to text frames

Since 78d1f1c2835b9fae0f91ed771fc1d594c7817502, we convert floating
tables to text frames only in case it's possible that there will be
wrapping, to give better results for multi-page tables, which are
multi-page, and technically floating ones, but that has no effect on the
layout.

The problem was that we try to do this decision too early, effectively
the page width and margins were counted from the default letter size,
instead of the actual values, which did not arrive at the time of the
decision. Fix this by moving this logic at the section end.

Change-Id: Ic1fbceb54c8ec223ed01836fafe6220bb3b2410a

diff --git a/sw/qa/extras/ooxmlimport/data/bnc779620.docx 
b/sw/qa/extras/ooxmlimport/data/bnc779620.docx
new file mode 100644
index 000..23c126d
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/bnc779620.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index f2ab2c4..b1c4583 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -137,6 +137,7 @@ public:
 void testDefaultSectBreakCols();
 void testFdo69636();
 void testChartProp();
+void testBnc779620();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -238,6 +239,7 @@ void Test::run()
 {"default-sect-break-cols.docx", &Test::testDefaultSectBreakCols},
 {"fdo69636.docx", &Test::testFdo69636},
 {"chart-prop.docx", &Test::testChartProp},
+{"bnc779620.docx", &Test::testBnc779620},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1584,6 +1586,14 @@ void Test::testChartProp()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(8886), getProperty(xPropertySet, 
"Height"));
 }
 
+void Test::testBnc779620()
+{
+// The problem was that the floating table was imported as a non-floating 
one.
+uno::Reference xTextFramesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index b32351a..f65cfca 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -824,19 +824,7 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 uno::Reference xStart;
 uno::Reference xEnd;
 
-bool bNoFly = false;
-if (SectionPropertyMap* pSectionContext = 
m_rDMapper_Impl.GetSectionContext())
-{
-sal_Int32 nTextAreaWidth = pSectionContext->GetPageWidth() - 
pSectionContext->GetLeftMargin() - pSectionContext->GetRightMargin();
-sal_Int32 nTableWidth = 0;
-m_aTableProperties->getValue( TablePropertyMap::TABLE_WIDTH, 
nTableWidth );
-// If the table is wider than the text area, then don't create a 
fly
-// for the table: no wrapping will be performed anyway, but 
multi-page
-// tables will be broken.
-bNoFly = nTableWidth >= nTextAreaWidth;
-}
-
-bool bFloating = aFrameProperties.hasElements() && !bNoFly;
+bool bFloating = aFrameProperties.hasElements();
 // Additional checks: if we can do this.
 if (bFloating && (*m_pTableSeq)[0].getLength() > 0 && 
(*m_pTableSeq)[0][0].getLength() > 0)
 {
@@ -923,7 +911,16 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 // A non-zero left margin would move the table out of the frame, 
move the frame itself instead.
 xTableProperties->setPropertyValue("LeftMargin", 
uno::makeAny(sal_Int32(0)));
 
-uno::Reference< text::XTextContent > xFrame = 
m_xText->convertToTextFrame(xStart, xEnd, aFrameProperties);
+// In case the document ends with a table, we're called after
+// SectionPropertyMap::CloseSectionGroup(), so we'll have no idea
+// about the text area width, nor can fix this by delayi

OUString replace(sal_Unicode, sal_Unicode)

[Matteo Casalin]

Hi all,
OUString provides the metod replace(sal_Unicode, sal_Unicode), which seems 
to be not widely used, while there are for sure some replaceAll("a", "b") calls 
here and there.
Would it be fine to rename the former to replaceAll(sal_Unicode, sal_Unicode) 
for consistency, fix the current calls and then slowly convert all of the 
call-places of the latter (which I think to be be less efficient)?
If any backward compatibility is needed, replace could be kept and just call 
the related replaceAll.

Thanks for any feedback
Cheers

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

Re: Question to code-insider: maximum numbers

[Thorsten Behrens]

Caolan McNamara wrote:
> On Thu, 2013-09-26 at 09:36 +0200, Thomas Krumbein wrote:
> > What is the maximum number of presentation-pages? Don't worry about
> > file-size, but is there a physical maximum number?
> 
> Pages in impress are identified by a unsigned short, so the limit
> appears to be 65,536 pages.
> 
Bit less than half of that even, Impress still has places where this
2*n+1 abomination for handout pages is used.

Cheers,

-- Thorsten


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

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

[Caolán McNamara]

 editeng/source/editeng/impedit2.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 165aca6a01ede62d0ce7577a90709bd9bd43b769
Author: Caolán McNamara 
Date:   Tue Oct 1 15:14:30 2013 +0100

Resolves: rhbz#1013480 crash in EditLineList::operator[]

avoid crashing anyway, though unknown how to end up in
this scenario

Change-Id: Ib602c73478e5c4772cfef73f70c67ad22877a39f

diff --git a/editeng/source/editeng/impedit2.cxx 
b/editeng/source/editeng/impedit2.cxx
index d348219..515842e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4162,10 +4162,13 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* 
pPortion, sal_uInt16 nIndex
 ? GetYValue( rLSItem.GetInterLineSpace() ) : 0;
 
 sal_uInt16 nCurIndex = 0;
-OSL_ENSURE( pPortion->GetLines().Count(), "Empty ParaPortion in 
GetEditCursor!" );
+size_t nLineCount = pPortion->GetLines().Count();
+OSL_ENSURE( nLineCount, "Empty ParaPortion in GetEditCursor!" );
+if (nLineCount == 0)
+return Rectangle();
 const EditLine* pLine = NULL;
 sal_Bool bEOL = ( nFlags & GETCRSR_ENDOFLINE ) ? sal_True : sal_False;
-for ( sal_uInt16 nLine = 0; nLine < pPortion->GetLines().Count(); nLine++ )
+for (size_t nLine = 0; nLine < nLineCount; ++nLine)
 {
 const EditLine* pTmpLine = pPortion->GetLines()[nLine];
 if ( ( pTmpLine->GetStart() == nIndex ) || ( pTmpLine->IsIn( nIndex, 
bEOL ) ) )
@@ -4184,7 +4187,7 @@ Rectangle ImpEditEngine::GetEditCursor( ParaPortion* 
pPortion, sal_uInt16 nIndex
 // Cursor at the End of the paragraph.
 OSL_ENSURE( nIndex == nCurIndex, "Index dead wrong in GetEditCursor!" 
);
 
-pLine = pPortion->GetLines()[pPortion->GetLines().Count()-1];
+pLine = pPortion->GetLines()[nLineCount-1];
 nY -= pLine->GetHeight();
 if ( !aStatus.IsOutliner() )
 nY -= nSBL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Build windows failed on 4.0.5 branch

[Gay, Matthieu]

Hello,



 I had to build libreoffice windows to test some code you advise me to search, 
in this message by example:



" Checkbox Format > Paragraph > Text Flow > Breaks in Writer"



But when I try to build on windows I have this following error:



pdfwriter_impl.cxx(77) : fatal error C1083: Cannot open include file: 'nss.h': 
No such file or directory



For information the windows build on http://dev-builds.libreoffice.org/daily is 
dead.



The full log:

$ /opt/lo/bin/make tail_build
/opt/lo/bin/make -r -f /cygdrive/f/git/libo_master_windows/Makefile.top 
tail_build
make[1]: Entering directory `/cygdrive/f/git/libo_master_windows'
cd tail_build && /opt/lo/bin/make -j 2 -rs gb_PARTIALBUILD=T
make[2]: Entering directory `/cygdrive/f/git/libo_master_windows/tail_build'
/cygdrive/f/git/libo_master_windows/pyuno/Library_pyuno.mk:27: warning: 
overriding recipe for target 
`F:/git/libo_master_windows/workdir/wntmsci12.pro/LinkTarge
t/Library/pyuno.pyd'
/cygdrive/f/git/libo_master_windows/pyuno/Library_pyuno.mk:27: warning: 
ignoring old recipe for target 
`F:/git/libo_master_windows/workdir/wntmsci12.pro/LinkTar
get/Library/pyuno.pyd'
[build DEP] LNK:Library/ixsec_xmlsec.lib
[build DEP] LNK:Library/ifwm.lib
[build DEP] LNK:Library/ifwe.lib
[build DEP] LNK:Library/iemboleobj.lib
[build DEP] LNK:Library/iediteng.lib
[build DEP] LNK:Executable/unopkg_bin.exe
[build DEP] LNK:Library/icppcanvas.lib
[build DEP] LNK:Library/igdipluscanvas.lib
[build DEP] LNK:Library/ivclcanvas.lib
[build DEP] LNK:Library/isimplecanvas.lib
[build DEP] LNK:Library/inullcanvas.lib
make[2]: Leaving directory `/cygdrive/f/git/libo_master_windows/tail_build'
make[2]: Entering directory `/cygdrive/f/git/libo_master_windows/tail_build'
/cygdrive/f/git/libo_master_windows/pyuno/Library_pyuno.mk:27: warning: 
overriding recipe for target 
`F:/git/libo_master_windows/workdir/wntmsci12.pro/LinkTarge
t/Library/pyuno.pyd'
/cygdrive/f/git/libo_master_windows/pyuno/Library_pyuno.mk:27: warning: 
ignoring old recipe for target 
`F:/git/libo_master_windows/workdir/wntmsci12.pro/LinkTar
get/Library/pyuno.pyd'
[build MOD] clucene
[build MOD] embedserv
[build MOD] neon
[build CUT] binaryurp_test-cache
[build CUT] o3tl_tests
[build CUT] sal_osl_process
[build CUT] Module_DLL
[build CUT] sal_bytesequence
[build CUT] sal_checkapi
[build CUT] sal_osl_condition
[build CUT] sal_osl_module
[build CUT] sal_osl_old_test_file
[build CUT] sal_osl_security
[build CUT] sal_osl_thread
[build CUT] sal_rtl_alloc
[build CUT] sal_rtl_bootstrap
[build CUT] sal_rtl_cipher
[build CUT] sal_rtl_crc32
[build CUT] sal_rtl_doublelock
[build CUT] sal_rtl_locale
[build CUT] sal_rtl_ostringbuffer
[build CUT] sal_rtl_oustringbuffer
[build CUT] sal_rtl_uuid
[build CUT] sal_tcwf
[build CUT] sal_types
[build CUT] sal_osl_mutex
[build CUT] sal_osl_profile
[build CUT] sal_osl_setthreadname
[build CUT] sal_rtl_math
[build MOD] sal
[build MOD] salhelper
[build MOD] store
[build CHK] o3tl
[build CUT] sal_rtl_textenc
[build CUT] sal_rtl_strings
[build CUT] sal_rtl_uri
[build CUT] salhelper_checkapi
[build CUT] salhelper_testapi
[build CHK] sal
[build CHK] salhelper
[build MOD] helpcompiler
[build MOD] registry
[build CXX] vcl/source/gdi/pdfwriter_impl.cxx
[build JAR] unoil
F:/git/libo_master_windows/vcl/source/gdi/pdfwriter_impl.cxx(79) : fatal error 
C1083: Cannot open include file: 'nss.h': No such file or directory
make[2]: *** 
[F:/git/libo_master_windows/workdir/wntmsci12.pro/CxxObject/vcl/source/gdi/pdfwriter_impl.o]
 Error 2
make[2]: *** Waiting for unfinished jobs
make[2]: Leaving directory `/cygdrive/f/git/libo_master_windows/tail_build'
make[1]: *** [tail_build] Error 2
make[1]: Leaving directory `/cygdrive/f/git/libo_master_windows'
make: *** [tail_build] Error 2



My autogen.lastrun:



--disable-postgresql-sdbc
--disable-cairo-canvas
--with-num-cpus=2
--with-max-jobs=4
--disable-odk
--without-junit
--with-nss-build-tools=/cygdrive/f/mozilla-build
--with-mozilla-build=/cygdrive/f/mozilla-build
--with-directx-home=F:\Program Files\Microsoft DirectX SDK (June 2010)
--with-cl-home=f:\Program Files\Microsoft Visual Studio 9.0\VC
--with-mspdb-path=/cygdrive/f/Program Files/Microsoft Visual Studio 
9.0/Common7/IDE
--with-csc-path=/cygdrive/f/Program Files/Microsoft.NET/SDK/v2.0
--with-midl-path=/cygdrive/f/Program Files/Microsoft SDKs/Windows/v7.1/Bin
--with-asm-home=/cygdrive/f/Program Files/Microsoft Visual Studio 9.0/VC/Bin
--with-ant-home=/cygdrive/f/apache-ant-1.9.0
--with-windows-sdk-home=/cygdrive/f/Program Files/Microsoft SDKs/Windows/v7.1
--disable-atl
--disable-activex
--with-jdk-home=/cygdrive/C/Program Files/Java/jdk1.7.0_17

--without-help
--without-helppack-integration
This message contains information that may be privileged or confidential and is 
the property of the Capgemini Group. It is intended only for the person to whom 
it is addressed. If you are not the intended recipient, you are not authorized 
to read, print, retain, copy, disseminate, distribute, o

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

pierre-yves samyn  changed:

   What|Removed |Added

 Depends on||68981, 68983

--- Comment #87 from pierre-yves samyn  ---
I nominate two related bugs: 

bug 68981 Add dataloss: "thisComponent.store" corrupts the macro library
password
bug 68983 "Save As" a document containing a macro library protected by password
corrupts the password of the macro library

They meet three criteria (Blocker Bug Definition): data loss, security bug,
unusable function

-- 
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: 2 commits - include/tools lotuswordpro/source sc/source sw/inc sw/source tools/source

[Caolán McNamara]

 include/tools/string.hxx |3 -
 lotuswordpro/source/filter/lwpnumericfmt.hxx |   13 ++--
 sc/source/filter/excel/excform.cxx   |6 +-
 sc/source/filter/excel/excform8.cxx  |4 -
 sc/source/filter/excel/namebuff.cxx  |8 +-
 sc/source/filter/inc/namebuff.hxx|   24 
 sc/source/ui/docshell/impex.cxx  |   24 
 sc/source/ui/miscdlgs/crnrdlg.cxx|   20 +++
 sw/inc/calc.hxx  |   10 +--
 sw/source/core/bastyp/calc.cxx   |   44 +++
 sw/source/core/crsr/crstrvl.cxx  |3 -
 sw/source/core/doc/docdraw.cxx   |   22 +++
 sw/source/core/view/vprint.cxx   |8 +-
 sw/source/filter/html/htmlform.cxx   |   16 ++---
 sw/source/filter/html/htmlftn.cxx|   34 ++--
 sw/source/filter/ww8/writerwordglue.cxx  |   13 +---
 sw/source/filter/ww8/ww8par5.cxx |5 +
 sw/source/ui/index/cntex.cxx |   36 
 sw/source/ui/misc/outline.cxx|3 -
 tools/source/string/strascii.cxx |   75 ---
 20 files changed, 141 insertions(+), 230 deletions(-)

New commits:
commit d05a9ae25e4a397834330d868b68d92ca919e33b
Author: Caolán McNamara 
Date:   Tue Oct 1 13:39:46 2013 +0100

Related: fdo#38838 remove UniString::AssignAscii

Change-Id: I263ef2594080ff7d47d5499c2b62e60e1689d2d6

diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 7f0e8d9..5ca0047 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -180,8 +180,7 @@ public:
 UniString&  Assign( sal_Unicode c );
 inline UniString & Assign(char c) // ...but allow "Assign('a')"
 { return Assign(static_cast< sal_Unicode >(c)); }
-UniString&  AssignAscii( const sal_Char* pAsciiStr );
-UniString&  AssignAscii( const sal_Char* pAsciiStr, xub_StrLen 
nLen );
+
 UniString&  operator =( const UniString& rStr )
 { return Assign( rStr ); }
 UniString&  operator =( const OUString& rStr )
diff --git a/sc/source/filter/excel/excform.cxx 
b/sc/source/filter/excel/excform.cxx
index 0c34957..238a881 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -231,7 +231,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, 
XclImpStream& aIn, s
 sal_uInt16  nUINT16;
 sal_Int16   nINT16;
 double  fDouble;
-String  aString;
+OUStringaString;
 sal_BoolbError = false;
 sal_BoolbArrayFormula = false;
 TokenId nMerk0;
@@ -693,7 +693,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, 
XclImpStream& aIn, s
 case 0x58:
 case 0x78:
 case 0x38: // Command-Equivalent Function   [333]
-aString.AssignAscii( "COMM_EQU_FUNC" );
+aString = "COMM_EQU_FUNC";
 aIn >> nByte;
 aString += OUString::number( nByte );
 aIn >> nByte;
@@ -1779,7 +1779,7 @@ void ExcelToSc::ReadExtensionArray( unsigned int n, 
XclImpStream& aIn )
 sal_uInt8nByte;
 sal_uInt16  nUINT16;
 double  fDouble;
-String  aString;
+OUStringaString;
 ScMatrix*   pMatrix;
 
 aIn >> nByte >> nUINT16;
diff --git a/sc/source/filter/excel/excform8.cxx 
b/sc/source/filter/excel/excform8.cxx
index 043b3f4..aa5a98f 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -143,7 +143,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& 
rpTokArray, XclImpStream& aIn,
 sal_uInt8   nOp, nLen, nByte;
 sal_uInt16  nUINT16;
 double  fDouble;
-String  aString;
+OUStringaString;
 sal_BoolbError = false;
 sal_BoolbArrayFormula = false;
 TokenId nMerk0;
@@ -634,7 +634,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& 
rpTokArray, XclImpStream& aIn,
 case 0x58:
 case 0x78:
 case 0x38: // Command-Equivalent Function   [333]
-aString.AssignAscii( "COMM_EQU_FUNC" );
+aString = "COMM_EQU_FUNC";
 aIn >> nByte;
 aString += OUString::number( nByte );
 aIn >> nByte;
diff --git a/sc/source/filter/excel/namebuff.cxx 
b/sc/source/filter/excel/namebuff.cxx
index 4c75d64..b359297 100644
--- a/sc/source/filter/excel/namebuff.cxx
+++ b/sc/source/filter/excel/namebuff.cxx
@@ -31,10 +31,10 @@
 
 #include 
 
-sal_uInt32 StringHashEntry::MakeHashCode( const String& r )
+sal_uInt32 StringHashEntry::MakeHashCode( const OUString& r )
 {
-sal_uInt32 n = 

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

a07cd040897db54e1...@spambog.com changed:

   What|Removed |Added

 Depends on||68927

--- Comment #86 from a07cd040897db54e1...@spambog.com ---
Added https://www.libreoffice.org/bugzilla/show_bug.cgi?id=68927

SVG-images used as page background are rendered as bitmap / rasterized in LO
(4.1.1.2) itself and even in generated PDFs or printouts. This worked fine in
v3.4.5.

-- 
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 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

Caolán McNamara  changed:

   What|Removed |Added

 Depends on||67274
 Blocks|67274   |

-- 
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: codemaker/source

[Stephan Bergmann]

 codemaker/source/cppumaker/cpputype.cxx |   37 ++--
 1 file changed, 26 insertions(+), 11 deletions(-)

New commits:
commit 254f59f623f58c320175a06a2c93bcee7868b623
Author: Stephan Bergmann 
Date:   Tue Oct 1 14:33:56 2013 +0200

rhbz#1014010: Missing dependencies in isBootstrapType list

...the list has been fixed now by copying its elements into an ENTRIES file 
and
running "unoidl-write udkapi/ @ENTITIES TEMP && unoidl-read TEMP 
>/dev/null" and
adding any reported unknown entities until it succeeds.

However, the updated list lead to deadlock when css.reflection.ParamInfo 
UnoType
resolves css.reflection.XIdlClass UnoType resolves css.reflection.XIdlMethod
UnoType resolves css.reflection.ParamInfo UnoType, so broke the circle by no
longer resolving the interface methods' return and parameter types in
InterfaceType::dumpMethodsCppuDecl (which is why those type infos are only
generated on demand anyway; looks like this had been a careless thinko in 
the
generation of comprehensive type info that had remained unnoticed all the 
time).

Change-Id: I50ef2fde16242298e055c6fa5971e70fad1a2b68

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index 8f8cdf3..7f073e4 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -49,18 +49,25 @@ namespace {
 
 bool isBootstrapType(OUString const & name) {
 static char const * const names[] = {
+"com.sun.star.beans.Property",
 "com.sun.star.beans.PropertyAttribute",
+"com.sun.star.beans.PropertyChangeEvent",
 "com.sun.star.beans.PropertyState",
 "com.sun.star.beans.PropertyValue",
 "com.sun.star.beans.XFastPropertySet",
 "com.sun.star.beans.XMultiPropertySet",
+"com.sun.star.beans.XPropertiesChangeListener",
 "com.sun.star.beans.XPropertyAccess",
+"com.sun.star.beans.XPropertyChangeListener",
 "com.sun.star.beans.XPropertySet",
+"com.sun.star.beans.XPropertySetInfo",
 "com.sun.star.beans.XPropertySetOption",
+"com.sun.star.beans.XVetoableChangeListener",
 "com.sun.star.bridge.UnoUrlResolver",
 "com.sun.star.bridge.XUnoUrlResolver",
 "com.sun.star.connection.SocketPermission",
 "com.sun.star.container.XElementAccess",
+"com.sun.star.container.XEnumeration",
 "com.sun.star.container.XEnumerationAccess",
 "com.sun.star.container.XHierarchicalNameAccess",
 "com.sun.star.container.XNameAccess",
@@ -70,6 +77,7 @@ bool isBootstrapType(OUString const & name) {
 "com.sun.star.io.FilePermission",
 "com.sun.star.io.IOException",
 "com.sun.star.lang.DisposedException",
+"com.sun.star.lang.EventObject",
 "com.sun.star.lang.WrappedTargetRuntimeException",
 "com.sun.star.lang.XComponent",
 "com.sun.star.lang.XEventListener",
@@ -81,11 +89,19 @@ bool isBootstrapType(OUString const & name) {
 "com.sun.star.lang.XSingleServiceFactory",
 "com.sun.star.lang.XTypeProvider",
 "com.sun.star.loader.XImplementationLoader",
+"com.sun.star.reflection.FieldAccessMode",
+"com.sun.star.reflection.MethodMode",
+"com.sun.star.reflection.ParamInfo",
+"com.sun.star.reflection.ParamMode",
+"com.sun.star.reflection.TypeDescriptionSearchDepth",
 "com.sun.star.reflection.XArrayTypeDescription",
 "com.sun.star.reflection.XCompoundTypeDescription",
 "com.sun.star.reflection.XEnumTypeDescription",
+"com.sun.star.reflection.XIdlArray",
 "com.sun.star.reflection.XIdlClass",
+"com.sun.star.reflection.XIdlField",
 "com.sun.star.reflection.XIdlField2",
+"com.sun.star.reflection.XIdlMethod",
 "com.sun.star.reflection.XIdlReflection",
 "com.sun.star.reflection.XIndirectTypeDescription",
 "com.sun.star.reflection.XInterfaceAttributeTypeDescription",
@@ -97,18 +113,28 @@ bool isBootstrapType(OUString const & name) {
 "com.sun.star.reflection.XMethodParameter",
 "com.sun.star.reflection.XStructTypeDescription",
 "com.sun.star.reflection.XTypeDescription",
+"com.sun.star.reflection.XTypeDescriptionEnumeration",
 "com.sun.star.reflection.XTypeDescriptionEnumerationAccess",
 "com.sun.star.reflection.XUnionTypeDescription",
+"com.sun.star.registry.RegistryKeyType",
+"com.sun.star.registry.RegistryValueType",
 "com.sun.star.registry.XImplementationRegistration",
 "com.sun.star.registry.XRegistryKey",
 "com.sun.star.registry.XSimpleRegistry",
 "com.sun.star.security.RuntimePermission",
+"com.sun.star.security.XAccessControlContext",
 "com.sun.star.security.XAccessController",
+"com.sun.star.security.XAction",
 "com.sun.star.uno.DeploymentExce

[Libreoffice-commits] core.git: 3 commits - sysui/CustomTarget_share.mk sysui/desktop

[Michael Stahl]

 sysui/CustomTarget_share.mk |1 
 sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml|   30 
+
 sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml|   24 +++
 sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml|   29 
+
 sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml |   25 
 sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml  |   31 
++
 sysui/desktop/freedesktop/freedesktop-menus.spec|7 --
 sysui/desktop/share/create_tree.sh  |5 +
 8 files changed, 147 insertions(+), 5 deletions(-)

New commits:
commit 1724f55432848b4177758389d2a9fc38b767ae31
Author: Michael Stahl 
Date:   Tue Oct 1 14:27:51 2013 +0200

sysui: remove cruft from freedesktop-menus.spec

Change-Id: I0e4dc2145fe4ddcb7b3e4d4d0233987a8b70dd34

diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 0217259..840e1f8 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -40,8 +40,7 @@ AutoReqProv: no
 %description
 %productname desktop integration for desktop-environments that implement
 the menu- and mime-related specifications from http://www.freedesktop.org
-Install this package if you're using a distribution not covered by any of
-the other %pkgprefix--menus packages.
+These specifications are implemented by all current distributions.
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,9 +52,6 @@ export NO_BRP_STALE_LINK_ERROR=yes
 
 mkdir -p $RPM_BUILD_ROOT
 
-# FIXME: remove - only purpose is to create packages identical to OOF680 m8
-umask 
-
 # set parameters for the create_tree script
 export DESTDIR=$RPM_BUILD_ROOT
 export KDEMAINDIR=/usr
commit 9663478df85655a3581bc97193a0ef92df1eae20
Author: Michael Stahl 
Date:   Tue Oct 1 14:26:03 2013 +0200

fdo#69210: sysui: add AppData to system-integration RPM/DEB

Change-Id: Ifabf7965c922d7f719201cea39827acbccb57937

diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 2783995..d191d8d 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -181,6 +181,7 @@ $(share_WORKDIR)/%/create_tree.sh: 
$(share_SRCDIR)/share/create_tree.sh $(share_
echo "PREFIX=$(UNIXFILENAME.$*)" >> $@
echo "ICON_PREFIX=$(UNIXFILENAME.$*)" >> $@
echo "ICON_SOURCE_DIR=$(SRCDIR)/sysui/desktop/icons" >> $@
+   echo "APPDATA_SOURCE_DIR=$(SRCDIR)/sysui/desktop/appstream-appdata" >> 
$@
echo "PRODUCTVERSION=$(PRODUCTVERSION)" >> $@
cat $< >> $@
chmod 774 $@
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec 
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 5a1042b..0217259 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -413,3 +413,4 @@ done
 /usr/share/icons/locolor/*/apps/*png
 /usr/share/icons/locolor/*/mimetypes/*png
 /usr/share/mime/packages/*
+/usr/share/appdata/*
diff --git a/sysui/desktop/share/create_tree.sh 
b/sysui/desktop/share/create_tree.sh
index 606f1a5..0843f2e 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -86,3 +86,8 @@ for i in `cat launcherlist`; do
   ln -sf "${office_root}/share/xdg/${i}" 
"${DESTDIR}/usr/share/applications/${PREFIX}-${i}"
 done
 
+mkdir -p "${DESTDIR}/usr/share/appdata"
+for i in base calc draw impress writer; do
+cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" 
"${DESTDIR}/usr/share/appdata/${PREFIX}-${i}.appdata.xml"
+done
+
commit ceb9e098fc6efcfb7e024057bfa46aa06a295d00
Author: Richard Hughes 
Date:   Tue Oct 1 13:03:19 2013 +0200

fdo#69210: sysui: add some AppStream AppData files

Change-Id: I5c4af1c36290f0e1b3815058bd68b952f6005f4a

diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml 
b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
new file mode 100644
index 000..e40b769
--- /dev/null
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -0,0 +1,30 @@
+
+
+libreoffice-base.desktop
+CC0
+
+
+Base is a powerful database manager, part of the LibreOffice productivity 
suite.
+It allows you to store, manage and maintain different collections of data.
+Base makes it easy to keep track of your finances, customers, invoices, or even
+just the contacts in your address book!
+
+
+For users that are new to databases, Base offeres helpful wizards to create 
tables,
+queries, forms and reports.
+It's a solution for people requiring an easy-to-understand, simple-to-use 
system.
+
+
+For power users and enterprise requirements, it provides native-support drivers
+for some of the most-widely employed multi-user database engines:
+MySQL, Adabas D, MS Access and PostgreSQL.
+In addition, the built-in support for JDBC- and ODBC-standard drivers allows

Re: Extensions no longer registered in master Linux 32bit

[Alex Thurgood]

Le 01/10/2013 09:08, Stephan Bergmann a écrit :

Hi Stephan,



The solver/*/bin directory contains (external) .oxt files that are put
there via extras/Package_extensions.mk.  Again, their content should
rather be unzipped into sub-directories of the instdir share/extensions
directory now (and scp2 adapted accordingly).



Seems to me that as an amateur builder of master on a near daily basis 
with as many extensions as actually seem to work, it is easier for me to 
continue using :


make dev-install -o build

At least that, for the time being, still continues to register the 
extensions properly.



Alex

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

Re: Pre-Configuration LibO

[Thomas Krumbein]

Hey Niklas,

Yes, your file works fine :-)  Thank you for your help.

So, I think, my path was wrong. I tried to extract the path out of this
line:

true

(Part of the registrymodification.xcu)

so I belief, I did some mistake.

Thanks again.
Thomas

Am 01.10.2013 13:13, schrieb Niklas Johansson:
> Are you sure you got the registry paths correct.
> Given that I want to enable the Sidebar in LibreOffice 4.1.X, this xcd 
> works for me:
> 
> 
> http://www.w3.org/2001/XMLSchema";
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
> xmlns:oor="http://openoffice.org/2001/registry";>
> 
> 
>
>  
>true
>  
>
> 
> 

-- 
## Unterstützung der freien Office Suite
## http://de.libreOffice.org  - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: solution for 43340

[Caolán McNamara]

On Mon, 2013-09-23 at 10:53 +0800, Liang Weike wrote:
> Hi all,
>  
> I'm interested in the solution code for the bug. So is there anybody
> who knows the patch for this bug or knows where the corresponding code
> is? Thanks in advance.
>  
> Bug 43340 - EDITING: cursor position invisible after adding a new
> slide via icon command 
> https://bugs.freedesktop.org/show_bug.cgi?id=43340 

I don't know, but the bug mentions that it was fixed between 3.6.6.2 and
4.0.2.2 so you might be able to identify what range of commits the fix
was in by using the 4.0 bibisect repo at
https://wiki.documentfoundation.org/QA/HowToBibisect

C.


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

Re: Question to code-insider: maximum numbers

[Caolán McNamara]

On Thu, 2013-09-26 at 09:36 +0200, Thomas Krumbein wrote:
> Question Impress (presentation):
> 
> What is the maximum number of presentation-pages? Don't worry about
> file-size, but is there a physical maximum number?

Pages in impress are identified by a unsigned short, so the limit
appears to be 65,536 pages.

C.

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

Re: Pre-Configuration LibO

[Niklas Johansson]

Are you sure you got the registry paths correct.
Given that I want to enable the Sidebar in LibreOffice 4.1.X, this xcd 
works for me:



http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:oor="http://openoffice.org/2001/registry";>


  

  true

  



Does that one make any difference to you? You need a fresh user profile 
to see the change so rename your current user profile folder before you 
try it out.


If it doesn't work, what version of LibreOffice are you trying this on?

Regards,
Niklas Johansson

Thomas Krumbein skrev 2013-10-01 11:48:

Hey all,

I tried to build an xcd-file to change some presettings in LibO.
Unfortunatly it doesn´t work. Maybe someone can give me some hints?

1. I wont to enable the experimental sidebar per default. All xcd-files
are UTF8 and LF coded, places in share/registry

My first approch:


http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:oor="http://openoffice.org/2001/registry";>


   

  

true

  

   



Doesn´t work.

Next approch:


http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:oor="http://openoffice.org/2001/registry";>


   

  

false


false


false


true


false


false


false


true


2


auto


1


true


false

   

   



(thats all the datas, which will be changes in the
registrymodification.xcu, if I do the change manually)

Doesn´t work.

2. Later I tried to change the CLT-Mode and activating support for asian
language - unfortunatly same result.

3. When I change the default font the following code works:


http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:oor="http://openoffice.org/2001/registry";>




Arial

 



So, what is going wrong in Nr. 1 and 2? Any hints?

Best regards
Thomas




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

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

[Noel Grandin]

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

New commits:
commit 340775da21f69a6a2f2c573d983a6f0957aa8ec4
Author: Noel Grandin 
Date:   Tue Oct 1 13:07:22 2013 +0200

fix conversion to OUString in filedlghelper.cxx

in commit c82d932510c88a12b260b1684522efbc69f07b26
"convert remnants of String to OUString in SFX2 module"
when I created the SetToken method, I forgot to make the first
parameter a reference.

Change-Id: Id587e69ff0cdf46f645d8f9d1dc0e110ae80daa5

diff --git a/sfx2/source/dialog/filedlghelper.cxx 
b/sfx2/source/dialog/filedlghelper.cxx
index a847973..49d175f 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1902,7 +1902,7 @@ void FileDialogHelper_Impl::addGraphicFilter()
 #define GRF_CONFIG_STR  "   "
 #define STD_CONFIG_STR  "1 "
 
-static void SetToken( OUString rOrigStr, sal_Int32 nToken, sal_Unicode cTok, 
const OUString& rStr)
+static void SetToken( OUString& rOrigStr, sal_Int32 nToken, sal_Unicode cTok, 
const OUString& rStr)
 {
 const sal_Unicode*  pStr= rOrigStr.getStr();
 sal_Int32 nLen  = rOrigStr.getLength();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/uiconfig/ui/passwd.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0bca15197461f9e0c6f28ce301c2fed2ec4b38cb
Author: Caolán McNamara 
Date:   Tue Oct 1 12:04:31 2013 +0100

don't show macro passwords when entering them

Change-Id: I0bd594a10efbd0469423d7463896f7e02f958ff1

diff --git a/svx/uiconfig/ui/passwd.ui b/svx/uiconfig/ui/passwd.ui
index 3375067..bc63ed0 100644
--- a/svx/uiconfig/ui/passwd.ui
+++ b/svx/uiconfig/ui/passwd.ui
@@ -114,7 +114,7 @@
 True
 True
 True
-●
+False
   
   
 False
@@ -169,7 +169,7 @@
 True
 True
 True
-●
+False
   
   
 1
@@ -183,7 +183,7 @@
 True
 True
 True
-●
+False
   
   
 1
___
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

[Caolán McNamara]

 helpers/help_hid.lst |5 -
 source/text/simpress/01/0216.xhp |   21 ++---
 2 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit d12565b654b04222b6f60d182dd9e494311d7d59
Author: Caolán McNamara 
Date:   Tue Oct 1 11:58:21 2013 +0100

update help ids for modify field .ui conversion

Change-Id: I604bc59f371951298c10b7fd63fe53410059eb31

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 07c5c87..efa442b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6380,8 +6380,6 @@ sd_ImageButton_FLT_WIN_ANIMATION_BTN_STOP,3231378947,
 sd_ListBox_DLG_ASS_LB_PAGE2_LAYOUT,1088491041,
 sd_ListBox_DLG_ASS_LB_PAGE3_EFFECT,1088491051,
 sd_ListBox_DLG_ASS_LB_PAGE3_SPEED,1088491053,
-sd_ListBox_DLG_FIELD_MODIFY_LB_FORMAT,1081085441,
-sd_ListBox_DLG_FIELD_MODIFY_LB_LANGUAGE,1081085443,
 sd_ListBox_DLG_PRINTDIALOG_CB_CONTENT,1104006659,
 sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE,1104006661,
 sd_ListBox_DLG_PUBLISHING_PAGE1_DESIGNS,1085853189,
@@ -6393,7 +6391,6 @@ sd_MetricField_DLG_MORPH_MTF_STEPS,1084447233,
 sd_MetricField_DLG_VECTORIZE_MT_FILLHOLES,1084463620,
 sd_MetricField_DLG_VECTORIZE_MT_REDUCE,1084463619,
 sd_ModalDialog_DLG_CUSTOMANIMATION_SCHEMES_PANE,1415741440,
-sd_ModalDialog_DLG_FIELD_MODIFY,1081081856,
 sd_ModalDialog_DLG_INSERT_PASTE,1084850176,
 sd_ModalDialog_DLG_PRINTDIALOG,1104003072,
 sd_ModalDialog_DLG_PRINT_WARNINGS,1087307776,
@@ -6432,8 +6429,6 @@ sd_RadioButton_DLG_ASS_RB_PAGE2_MEDIUM4,1088487974,
 sd_RadioButton_DLG_ASS_RB_PAGE2_MEDIUM5,1088487975,
 sd_RadioButton_DLG_ASS_RB_PAGE3_KIOSK,1088487984,
 sd_RadioButton_DLG_ASS_RB_PAGE3_LIVE,1088487983,
-sd_RadioButton_DLG_FIELD_MODIFY_RBT_FIX,1081082369,
-sd_RadioButton_DLG_FIELD_MODIFY_RBT_VAR,1081082370,
 sd_RadioButton_DLG_INSERT_PASTE_RB_AFTER,1084850690,
 sd_RadioButton_DLG_INSERT_PASTE_RB_BEFORE,1084850689,
 sd_RadioButton_DLG_PRINTDIALOG_RBT_HORIZONTAL,1104003591,
diff --git a/source/text/simpress/01/0216.xhp 
b/source/text/simpress/01/0216.xhp
index 9e72df8..27d8649 100644
--- a/source/text/simpress/01/0216.xhp
+++ b/source/text/simpress/01/0216.xhp
@@ -37,10 +37,9 @@
 formatting; fields
 
 
-
-
+
 Edit Fields 
-Edits the properties of an inserted 
field.
+Edits the properties of an 
inserted field.
  To edit an inserted field, double-click it. Then choose Edit - 
Fields.
 Then choose Edit - Fields.
 
@@ -49,17 +48,17 @@
 
 Field type
 Sets the type of a field.
-
+
 Fixed
-Displays the 
content of the field when the field was inserted.
-
+Displays the 
content of the field when the field was inserted.
+
 Variable
-Displays the 
current value of the field.
-
+Displays the current 
value of the field.
+
 Language
-Select the 
language for the field.
-
+Select the 
language for the field.
+
 Format
-Select a display 
format for the field.
+Select a display 
format for the field.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit a4137a78a607eefe45cbe965f793b0045074d64d
Author: Caolán McNamara 
Date:   Tue Oct 1 11:58:21 2013 +0100

Updated core
Project: help  d12565b654b04222b6f60d182dd9e494311d7d59

diff --git a/helpcontent2 b/helpcontent2
index 0b28df0..d12565b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0b28df071531446de5cf300cf20d680f2a155863
+Subproject commit d12565b654b04222b6f60d182dd9e494311d7d59
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 cui/source/dialogs/hangulhanjadlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5055eb2ca3b8f0f2c8e04e3784b7611203e56f0b
Author: Tor Lillqvist 
Date:   Tue Oct 1 13:39:03 2013 +0300

Fix error: assigning to 'rtl::OUString *' from incompatible type 'const int'

Change-Id: I8374a78268a48377c6c00c710a4fa28aa26c2fe6

diff --git a/cui/source/dialogs/hangulhanjadlg.cxx 
b/cui/source/dialogs/hangulhanjadlg.cxx
index 718c9a4..662f6ef 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -1261,7 +1261,7 @@ namespace svx
 };
 
 SuggestionList::SuggestionList() :
-m_vElements(MAXNUM_SUGGESTIONS, NULL)
+m_vElements(MAXNUM_SUGGESTIONS, static_cast(NULL))
 {
 m_nAct = m_nNumOfEntries = 0;
 }
___
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

[Caolán McNamara]

 helpers/help_hid.lst  |1 -
 source/text/sbasic/shared/01/06130100.xhp |8 
 source/text/shared/01/06130100.xhp|   16 
 3 files changed, 12 insertions(+), 13 deletions(-)

New commits:
commit 0b28df071531446de5cf300cf20d680f2a155863
Author: Caolán McNamara 
Date:   Tue Oct 1 11:35:45 2013 +0100

update help ids for password dialog .ui conversion

Change-Id: Ife1ead8a20db8b86b5ec23642eacf1af189fa0f5

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c1c2583..07c5c87 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2642,7 +2642,6 @@ HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE,39145,
 HID_PAGE_DISTRIBUTE,33859,
 HID_PASSWD_DOC,58994,
 HID_PASSWD_TABLE,58993,
-HID_PASSWORD,33824,
 HID_POPUP_COLOR,33838,
 HID_POPUP_COLOR_CTRL,34186,
 HID_POPUP_FRAME,33840,
diff --git a/source/text/sbasic/shared/01/06130100.xhp 
b/source/text/sbasic/shared/01/06130100.xhp
index a19284a..f5f1649 100644
--- a/source/text/sbasic/shared/01/06130100.xhp
+++ b/source/text/sbasic/shared/01/06130100.xhp
@@ -29,14 +29,14 @@
 
 
 Change Password
-Protects the selected library with a 
password. You can enter a new password, or change the current 
password.
+Protects the selected 
library with a password. You can enter a new password, or change the 
current password.
 Old password
 Password
-Enter the 
current password for the selected library.
+Enter the current password 
for the selected library.
 New password
 Password
-Enter a new 
password for the selected library.
+Enter a new password for the 
selected library.
 Confirm
-Repeat 
the new password for the selected 
library.i66515
+Repeat the new password 
for the selected library.i66515
 
 
diff --git a/source/text/shared/01/06130100.xhp 
b/source/text/shared/01/06130100.xhp
index b183992..b511d43 100644
--- a/source/text/shared/01/06130100.xhp
+++ b/source/text/shared/01/06130100.xhp
@@ -33,22 +33,22 @@
 
 
 
-
+
 Change Password
-Protects the selected library with a 
password. You can enter a new password, or change the current 
password.
+Protects the selected 
library with a password. You can enter a new password, or change the 
current password.
 
   
 
 Old password
-
+
 Password
-Enter the 
current password for the selected library.
+Enter the current password 
for the selected library.
 New password
-
+
 Password
-Enter a new 
password for the selected library.
-
+Enter a new password for the 
selected library.
+
 Confirm
-Reenter 
the new password for the selected library.
+Reenter the new 
password for the selected library.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit d9c80f67d919e3e3a1eb0c079d66bf61955eaaf5
Author: Caolán McNamara 
Date:   Tue Oct 1 11:35:45 2013 +0100

Updated core
Project: help  0b28df071531446de5cf300cf20d680f2a155863

diff --git a/helpcontent2 b/helpcontent2
index a6e10a3..0b28df0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a6e10a3d4ef8a1f0f1c4826e300d377d677cf6e3
+Subproject commit 0b28df071531446de5cf300cf20d680f2a155863
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Object Linking and Embedding in LibreOffice

[Miklos Vajna]

Hi Badal,

On Tue, Oct 01, 2013 at 02:46:54PM +0530, Badal Naik 
 wrote:
> Many thanks for your promt reply. I have designed the UI, and
> created the "display as icon" there. Have modified the
> "insertoleobject.ui " file under /cui/uiconfig/ui...Does not have
> much exposure to ODF Import /ww8 import filter. Request to please
> give me some pointer on this..

As far as I see, both file formats store the "icon" just like any other
replacement image, it's just the UI that makes this choice possible for
the user. I mean, from the UI perspective, you still need to produce a
replacement image.

To do so, I guess you need to answer two questions:

1) How do I get the application icon / name that should be on the image?

2) What is the API to produce an image based on those infos?

For the later, I guess one readable example is how the DOCX import
filter creates OLE objects (using the UNO API) with replacement
graphics:

http://opengrok.libreoffice.org/xref/core/writerfilter/source/dmapper/DomainMapper_Impl.cxx#1241

I.e. create a text::TextEmbeddedObject, set the StreamName, Width,
Height, Graphic properties, and attach it to the document as text
content.

More reference here:

http://api.libreoffice.org/docs/idl/ref/servicecom_1_1sun_1_1star_1_1text_1_1TextEmbeddedObject.html

The UI typically uses the internal API, though, so you may want to look
into how the TextEmbeddedObject is implemented, which is the
SwXTextEmbeddedObject class:

http://opengrok.libreoffice.org/xref/core/sw/inc/unoframe.hxx#282
http://opengrok.libreoffice.org/xref/core/sw/source/core/unocore/unoframe.cxx#2951

E.g. in the getEmbeddedObject() method you get the idea where to dig
further:
- the document model stores the OLE object as an SwOLENode
- the generic (not Writer-specific) embedded UNO interface is
  embed::XEmbeddedObject
- the generic internal API is svt::EmbeddedObjectRef

Hope this helps,

Miklos


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

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

[Michael Stahl]

 cui/source/dialogs/cuigaldlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0c08311b02c720aeeabcafdaee1c799bf987a37
Author: Michael Stahl 
Date:   Tue Oct 1 12:11:15 2013 +0200

cui: fix up WNT-only code

Change-Id: I70f1592ac26428611c2d8f6fc0090f97b9cd0025

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index e5d4cbc..2c8d085 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -965,7 +965,7 @@ void TPGalleryThemeProperties::FillFilterList()
  }
 
 #if defined(WNT)
-if ( aExtensions.Len() > 240 )
+if (aExtensions.getLength() > 240)
 aExtensions = "*.*";
 #endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 extensions/source/propctrlr/standardcontrol.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4e601bda1798dd9e1651e41db0e17818c62d1763
Author: Michael Stahl 
Date:   Tue Oct 1 12:04:09 2013 +0200

extensions: fix swapped "insert" parameters

Change-Id: If9667cad9fcc0ff3b1cc8d36c0619d80d7f3e2b9

diff --git a/extensions/source/propctrlr/standardcontrol.cxx 
b/extensions/source/propctrlr/standardcontrol.cxx
index 50d409b..61c2c0e 100644
--- a/extensions/source/propctrlr/standardcontrol.cxx
+++ b/extensions/source/propctrlr/standardcontrol.cxx
@@ -657,9 +657,9 @@ namespace pcr
 nVal >>= 4;
 if (c<=9) c += '0';
 else c += 'A' - 10;
-aStr.insert(c,0);
+aStr.insert(0, c);
 }
-while (aStr.getLength() < nLength) aStr.insert('0',0);
+while (aStr.getLength() < nLength) aStr.insert(0, '0');
 return aStr.makeStringAndClear();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/inc svx/source svx/uiconfig svx/UIConfig_svx.mk

[Manal Alhassoun]

 include/svx/dialogs.hrc  |3 
 include/svx/passwd.hxx   |   21 +--
 svx/UIConfig_svx.mk  |1 
 svx/inc/helpid.hrc   |1 
 svx/source/dialog/passwd.cxx |   69 --
 svx/source/dialog/passwd.hrc |   44 ---
 svx/source/dialog/passwd.src |   97 +--
 svx/uiconfig/ui/passwd.ui|  270 +++
 8 files changed, 319 insertions(+), 187 deletions(-)

New commits:
commit ff3203c5c567ed14a8ff2e80408c304d3cdd84e0
Author: Manal Alhassoun 
Date:   Mon Sep 30 11:22:50 2013 +0300

Convert change password dialog to widget UI

Change-Id: I0ff0eda77b849927fe6cffe5cf203c46ba9ef340
Reviewed-on: https://gerrit.libreoffice.org/6089
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index 4c1ba17..4c3d681 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -200,7 +200,6 @@
 // for Toolbox-Control style
 #define RID_SVXTBX_STYLE(RID_SVX_START + 120)
 
-#define RID_SVXDLG_PASSWORD (RID_SVX_START + 141)
 #define RID_SVXDLG_COMPRESSGRAPHICS (RID_SVX_START + 142)
 
 // Dialog for functions
@@ -995,6 +994,8 @@
 #define RID_SVXSTR_DOC_MODIFIED_YES  (SVX_OOO_BUILD_START + 4) // 1234
 #define RID_SVXSTR_DOC_MODIFIED_NO   (SVX_OOO_BUILD_START + 5) // 1235
 #define RID_SVXSTR_DOC_LOAD  (SVX_OOO_BUILD_START + 6) // 1236
+#define RID_SVXSTR_ERR_OLD_PASSWD(SVX_OOO_BUILD_START + 7) // 1237
+#define RID_SVXSTR_ERR_REPEAT_PASSWD (SVX_OOO_BUILD_START + 8) // 1238
 
 // sidebar-related resources (defined in the appropriate .hrc's)
 #define RID_SVX_SIDEBAR_BEGIN(RID_SVX_START + 1240)
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 532ee6e0..1009597 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -33,17 +33,12 @@
 class SVX_DLLPUBLIC SvxPasswordDialog : public SfxModalDialog
 {
 private:
-FixedLine   aOldFL;
-FixedText   aOldPasswdFT;
-EditaOldPasswdED;
-FixedLine   aNewFL;
-FixedText   aNewPasswdFT;
-EditaNewPasswdED;
-FixedText   aRepeatPasswdFT;
-EditaRepeatPasswdED;
-OKButtonaOKBtn;
-CancelButtonaEscBtn;
-HelpButton  aHelpBtn;
+FixedText* m_pOldFL;
+FixedText* m_pOldPasswdFT;
+Edit* m_pOldPasswdED;
+Edit* m_pNewPasswdED;
+Edit* m_pRepeatPasswdED;
+OKButton* m_pOKBtn;
 
 OUStringaOldPasswdErrStr;
 OUStringaRepeatPasswdErrStr;
@@ -59,8 +54,8 @@ public:
 SvxPasswordDialog( Window* pParent, sal_Bool 
bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False );
 ~SvxPasswordDialog();
 
-OUStringGetOldPassword() const { return aOldPasswdED.GetText(); }
-OUStringGetNewPassword() const { return aNewPasswdED.GetText(); }
+OUStringGetOldPassword() const { return m_pOldPasswdED->GetText(); 
}
+OUStringGetNewPassword() const { return m_pNewPasswdED->GetText(); 
}
 
 voidSetCheckPasswordHdl( const Link& rLink ) { 
aCheckPasswordHdl = rLink; }
 };
diff --git a/svx/UIConfig_svx.mk b/svx/UIConfig_svx.mk
index 7b98a08..cb4c759 100644
--- a/svx/UIConfig_svx.mk
+++ b/svx/UIConfig_svx.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/headfootformatpage \
svx/uiconfig/ui/findreplacedialog \
svx/uiconfig/ui/optgridpage \
+   svx/uiconfig/ui/passwd \
svx/uiconfig/ui/redlinecontrol \
svx/uiconfig/ui/redlinefilterpage \
svx/uiconfig/ui/redlineviewpage \
diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index e9e1666..2e41991 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -143,7 +143,6 @@
 #define HID_MNU_ZOOM_OPTIMAL  
"SVX_HID_MNU_ZOOM_OPTIMAL"
 #define HID_MNU_ZOOM_PAGE_WIDTH   
"SVX_HID_MNU_ZOOM_PAGE_WIDTH"
 #define HID_MNU_ZOOM_WHOLE_PAGE   
"SVX_HID_MNU_ZOOM_WHOLE_PAGE"
-#define HID_PASSWORD  
"SVX_HID_PASSWORD"
 #define HID_POPUP_COLOR   
"SVX_HID_POPUP_COLOR"
 #define HID_POPUP_COLOR_CTRL  
"SVX_HID_POPUP_COLOR_CTRL"
 #define HID_POPUP_FONTWORK_ALIGN  
"SVX_HID_POPUP_FONTWORK_ALIGN"
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index 2e80408..25b2314 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -23,7 +23,6 @@
 #include "svx/passwd.hxx"
 #include 
 #include 
-#include "passwd.hrc"
 
 // class SvxPasswordDialog ---
 
@@ -33,20 +32,20 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl)
 short nRet = RET_OK;
 OUString aEmpty;
 
-i

[Libreoffice-commits] core.git: 6 commits - fontconfig/ExternalProject_fontconfig.mk libxmlsec/ExternalPackage_xmlsec.mk nss/ExternalPackage_nss.mk postgresql/ExternalPackage_postgresql.mk postgresql/

[Michael Stahl]

 Repository.mk|7 
 RepositoryExternal.mk|7 
 fontconfig/ExternalProject_fontconfig.mk |2 
 libxmlsec/ExternalPackage_xmlsec.mk  |   12 -
 nss/ExternalPackage_nss.mk   |2 
 postgresql/ExternalPackage_postgresql.mk |   23 ---
 postgresql/Module_postgresql.mk  |1 
 sal/osl/unx/asm/interlck_sparc.s |  203 +--
 sal/osl/unx/system.c |   93 
 sw/source/filter/ww8/docxattributeoutput.cxx |2 
 xmlsecurity/Library_xsec_xmlsec.mk   |   24 +--
 11 files changed, 41 insertions(+), 335 deletions(-)

New commits:
commit 5249bd69ff7fa41d785a5bf9f4e7539ef8288438
Author: Michael Stahl 
Date:   Tue Oct 1 00:22:51 2013 +0200

nss: apparently libcrmf.a is unused

Change-Id: I098f6824b39b72652d650171fa3021d777628af9

diff --git a/nss/ExternalPackage_nss.mk b/nss/ExternalPackage_nss.mk
index f2b3935..c50a718 100644
--- a/nss/ExternalPackage_nss.mk
+++ b/nss/ExternalPackage_nss.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_ExternalPackage_add_files,nss,bin,\
 
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
-   mozilla/dist/out/lib/libcrmf.a \
mozilla/dist/out/lib/libfreebl3.dylib \
mozilla/dist/out/lib/libnspr4.dylib \
mozilla/dist/out/lib/libnss3.dylib \
@@ -78,7 +77,6 @@ $(eval $(call 
gb_ExternalPackage_add_libraries_for_install,nss,bin,\
 ))
 else # OS!=WNT/MACOSX
 $(eval $(call gb_ExternalPackage_add_files,nss,lib,\
-   mozilla/dist/out/lib/libcrmf.a \
mozilla/dist/out/lib/libnsssysinit.so \
 ))
 $(eval $(call gb_ExternalPackage_add_libraries_for_install,nss,lib,\
commit 1d633ca8dd12add335d36ad09086f29f76574a40
Author: Michael Stahl 
Date:   Tue Oct 1 00:17:08 2013 +0200

postgresql: remove ExternalPackage

Change-Id: I8dadaf1f21bc16f6889a00a002c48cb3d93fbe01

diff --git a/postgresql/ExternalPackage_postgresql.mk 
b/postgresql/ExternalPackage_postgresql.mk
deleted file mode 100644
index 80ccbc9..000
--- a/postgresql/ExternalPackage_postgresql.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,postgresql,postgresql))
-
-$(eval $(call gb_ExternalPackage_use_external_project,postgresql,postgresql))
-
-ifeq ($(OS),WNT)
-$(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
-   src/interfaces/libpq/libpq.lib \
-))
-else
-$(eval $(call gb_ExternalPackage_add_files,postgresql,lib,\
-   src/interfaces/libpq/libpq.a \
-))
-endif
-# vim: set noet sw=4 ts=4:
diff --git a/postgresql/Module_postgresql.mk b/postgresql/Module_postgresql.mk
index 978cc06..80c8356 100644
--- a/postgresql/Module_postgresql.mk
+++ b/postgresql/Module_postgresql.mk
@@ -13,7 +13,6 @@ ifeq ($(SYSTEM_POSTGRESQL),NO)
 
 $(eval $(call gb_Module_add_targets,postgresql,\
ExternalProject_postgresql \
-   ExternalPackage_postgresql \
UnpackedTarball_postgresql \
 ))
 
commit cb177b6d798ce244ac35923f34fb93e8c8839ee3
Author: Michael Stahl 
Date:   Tue Oct 1 00:06:38 2013 +0200

libxmlsec: stop delivering static and import libraries

... and also check COM instead of CROSS_COMPILING.

Change-Id: I049c9211d4b6eabe4012f66d39d86c7b025dc18c

diff --git a/Repository.mk b/Repository.mk
index aaca80a..7e393d4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -652,12 +652,15 @@ $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, 
\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsec1 \
-   xmlsec1-nss \
 ))
-ifneq ($(CROSS_COMPILING),YES)
+ifeq ($(COM),MSC)
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
xmlsec1-mscrypto \
 ))
+else
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+   xmlsec1-nss \
+))
 endif
 endif
 
diff --git a/libxmlsec/ExternalPackage_xmlsec.mk 
b/libxmlsec/ExternalPackage_xmlsec.mk
index ca438c5..0655e97 100644
--- a/libxmlsec/ExternalPackage_xmlsec.mk
+++ b/libxmlsec/ExternalPackage_xmlsec.mk
@@ -13,24 +13,12 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,xmlsec,xmlsec))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),GCC)
-$(eval $(call 
gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1.dll.a,src/.libs/libxmlsec1.dll.a))
-$(eval $(call 
gb_ExternalPackage_add_file,xmlsec,lib/libxmlsec1-nss.dll.a,src/nss/.libs/libxmlsec1-nss.dll.a))
 $(eval $(call 
gb_ExternalPackage_add_library_for_install,xmlsec,lib/libxmlsec1.dll,src/.libs/libxmlsec1.dll))
 $(eval $(call 
gb_ExternalPackage_add_library_for_install,xmlsec,lib/libx

Pre-Configuration LibO

[Thomas Krumbein]

Hey all,

I tried to build an xcd-file to change some presettings in LibO.
Unfortunatly it doesn´t work. Maybe someone can give me some hints?

1. I wont to enable the experimental sidebar per default. All xcd-files
are UTF8 and LF coded, places in share/registry

My first approch:


http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:oor="http://openoffice.org/2001/registry";>


  

  

true

  

  



Doesn´t work.

Next approch:


http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:oor="http://openoffice.org/2001/registry";>


  

  

false


false


false


true


false


false


false


true


2


auto


1


true


false

  

  



(thats all the datas, which will be changes in the
registrymodification.xcu, if I do the change manually)

Doesn´t work.

2. Later I tried to change the CLT-Mode and activating support for asian
language - unfortunatly same result.

3. When I change the default font the following code works:


http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:oor="http://openoffice.org/2001/registry";>




Arial





So, what is going wrong in Nr. 1 and 2? Any hints?

Best regards
Thomas


-- 
## Unterstützung der freien Office Suite
## http://de.libreOffice.org  - www.LibreOffice.org
## Vorstand Freies Office Deutschland e.V.
## Mitglieder willkommen: www.FroDeV.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Stephan Bergmann]

 cppuhelper/source/compat.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f089d61c8576f271b2873b532170a6bd627c9e2
Author: Stephan Bergmann 
Date:   Tue Oct 1 00:07:23 2013 +0200

All the content of cppuhelper/source/compat.cxx must be in namespace cppu

Change-Id: I30dde10d1c299dbd9c0b2cb2fa025ce432df6cce
(cherry picked from commit 69f1846f4095a9dc607a0e568980d8625d657c94)
Reviewed-on: https://gerrit.libreoffice.org/6097
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index ab57a2a..3047c11 100644
--- a/cppuhelper/source/compat.cxx
+++ b/cppuhelper/source/compat.cxx
@@ -48,8 +48,6 @@ css::uno::Reference< css::lang::XMultiComponentFactory > 
bootstrapInitialSF(
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
-}
-
 SAL_DLLPUBLIC_EXPORT css::uno::Reference< css::uno::XComponentContext > 
SAL_CALL
 bootstrap_InitialComponentContext(
 css::uno::Reference< css::registry::XSimpleRegistry > const &,
@@ -86,4 +84,6 @@ createStandardClassWithSequence(
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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' - cppuhelper/source

[Stephan Bergmann]

 cppuhelper/source/compat.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 54f7c0ae8bd65100fa1fa6e574ed39247a8090dc
Author: Stephan Bergmann 
Date:   Tue Oct 1 00:07:23 2013 +0200

All the content of cppuhelper/source/compat.cxx must be in namespace cppu

(cherry picked from commit 69f1846f4095a9dc607a0e568980d8625d657c94)
Conflicts:
cppuhelper/source/compat.cxx

Change-Id: I30dde10d1c299dbd9c0b2cb2fa025ce432df6cce
Reviewed-on: https://gerrit.libreoffice.org/6098
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/cppuhelper/source/compat.cxx b/cppuhelper/source/compat.cxx
index c24a8a8..8d13116 100644
--- a/cppuhelper/source/compat.cxx
+++ b/cppuhelper/source/compat.cxx
@@ -26,6 +26,8 @@ using namespace ::com::sun::star;
 
 // Stubs for removed functionality, to be killed when we bump sal SONAME
 
+namespace cppu {
+
 SAL_DLLPUBLIC_EXPORT
 reflection::XIdlClass * SAL_CALL createStandardClassWithSequence(
const uno::Reference < lang::XMultiServiceFactory > &, const 
rtl::OUString &,
@@ -35,4 +37,6 @@ reflection::XIdlClass * SAL_CALL 
createStandardClassWithSequence(
 for (;;) { std::abort(); } // avoid "must return a value" warnings
 }
 
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Inadvertent cppuhelper ABI breakage in 4.0, 4.1

[Stephan Bergmann]

Just noticed that due to errors in cppuhelper/source/compat.cxx we 
inadvertently become backwards incompatible in the ABI of the cppuhelper 
dynamic library in LibreOffice 4.0 and 4.1.  However, this only affects 
symbols representing deprecated, unused C++ functions that we 
deliberately removed and for which we left aborting stubs in 
cppuhelper/source/compat.cxx (attempting to not deliberately break the ABI);



$ nm -D --def lo-3.6/core/solver/unxlngx6/lib/libuno_cppuhelpergcc3.so.3 | grep 
-vw V | cut -d' ' -f2- | LC_ALL=C sort > syms.3.6
$ nm -D --def lo-4.0/core/solver/unxlngx6/lib/libuno_cppuhelpergcc3.so.3 | grep 
-vw V | cut -d' ' -f2- | LC_ALL=C sort > syms.4.0
$ nm -D --def lo-4.1/core/solver/unxlngx6/lib/libuno_cppuhelpergcc3.so.3 | grep 
-vw V | cut -d' ' -f2- | LC_ALL=C sort > syms.4.1
$ nm -D --def lo/core/instdir/unxlngx6/ure/lib/libuno_cppuhelpergcc3.so.3 | grep 
-vw V | cut -d' ' -f2- | LC_ALL=C sort > syms.4.2
$ diff syms.3.6 syms.4.0 | grep '<'
< T 
_ZN4cppu31createStandardClassWithSequenceERKN3com3sun4star3uno9ReferenceINS2_4lang20XMultiServiceFactoryEEERKN3rtl8OUStringERKNS4_INS2_10reflection9XIdlClassEEERKNS3_8SequenceISB_EE
$ diff syms.3.6 syms.4.1 | grep '<'
< T _ZN4cppu20createNestedRegistryERKN3rtl8OUStringE
< T _ZN4cppu20createSimpleRegistryERKN3rtl8OUStringE
< T _ZN4cppu28createRegistryServiceFactoryERKN3rtl8OUStringES3_hS3_
< T 
_ZN4cppu31createStandardClassWithSequenceERKN3com3sun4star3uno9ReferenceINS2_4lang20XMultiServiceFactoryEEERKN3rtl8OUStringERKNS4_INS2_10reflection9XIdlClassEEERKNS3_8SequenceISB_EE
< T 
_ZN4cppu33bootstrap_InitialComponentContextERKN3com3sun4star3uno9ReferenceINS2_8registry15XSimpleRegistryEEERKN3rtl8OUStringE
$ diff syms.3.6 syms.4.2 | grep '<'
$


In a sense, it is a good thing that apparently nobody else noticed this.  ;)

I fixed that now on master towards LibreOffice 4.2 with 
 
"All the content of cppuhelper/source/compat.cxx must be in namespace 
cppu" and requested backports to libreoffice-4-0 
() and libreoffice-4-1 
() branches.


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

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

[Philipp Riemer]

 sw/source/core/doc/docftn.cxx |4 
 sw/source/core/doc/doctxm.cxx |2 --
 sw/source/core/doc/swserv.cxx |1 -
 3 files changed, 7 deletions(-)

New commits:
commit 623f89b373114b2034319a573184fe727fb1b33d
Author: Philipp Riemer 
Date:   Thu Sep 26 13:05:22 2013 +0200

remove commented-out code in sw/source/core/doc/

Change-Id: I9b2c39a905b566dc94d5187e0ca2d177390c0b64
Reviewed-on: https://gerrit.libreoffice.org/6075
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index d50ff9c..b87a8a6 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -283,14 +283,11 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
 {
 std::set aAllLayouts = GetAllLayouts();//swmod 080304
 if ( bFtnPos )
-//pTmpRoot->RemoveFtns();
 std::for_each( aAllLayouts.begin(), 
aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllRemoveFtns));//swmod 080305
 else
 {
-//pTmpRoot->UpdateFtnNums();
 std::for_each( aAllLayouts.begin(), 
aAllLayouts.end(),std::mem_fun(&SwRootFrm::UpdateFtnNums));//swmod 080304
 if ( bFtnDesc )
-//pTmpRoot->CheckFtnPageDescs( FALSE );
 std::for_each( aAllLayouts.begin(), 
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), 
sal_False));//swmod 080304
 if ( bExtra )
 {
@@ -357,7 +354,6 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
 if ( pTmpRoot )
 {
 if ( bFtnDesc )
-//pTmpRoot->CheckFtnPageDescs( TRUE );
 {
 std::set aAllLayouts = GetAllLayouts();
 std::for_each( aAllLayouts.begin(), 
aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::CheckFtnPageDescs), 
sal_True));//swmod 080304
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 83c90f6..510a890 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -408,8 +408,6 @@ const SwTOXBaseSection* SwDoc::InsertTableOf( sal_uLong 
nSttNd, sal_uLong nEndNd
 if(pSet)
 pFmt->SetFmtAttr(*pSet);
 
-//  --aEnd; // End is inclusive in InsertSection
-
 SwSectionNode *const pNewSectionNode =
 GetNodes().InsertTextSection(aStt, *pFmt, aSectionData, &rTOX, &aEnd);
 if (!pNewSectionNode)
diff --git a/sw/source/core/doc/swserv.cxx b/sw/source/core/doc/swserv.cxx
index 529f23e..6436440 100644
--- a/sw/source/core/doc/swserv.cxx
+++ b/sw/source/core/doc/swserv.cxx
@@ -252,7 +252,6 @@ sal_Bool SwServerObject::IsLinkInServer( const SwBaseLink* 
pChkLnk ) const
 }
 }
 if( !pChkLnk )
-//  *((int*)&eType) = eSave;
 ((SwServerObject*)this)->eType = eSave;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ooxmlimport.mk sw/qa

[Tushar Bende]

 sw/CppunitTest_sw_ooxmlimport.mk  |2 ++
 sw/qa/extras/ooxmlimport/data/chart-prop.docx |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |   14 ++
 3 files changed, 16 insertions(+)

New commits:
commit 7d637b71438921eaf97a66dfc46c6bc88d8aa5d6
Author: Tushar Bende 
Date:   Fri Sep 27 18:22:14 2013 +0530

Unit test case added to verify chart rendering in Writer for docx

Unit Test case to verify Width & Height of Chart rendered

Change-Id: I2899b9bdaf251f82400ebee273b23d09add4b468
Reviewed-on: https://gerrit.libreoffice.org/6056
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/CppunitTest_sw_ooxmlimport.mk b/sw/CppunitTest_sw_ooxmlimport.mk
index b558073..45cac9e 100644
--- a/sw/CppunitTest_sw_ooxmlimport.mk
+++ b/sw/CppunitTest_sw_ooxmlimport.mk
@@ -48,6 +48,8 @@ $(eval $(call gb_CppunitTest_use_ure,sw_ooxmlimport))
 
 $(eval $(call gb_CppunitTest_use_components,sw_ooxmlimport,\
basic/util/sb \
+chart2/source/controller/chartcontroller \
+chart2/source/chartcore \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
 embeddedobj/util/embobj \
diff --git a/sw/qa/extras/ooxmlimport/data/chart-prop.docx 
b/sw/qa/extras/ooxmlimport/data/chart-prop.docx
new file mode 100644
index 000..f9cddd4
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/chart-prop.docx 
differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index df6b0a1..f2ab2c4 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -136,6 +136,7 @@ public:
 void testGroupshapeSdt();
 void testDefaultSectBreakCols();
 void testFdo69636();
+void testChartProp();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -236,6 +237,7 @@ void Test::run()
 {"groupshape-sdt.docx", &Test::testGroupshapeSdt},
 {"default-sect-break-cols.docx", &Test::testDefaultSectBreakCols},
 {"fdo69636.docx", &Test::testFdo69636},
+{"chart-prop.docx", &Test::testChartProp},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1570,6 +1572,18 @@ void Test::testFdo69636()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(900), 
getProperty(getRun(getParagraphOfText(1, xFrame->getText()), 1), 
"CharRotation"));
 }
 
+void Test::testChartProp()
+{
+// The problem was that chart was not getting parsed in writer module.
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDrawPage(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount());
+
+uno::Reference xPropertySet(getShape(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(15236), 
getProperty(xPropertySet, "Width"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(8886), getProperty(xPropertySet, 
"Height"));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OLE object programming

[Olivier Hallot]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi

Em 01-10-2013 10:10, Miklos Vajna escreveu:
> Hi Shraddha,
> 
> On Tue, Sep 24, 2013 at 04:58:34PM +0530, Shraddha Gujarathi 
>  wrote:
>> I am inserting OLE object in Libreoffice but instead of icon I can see the
>> file content, how can I add icon to OLE object???
> 
> See this thread:
> 
> http://thread.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/53709/focus=53719
> 
> HTH,
> 
> Miklos
> 
> 

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


- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Kurfürstendamm 188, 10707 - Berlin, Germany
Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts
Legal details: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJSSoWJAAoJEJp3R7nH3vLx414IAKD1qOPIiG8Bnno6npaMY/MM
3w4D29m25nIAAabrzjtXDlXbJZKmNUWQJL5ixtNWM5YHdqIALbMgR4Afun07NxyR
7YMth6rrai4K8N2BI5QK96DpBskDAjFOkBWCd44QFduJ9BjOL6Sep8k1Ps2QHoL3
dbCbXdXOmd4CknSimax2QlJKNBg2O2oZj+obNtpAZRCkQaTvnqjF6Lc95e4nFJSc
QBRhv5NEaJgswgO7wkC+NZs6sCtO1TITSAIKkazBSt8AuQYFPzq2aZu8ikZIIzU1
w8QkYQ0UpMOZn7voSa9T6xQ4gEKAAe+DwVAaT6kAyuRN2wj7zvJC39E9qj//1Yk=
=mdvI
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Julien Nabet]

 svtools/source/graphic/grfcache.cxx |   35 ---
 1 file changed, 16 insertions(+), 19 deletions(-)

New commits:
commit f154d00206e55194308a7985348069f0d9058db3
Author: Julien Nabet 
Date:   Wed Sep 18 20:17:57 2013 +0200

Fix iterator management

Change-Id: I32ac35d3a4d0cc2376c5890086d1ff011442683d
Reviewed-on: https://gerrit.libreoffice.org/5998
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/svtools/source/graphic/grfcache.cxx 
b/svtools/source/graphic/grfcache.cxx
index f91b0fd..966cea8 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -955,30 +955,27 @@ void GraphicCache::ReleaseGraphicObject( const 
GraphicObject& rObj )
 {
 bRemoved = (*it)->ReleaseGraphicObjectReference( rObj );
 
-if( bRemoved )
+if( bRemoved && (0 == (*it)->GetGraphicObjectReferenceCount()) )
 {
-if( 0 == (*it)->GetGraphicObjectReferenceCount() )
+// if graphic cache entry has no more references,
+// the corresponding display cache object can be removed
+GraphicDisplayCacheEntryList::iterator it2 = 
maDisplayCache.begin();
+while( it2 != maDisplayCache.end() )
 {
-// if graphic cache entry has no more references,
-// the corresponding display cache object can be removed
-GraphicDisplayCacheEntryList::iterator it2 = 
maDisplayCache.begin();
-while( it2 != maDisplayCache.end() )
+GraphicDisplayCacheEntry* pDisplayEntry = *it2;
+if( pDisplayEntry->GetReferencedCacheEntry() == *it )
 {
-GraphicDisplayCacheEntry* pDisplayEntry = *it2;
-if( pDisplayEntry->GetReferencedCacheEntry() == *it )
-{
-mnUsedDisplaySize -= pDisplayEntry->GetCacheSize();
-it2 = maDisplayCache.erase( it2 );
-delete pDisplayEntry;
-}
-else
-++it2;
+mnUsedDisplaySize -= pDisplayEntry->GetCacheSize();
+it2 = maDisplayCache.erase( it2 );
+delete pDisplayEntry;
 }
-
-// delete graphic cache entry
-delete *it;
-it = maGraphicCache.erase( it );
+else
+++it2;
 }
+
+// delete graphic cache entry
+delete *it;
+it = maGraphicCache.erase( it );
 }
 else
 ++it;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: OLE object programming

[Miklos Vajna]

Hi Shraddha,

On Tue, Sep 24, 2013 at 04:58:34PM +0530, Shraddha Gujarathi 
 wrote:
> I am inserting OLE object in Libreoffice but instead of icon I can see the
> file content, how can I add icon to OLE object???

See this thread:

http://thread.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/53709/focus=53719

HTH,

Miklos


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

Re: Object Linking and Embedding in LibreOffice

[Miklos Vajna]

Hi Badal,

On Mon, Sep 30, 2013 at 09:20:21AM +0530, Badal Naik 
 wrote:
> for last few of months, I am working on LibreOffice Projects. My
> current pick up is developing "Display as icon" feature for
> Libreoffice. For that I am trying to understand the files/ folders
> responsible for handling inline embedding. I have studied "embedserv
> ,embeddedobj " folders, but not getting much out of it.
> Can you connect me to folks who developed inline embedding for OLE
> or guide me how can I go about that.

The icon is just another replacement graphics. See the attached document
for an example. What's missing is the UI for this. I would recommend
having a look at the ODF import or WW8 import filters on how do they do
this. You should do something similar for the UI as well, so users will
be create such "icons" in new documents.

Miklos


doc-in-doc.odt
Description: application/vnd.oasis.opendocument.text


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

Re: Adding syphon support to impress to allow access to the rendered output from other applications

[James Sheridan]

On 30/09/13 6:49 PM, Thorsten Behrens wrote:
so there is no ready-to-run texture for you, at least not now, and not 
in the general case. If a slideshow contains animations, naturally 
even when using opengl, you'd have a number of time-varying textures 
composited over another.
I was hoping these would all be drawn to a texture or framebuffer before 
being displayed on the screen


I wonder where the need for textures as such comes from - in the end 
you want the pixel, no? 
The texture or frame buffer is preferred as that means that everything 
stays on the GPU and won't hinder performance - otherwise I'd need to 
create a new texture on the GPU, fill it with the pixels and then give a 
pointer to this texture to syphon.   As you mentioned above most of the 
content is probably composited together on the GPU already which would 
mean if things were accessed as pixels they would also probably need to 
be copied from the GPU as well.


The stuff that gets blitted to screen is composited here: 
canvas/source/vcl/spritecanvashelper.cxx, method 
SpriteCanvasHelper::updateScreen() - look into maVDev there (but sure, 
on a Mac, that ends up in a texture eventually before reaching the 
display - at least the method above gets called exactly when new 
content arrives, and cobbles the pixel together) HTH, -- Thorsten 
Thanks a heap for this - sounds like it is what I need.   I'll have a 
play around during the week and get back to you and the list if I manage 
to get something working.


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

Re: Extensions no longer registered in master Linux 32bit

[Stephan Bergmann]

On 09/30/2013 07:56 PM, David Tardon wrote:

Extensions are created as .oxt archives during build. They must be
unpacked into the installation tree; the old installer handled this
through the infamous ARCHIVE flag in scp2, but gbuild does not do that.
When we replaced ARCHIVE by FILELIST half a year ago, I briefly
considered updating the extension handling stuff too, but it would have
been a nontrivial change with a high probability of regressions for a
minimal gain, so I decided not to.

Anyway, there is just 2-3 of them, so you can unpack them by hand if you
really need them (that was necessary in the dev-install times too, for
rebuilds, so there is no big change).


Especially as long as we have extension minimizer as a bundled extension 
(rather than as plain core code) that is included by default, I think we 
should make sure it properly ends up in instdir, so that any tests run 
against instdir can be confident to test the real thing.


Also, the more we move away from scp2 and to generating installation 
sets directly off instdir, at one point in the future we'll want to have 
the files to package up available in instdir anyway, no?  (But yeah, I 
don't really feel competent to do any necessary gbuild changes; also see 
my other mail.)


Stephan

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

Re: Extensions no longer registered in master Linux 32bit

[Stephan Bergmann]

[I just notice I inadvertently sent the below reply only to Alex, not to 
the list:]

 Original Message 
Subject: Re: Extensions no longer registered in master Linux 32bit
Date: Mon, 30 Sep 2013 12:17:36 +0200
From: Stephan Bergmann 
To: Alex Thurgood 

On 09/30/2013 09:48 AM, Alex Thurgood wrote:
> For some reason, extensions no longer appear to be registered as
> components since the switch to instdir.
>
> If I open Tools > Extensions, the Extension Manager shows an empty 
window.

>
> Running unopkg.bin from instdir also indicates that no extensions are
> registered.
>
> However, I see them in
> solver/unxlngi6.pro/bin/
>
> and also some of them in
> workdir/unxlngi6.pro/Extension

This is not specific to Linux 32bit.

With a "full-blown" build (--enable-ext-*, --with-myspell-dicts), the
only bundled extensions that currently show up as sub-directories of the
instdir share/extensions directory are ConvertTextToNumber and all the
dict-*s (and literally all of them, not only the ones corresponding to
--with-lang).

The workdir/*/Extension directory contains mysql-connector-ooo.oxt,
nlpsolver.oxt, presentation-minimizer.oxt, and wiki-publisher.oxt which
are generated via solenv/gbuild/Extension.mk.  Generating those
workdir/*/Extension/*.oxt files is unnecessary now---rather, the content
of those zip files could be placed into sub-directories of the instdir
share/extensions directory directly (and scp2 adapted accordingly).
However, there are other uses of Extension.mk
(desktop/Extension_test-passive.mk and
smoketest/Extension_TestExtension.mk) that shall still generate .oxt
files that must not be installed in instdir as bundled extensions.

The solver/*/bin directory contains (external) .oxt files that are put
there via extras/Package_extensions.mk.  Again, their content should
rather be unzipped into sub-directories of the instdir share/extensions
directory now (and scp2 adapted accordingly).

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

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

[Matteo Casalin]

 xmloff/source/style/impastpl.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 57d8250a96596678a0d5a3f1698385691f92cda8
Author: Matteo Casalin 
Date:   Tue Oct 1 08:20:59 2013 +0200

std::vector elements are default-initialized in constructor

Change-Id: I593c6c3236172f33b3e58fb44a41e079c3c8b0c4

diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx
index e52e00d..e67a354 100644
--- a/xmloff/source/style/impastpl.cxx
+++ b/xmloff/source/style/impastpl.cxx
@@ -630,12 +630,6 @@ void SvXMLAutoStylePoolP_Impl::exportXML(
 // which contains a parent-name and a SvXMLAutoStylePoolProperties_Impl
 std::vector aExpStyles(nCount);
 
-for( size_t i=0; i < nCount; i++ )
-{
-aExpStyles[i].mpParent = 0;
-aExpStyles[i].mpProperties = 0;
-}
-
 XMLAutoStyleFamily::ParentSetType::iterator it = 
rFamily.maParentSet.begin(), itEnd = rFamily.maParentSet.end();
 for (; it != itEnd; ++it)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits