[Libreoffice-commits] core.git: 3 commits - cui/source include/vcl vcl/inc vcl/source

[Noel Grandin]

 cui/source/dialogs/hangulhanjadlg.cxx |6 +++---
 cui/source/inc/hangulhanjadlg.hxx |6 +++---
 include/vcl/svapp.hxx |4 ++--
 vcl/inc/ilstbox.hxx   |4 ++--
 vcl/inc/svdata.hxx|2 +-
 vcl/source/app/svapp.cxx  |8 
 vcl/source/control/ilstbox.cxx|   22 +++---
 7 files changed, 30 insertions(+), 22 deletions(-)

New commits:
commit 2384be536466bba9d05f0546336c52c5b66bd9dc
Author: Noel Grandin n...@peralex.com
Date:   Wed Jul 24 16:43:46 2013 +0200

convert some XubString to OUString in Application

Change-Id: Ieed48339e9fc01796674691d5b0580a36df6e63e

diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c5a6707..886a414 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -232,8 +232,8 @@ public:
 static Window*  GetTopWindow( long nIndex );
 static Window*  GetActiveTopWindow();
 
-static void SetAppName( const String rUniqueName );
-static String   GetAppName();
+static void SetAppName( const OUString rUniqueName );
+static OUString GetAppName();
 static bool LoadBrandBitmap (const char* pName, BitmapEx 
rBitmap);
 
 // default name of the application for message dialogs and printing
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index e056031..a7db1f7 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -116,7 +116,7 @@ struct ImplSVAppData
 VclEventListeners*  mpEventListeners;   // listeners for vcl events 
(eg, extended toolkit)
 VclEventListeners*  mpKeyListeners; // listeners for key events 
only (eg, extended toolkit)
 ImplAccelManager*   mpAccelMgr; // Accelerator Manager
-XubString*  mpAppName;  // Application name
+OUString*   mpAppName;  // Application name
 OUString*   mpAppFileName;  // Abs. Application FileName
 OUString*   mpDisplayName;  // Application Display Name
 String* mpFontPath; // Additional Fontpath
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 8fd30f4..913a95c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -1225,20 +1225,20 @@ Window* Application::GetActiveTopWindow()
 
 // ---
 
-void Application::SetAppName( const XubString rUniqueName )
+void Application::SetAppName( const OUString rUniqueName )
 {
 ImplSVData* pSVData = ImplGetSVData();
 
 // create if does not exist
 if ( !pSVData-maAppData.mpAppName )
-pSVData-maAppData.mpAppName = new XubString( rUniqueName );
+pSVData-maAppData.mpAppName = new OUString( rUniqueName );
 else
 *(pSVData-maAppData.mpAppName) = rUniqueName;
 }
 
 // ---
 
-XubString Application::GetAppName()
+OUString Application::GetAppName()
 {
 ImplSVData* pSVData = ImplGetSVData();
 if ( pSVData-maAppData.mpAppName )
@@ -1270,7 +1270,7 @@ OUString Application::GetDisplayName()
 else if ( pSVData-maWinData.mpAppWin )
 return pSVData-maWinData.mpAppWin-GetText();
 else
-return ImplGetSVEmptyStr();
+return OUString();
 }
 
 // ---
commit d7cd7e89e36fc371b6a81d9065b3fa0b65eb822f
Author: Noel Grandin n...@peralex.com
Date:   Wed Jul 24 15:39:49 2013 +0200

convert vcl/ilistbox from XubString to OUString

Change-Id: Icfaea26c7bb82f449fc796dea80d12ffdf640a14

diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 89e2db0..06f8d62 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -129,8 +129,8 @@ public:
 ImplEntryType*  GetMutableEntryPtr( sal_uInt16 nPos ) const { 
return GetEntry( nPos ); }
 voidClear();
 
-sal_uInt16  FindMatchingEntry( const XubString rStr, sal_uInt16 
nStart = 0, sal_Bool bForward = sal_True, sal_Bool bLazy = sal_True ) const;
-sal_uInt16  FindEntry( const XubString rStr, sal_Bool 
bSearchMRUArea = sal_False ) const;
+sal_uInt16  FindMatchingEntry( const OUString rStr, sal_uInt16 
nStart = 0, sal_Bool bForward = sal_True, sal_Bool bLazy = sal_True ) const;
+sal_uInt16  FindEntry( const OUString rStr, sal_Bool 
bSearchMRUArea = sal_False ) const;
 sal_uInt16  FindEntry( const void* pData ) const;
 
 /// helper: add up heights up to index nEndIndex.
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index ac76319..f406d28 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -175,7 +175,7 @@ sal_uInt16 ImplEntryList::InsertEntry( sal_uInt16 nPos, 
ImplEntryType* pNewEntry
 {
 

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

[Marcos Paulo de Souza]

 starmath/inc/document.hxx|2 ++
 starmath/source/document.cxx |7 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit ef66cc105e0051fa1414b72c5ee2bf1b2f9331cb
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Thu Jul 25 01:14:03 2013 -0300

Fix memory leak in Math, by holding SmModel pointer

And deleting this in destructor of SmDocShell

Change-Id: Ida96648c7aae90fb5b0afac916587bbb049f90b3
Reviewed-on: https://gerrit.libreoffice.org/5088
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 4446ad0..f86207d 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -39,6 +39,7 @@
 #include format.hxx
 #include parse.hxx
 #include smmod.hxx
+#include unomodel.hxx
 
 class SmNode;
 class SfxMenuBarManager;
@@ -95,6 +96,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
 OUStringaText;
 SmFormataFormat;
 SmParseraInterpreter;
+SmModel*pModel;
 OUStringaAccText;
 SmNode *pTree;
 SfxMenuBarManager  *pMenuMgr;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index e49faec..edc635e 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -684,6 +684,7 @@ void SmDocShell::Repaint()
 
 SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
 SfxObjectShell( i_nSfxCreationFlags ),
+pModel  ( new SmModel(this) ),
 pTree   ( 0 ),
 pEditEngineItemPool ( 0 ),
 pEditEngine ( 0 ),
@@ -703,11 +704,9 @@ SmDocShell::SmDocShell( const sal_uInt64 
i_nSfxCreationFlags ) :
 StartListening(aFormat);
 StartListening(*pp-GetConfig());
 
-SetBaseModel( new SmModel(this) );
+SetBaseModel( pModel );
 }
 
-
-
 SmDocShell::~SmDocShell()
 {
 SAL_INFO( starmath, starmath: SmDocShell::~SmDocShell );
@@ -717,7 +716,6 @@ SmDocShell::~SmDocShell()
 EndListening(aFormat);
 EndListening(*pp-GetConfig());
 
-
 if(pCursor)
 delete pCursor;
 pCursor = NULL;
@@ -726,6 +724,7 @@ SmDocShell::~SmDocShell()
 SfxItemPool::Free(pEditEngineItemPool);
 delete pTree;
 delete pPrinter;
+delete pModel;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adam Co]

 sw/source/core/fields/docufld.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ff2e6e74d635b5411bc14ab27784457e47d9c06
Author: Adam Co rattles2...@gmail.com
Date:   Thu Jul 25 10:06:19 2013 +0300

fix for SwCombinedCharField constructor with wrong init

Change-Id: I71548e5fe60a8da8e89022b16a2f892900f3e4c2
Reviewed-on: https://gerrit.libreoffice.org/5089
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/core/fields/docufld.cxx 
b/sw/source/core/fields/docufld.cxx
index c8eb6f4..dae5ac7 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2509,7 +2509,7 @@ SwFieldType* SwCombinedCharFieldType::Copy() const
 SwCombinedCharField::SwCombinedCharField( SwCombinedCharFieldType* pFTyp,
 const OUString rChars )
 : SwField( pFTyp, 0 ),
-sCharacters( rChars.copy( 0, MAX_COMBINED_CHARACTERS ))
+sCharacters( rChars.copy( 0, std::minsal_Int32(rChars.getLength(), 
MAX_COMBINED_CHARACTERS) ))
 {
 }
 
___
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' - reportdesign/source

[Lionel Elie Mamane]

 reportdesign/source/core/api/ReportDefinition.cxx |   28 +++---
 reportdesign/source/filter/xml/xmlCell.cxx|8 +++---
 reportdesign/source/filter/xml/xmlExport.cxx  |   10 +--
 reportdesign/source/filter/xml/xmlHelper.cxx  |   10 +++
 4 files changed, 31 insertions(+), 25 deletions(-)

New commits:
commit 7520b77f18d1c20c6fc0dbeecaab2ca8311d27fd
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jul 24 23:32:54 2013 +0200

fdo#33617 adapt report engine to incompatible BorderLine2 change

Conflicts:
reportdesign/source/core/api/ReportDefinition.cxx
reportdesign/source/filter/xml/xmlHelper.cxx

Change-Id: I482e4b7b9f056247de3dae247d9328eb672eeba8
Reviewed-on: https://gerrit.libreoffice.org/5087
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 1825836..1c693ca 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -65,7 +65,7 @@
 #include com/sun/star/style/NumberingType.hpp
 #include com/sun/star/style/PageStyleLayout.hpp
 #include com/sun/star/style/XStyle.hpp
-#include com/sun/star/table/BorderLine.hpp
+#include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/table/ShadowFormat.hpp
 #include com/sun/star/task/InteractionHandler.hpp
 #include com/sun/star/task/ErrorCodeIOException.hpp
@@ -303,7 +303,7 @@ OStyle::OStyle()
 const sal_Int16 nNummeringType = style::NumberingType::ARABIC;
 const ::rtl::OUString sName(RTL_CONSTASCII_USTRINGPARAM(Default));
 const ::rtl::OUString sEmpty;
-const table::BorderLine eBorderLine(0,0,0,0);
+const table::BorderLine2 eBorderLine(0,0,0,0,0,0);
 const table::ShadowFormat eShadowFormat(table::ShadowLocation_NONE,0,0,0);
 const style::PageStyleLayout ePageStyleLayout = style::PageStyleLayout_ALL;
 const sal_Int32 nBound = beans::PropertyAttribute::BOUND;
@@ -317,7 +317,7 @@ OStyle::OStyle()
 registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,  
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,eGraphicLocation);
 registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,  
++i,nBound,::getBooleanCppuType() ,bTrue);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST),  
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER),  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,eBorderLine);
+registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER),  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,eBorderLine);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nMargin);
 registerPropertyNoMember(MAP_CHAR_LEN(DisplayName),   
++i,nBound,::getCppuType((rtl::OUString*)0) ,sEmpty);
@@ -328,20 +328,20 @@ OStyle::OStyle()
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), 
++i,nBound,::getBooleanCppuType() ,bTrue);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST),  
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR),  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,eBorderLine);
+registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR),  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,eBorderLine);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT),   
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC),  
++i,nBound,::getBooleanCppuType() ,bFalse);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON),   
++i,nBound,::getBooleanCppuType() ,bFalse);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED),   
++i,nBound,::getBooleanCppuType() ,bFalse);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR),  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,eBorderLine);
+registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR),  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,eBorderLine);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR),  
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
-

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

[Lionel Elie Mamane]

 reportdesign/source/core/api/ReportDefinition.cxx |   28 +++---
 reportdesign/source/filter/xml/xmlCell.cxx|8 +++---
 reportdesign/source/filter/xml/xmlExport.cxx  |   10 +--
 reportdesign/source/filter/xml/xmlHelper.cxx  |   10 +++
 4 files changed, 31 insertions(+), 25 deletions(-)

New commits:
commit ead5810d62f66443e03f28474e77519e19880ec0
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Wed Jul 24 23:32:54 2013 +0200

fdo#33617 adapt report engine to incompatible BorderLine2 change

Change-Id: I482e4b7b9f056247de3dae247d9328eb672eeba8
Reviewed-on: https://gerrit.libreoffice.org/5086
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index e715ed5..52a04ac 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -68,7 +68,7 @@
 #include com/sun/star/style/NumberingType.hpp
 #include com/sun/star/style/PageStyleLayout.hpp
 #include com/sun/star/style/XStyle.hpp
-#include com/sun/star/table/BorderLine.hpp
+#include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/table/ShadowFormat.hpp
 #include com/sun/star/task/InteractionHandler.hpp
 #include com/sun/star/task/ErrorCodeIOException.hpp
@@ -299,7 +299,7 @@ OStyle::OStyle()
 const sal_Int16 nNummeringType = style::NumberingType::ARABIC;
 const OUString sName(Default);
 const OUString sEmpty;
-const table::BorderLine eBorderLine(0,0,0,0);
+const table::BorderLine2 eBorderLine(0,0,0,0,0,0);
 const table::ShadowFormat eShadowFormat(table::ShadowLocation_NONE,0,0,0);
 const style::PageStyleLayout ePageStyleLayout = style::PageStyleLayout_ALL;
 const sal_Int32 nBound = beans::PropertyAttribute::BOUND;
@@ -313,7 +313,7 @@ OStyle::OStyle()
 registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,  
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,eGraphicLocation);
 registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,  
++i,nBound,::getBooleanCppuType() ,bTrue);
 registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST,  
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
-registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER,  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,eBorderLine);
+registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,eBorderLine);
 registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nMargin);
 registerPropertyNoMember(DisplayName,   
++i,nBound,::getCppuType((OUString*)0) ,sEmpty);
@@ -324,20 +324,20 @@ OStyle::OStyle()
 registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN, 
++i,nBound,::getBooleanCppuType() ,bTrue);
 registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST,  
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR,  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,eBorderLine);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,eBorderLine);
 registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT,   
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRDYNAMIC,  
++i,nBound,::getBooleanCppuType() ,bFalse);
 registerPropertyNoMember(SC_UNO_PAGE_FTRON,   
++i,nBound,::getBooleanCppuType() ,bFalse);
 registerPropertyNoMember(SC_UNO_PAGE_FTRSHARED,   
++i,nBound,::getBooleanCppuType() ,bFalse);
-registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR,  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,eBorderLine);
+registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,eBorderLine);
 registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR,  
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR, 
++i,nBound,::getCppuType((const table::BorderLine*)0) ,eBorderLine);
+registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR, 
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,eBorderLine);
 
registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::getCppuType((const
 sal_Int32*)0) ,nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,nZero);
 

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

[Jelle van der Waa]

 svl/source/numbers/zforlist.cxx|7 +--
 svtools/inc/pch/precompiled_svt.hxx|1 -
 svtools/source/config/apearcfg.cxx |3 ---
 svtools/source/config/fontsubstconfig.cxx  |3 ---
 svtools/source/config/helpopt.cxx  |2 --
 svtools/source/config/menuoptions.cxx  |2 --
 svtools/source/config/miscopt.cxx  |2 --
 svtools/source/config/slidesorterbaropt.cxx|2 --
 svtools/source/config/toolpanelopt.cxx |2 --
 svtools/source/misc/embedhlp.cxx   |6 ++
 svtools/source/misc/imagemgr.cxx   |5 -
 svtools/source/uno/popupmenucontrollerbase.cxx |1 -
 12 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit c0cffa68488afd07fa99f74631ae121aa87a7d32
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Wed Jul 24 22:26:27 2013 +0200

fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO

Change-Id: I74d3db1c53609c6079c63e3f04531a87da1dda9d
Reviewed-on: https://gerrit.libreoffice.org/5084
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 00a9a35..0442261 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -40,7 +40,6 @@
 
 #include unotools/syslocaleoptions.hxx
 #include unotools/digitgroupingiterator.hxx
-#include rtl/logfile.hxx
 #include rtl/instance.hxx
 #include rtl/strbuf.hxx
 
@@ -220,8 +219,6 @@ SvNumberFormatter::~SvNumberFormatter()
 
 void SvNumberFormatter::ImpConstruct( LanguageType eLang )
 {
-RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, svl, er93726, 
SvNumberFormatter::ImpConstruct );
-
 if ( eLang == LANGUAGE_DONTKNOW )
 {
 eLang = UNKNOWN_SUBSTITUTE;
@@ -3673,8 +3670,6 @@ void SvNumberFormatter::ImpInitCurrencyTable()
 }
 bInitializing = true;
 
-RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, svl, er93726, 
SvNumberFormatter::ImpInitCurrencyTable );
-
 LanguageType eSysLang = SvtSysLocale().GetLanguageTag().getLanguageType();
 LocaleDataWrapper* pLocaleData = new LocaleDataWrapper(
 ::comphelper::getProcessComponentContext(),
@@ -3696,7 +3691,7 @@ void SvNumberFormatter::ImpInitCurrencyTable()
 ::com::sun::star::uno::Sequence ::com::sun::star::lang::Locale  xLoc =
 LocaleDataWrapper::getInstalledLocaleNames();
 sal_Int32 nLocaleCount = xLoc.getLength();
-RTL_LOGFILE_CONTEXT_TRACE1( aTimeLog, number of locales: %ld, 
nLocaleCount );
+SAL_INFO( svl.numbers, number of locales: \  nLocaleCount  \ );
 Locale const * const pLocales = xLoc.getConstArray();
 NfCurrencyTable rCurrencyTable = theCurrencyTable::get();
 NfCurrencyTable rLegacyOnlyCurrencyTable = 
theLegacyOnlyCurrencyTable::get();
diff --git a/svtools/inc/pch/precompiled_svt.hxx 
b/svtools/inc/pch/precompiled_svt.hxx
index e6b7d39..e8df2b1 100644
--- a/svtools/inc/pch/precompiled_svt.hxx
+++ b/svtools/inc/pch/precompiled_svt.hxx
@@ -318,7 +318,6 @@
 #include rtl/bootstrap.hxx
 #include rtl/crc.h
 #include rtl/instance.hxx
-#include rtl/logfile.hxx
 #include rtl/math.hxx
 #include rtl/ref.hxx
 #include rtl/strbuf.hxx
diff --git a/svtools/source/config/apearcfg.cxx 
b/svtools/source/config/apearcfg.cxx
index fe09f97..b24c200 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -24,7 +24,6 @@
 #include tools/debug.hxx
 #include vcl/settings.hxx
 #include vcl/svapp.hxx
-#include rtl/logfile.hxx
 #include sal/macros.h
 
 #define DEFAULT_DRAGMODE2
@@ -53,8 +52,6 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
 ,bFontAntialiasing  ( sal_True )
 #endif
 {
-RTL_LOGFILE_CONTEXT(aLog, svtools 
SvtTabAppearanceCfg::SvtTabAppearanceCfg());
-
 const SequenceOUString rNames = GetPropertyNames();
 SequenceAny aValues = GetProperties(rNames);
 const Any* pValues = aValues.getConstArray();
diff --git a/svtools/source/config/fontsubstconfig.cxx 
b/svtools/source/config/fontsubstconfig.cxx
index b3ccb4f..eb189e4 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -23,7 +23,6 @@
 #include com/sun/star/uno/Sequence.hxx
 #include tools/debug.hxx
 #include vcl/outdev.hxx
-#include rtl/logfile.hxx
 
 #include boost/ptr_container/ptr_vector.hpp
 
@@ -53,8 +52,6 @@ SvtFontSubstConfig::SvtFontSubstConfig() :
 bIsEnabled(sal_False),
 pImpl(new SvtFontSubstConfig_Impl)
 {
-RTL_LOGFILE_CONTEXT(aLog, svtools 
SvtFontSubstConfig::SvtFontSubstConfig());
-
 SequenceOUString aNames(1);
 aNames.getArray()[0] = cReplacement;
 SequenceAny aValues = GetProperties(aNames);
diff --git a/svtools/source/config/helpopt.cxx 
b/svtools/source/config/helpopt.cxx
index a51ed04..aa1a874 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -28,7 +28,6 @@
 #include osl/mutex.hxx
 

[Libreoffice-commits] core.git: include/vcl svx/source unusedcode.easy vcl/source

[Marcos Paulo de Souza]

 include/vcl/bmpacc.hxx  |3 
 svx/source/sidebar/ColorPanel.cxx   |   28 ---
 svx/source/sidebar/ColorPanel.hxx   |2 
 svx/source/sidebar/area/AreaTransparencyGradientControl.cxx |   14 ---
 svx/source/sidebar/area/AreaTransparencyGradientControl.hxx |1 
 svx/source/sidebar/debug/ColorPanel.cxx |   28 ---
 svx/source/sidebar/debug/ColorPanel.hxx |2 
 svx/source/sidebar/debug/ContextPanel.cxx   |   15 ---
 svx/source/sidebar/debug/ContextPanel.hxx   |3 
 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx  |   10 --
 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx  |1 
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |   14 ---
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |1 
 svx/source/sidebar/text/TextCharacterSpacingControl.cxx |7 -
 svx/source/sidebar/text/TextCharacterSpacingControl.hxx |1 
 unusedcode.easy |8 --
 vcl/source/gdi/bmpacc3.cxx  |   47 
 17 files changed, 185 deletions(-)

New commits:
commit 6b0ea724538e2abbbdad7e8633e1c03a5e747427
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Wed Jul 24 11:06:48 2013 -0300

Remove some unused code form unusedcode.easy

Change-Id: Ib9f0bc7416c7f05684802ba2bb5f014a340fb2e8
Reviewed-on: https://gerrit.libreoffice.org/5068
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/include/vcl/bmpacc.hxx b/include/vcl/bmpacc.hxx
index f3f5301..a57377d 100644
--- a/include/vcl/bmpacc.hxx
+++ b/include/vcl/bmpacc.hxx
@@ -196,10 +196,7 @@ public:
 voidDrawRect( const Rectangle rRect );
 
 voidFillPolygon( const Polygon rPoly );
-voidDrawPolygon( const Polygon rPoly );
-
 voidFillPolyPolygon( const PolyPolygon rPoly );
-voidDrawPolyPolygon( const PolyPolygon rPolyPoly 
);
 
 private:
 
diff --git a/svx/source/sidebar/ColorPanel.cxx 
b/svx/source/sidebar/ColorPanel.cxx
index 92874c0..8eda421 100644
--- a/svx/source/sidebar/ColorPanel.cxx
+++ b/svx/source/sidebar/ColorPanel.cxx
@@ -50,34 +50,6 @@ ColorPanel::~ColorPanel (void)
 {
 }
 
-
-
-
-sal_Int32 ColorPanel::GetPreferredHeight (sal_Int32 nWidth)
-{
-sal_Int32 nPreferredHeight = 0;
-if (GetItemCount()0)
-{
-Image aImage = GetItemImage(GetItemId(0));
-Size aItemSize = CalcItemSizePixel (aImage.GetSizePixel());
-if (nWidth0  aItemSize.Width()0)
-{
-int nColumnCount = nWidth / aItemSize.Width();
-if (nColumnCount = 0)
-nColumnCount = 1;
-else if (nColumnCount  4)
-nColumnCount = 4;
-int nRowCount = (GetItemCount() + nColumnCount-1)
-/ nColumnCount;
-nPreferredHeight = nRowCount * aItemSize.Height();
-}
-}
-return nPreferredHeight;
-}
-
-
-
-
 void ColorPanel::Resize (void)
 {
 ::Window::Resize();
diff --git a/svx/source/sidebar/ColorPanel.hxx 
b/svx/source/sidebar/ColorPanel.hxx
index 4168dff..79b781c 100644
--- a/svx/source/sidebar/ColorPanel.hxx
+++ b/svx/source/sidebar/ColorPanel.hxx
@@ -49,8 +49,6 @@ private:
 */
 int CalculateRowCount (const Size rItemSize, int nColumnCount);
 void Fill (void);
-
-sal_Int32 GetPreferredHeight (sal_Int32 nWidth);
 };
 
 } } // end of namespace ::svx::sidebar
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx 
b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
index 92ebdee..8f1dd82 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx
@@ -111,20 +111,6 @@ 
AreaTransparencyGradientControl::~AreaTransparencyGradientControl (void)
 {
 }
 
-
-
-
-void AreaTransparencyGradientControl::ToGetFocus()
-{
-if(maMtrTrgrCenterX.IsVisible())
-maMtrTrgrCenterX.GrabFocus();
-else
-maMtrTrgrAngle.GrabFocus();
-}
-
-
-
-
 void AreaTransparencyGradientControl::Rearrange(XFillFloatTransparenceItem* 
pGradientItem)
 {
 InitStatus(pGradientItem);
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx 
b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
index 5d31d44..4b1e4ab 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx
@@ -37,7 +37,6 @@ public:
 AreaPropertyPanel rPanel);
 virtual ~AreaTransparencyGradientControl (void);
 
-void ToGetFocus();
 void Rearrange(XFillFloatTransparenceItem* pGradientItem);
 void 

[PATCH] fdo#67093 Change traduction of Header in it to avoid conflic...

[Arnaud Versini (via Code Review)]

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5092

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/translations 
refs/changes/92/5092/1

fdo#67093 Change traduction of Header in it to avoid conflict with Heading

Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
---
M source/it/sw/source/ui/utlui.po
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/source/it/sw/source/ui/utlui.po b/source/it/sw/source/ui/utlui.po
index 2553927..759ad55 100644
--- a/source/it/sw/source/ui/utlui.po
+++ b/source/it/sw/source/ui/utlui.po
@@ -126,7 +126,7 @@
 STR_HEADER\n
 string.text
 msgid Header
-msgstr Intestazione
+msgstr Riga d'intestazione
 
 #: attrdesc.src
 msgctxt 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
Gerrit-PatchSet: 1
Gerrit-Project: translations
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com

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

[PATCH libreoffice-4-1] fdo#67093 Change traduction of Header in it to avoid conflic...

[Arnaud Versini (via Code Review)]

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5093

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/translations 
refs/changes/93/5093/1

fdo#67093 Change traduction of Header in it to avoid conflict with Heading

Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
---
M source/it/sw/source/ui/utlui.po
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/source/it/sw/source/ui/utlui.po b/source/it/sw/source/ui/utlui.po
index d2c3a4c..822c92cc 100644
--- a/source/it/sw/source/ui/utlui.po
+++ b/source/it/sw/source/ui/utlui.po
@@ -126,7 +126,7 @@
 STR_HEADER\n
 string.text
 msgid Header
-msgstr Intestazione
+msgstr Riga d'intestazione
 
 #: attrdesc.src
 msgctxt 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
Gerrit-PatchSet: 1
Gerrit-Project: translations
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com

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

[Libreoffice-commits] core.git: translations

[Arnaud Versini]

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

New commits:
commit 08ba5200e74f71c7bed62886489514f14d098b8c
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Thu Jul 25 10:02:55 2013 +0200

Updated core
Project: translations  beb092fb3ee30faabbe1479279d8426900f53943

fdo#67093 Change traduction of Header in it to avoid conflict with Heading

Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
Reviewed-on: https://gerrit.libreoffice.org/5092
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/translations b/translations
index 8fe00a5..beb092f 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 8fe00a5faf3c817a8ec89a2cfc68114c456281bc
+Subproject commit beb092fb3ee30faabbe1479279d8426900f53943
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'libreoffice-4-1' - source/it

[Arnaud Versini]

 source/it/sw/source/ui/utlui.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e3fda6cf95975f43e5cc89b7b49a724a4ad059d
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Thu Jul 25 10:02:55 2013 +0200

fdo#67093 Change traduction of Header in it to avoid conflict with Heading

Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
Reviewed-on: https://gerrit.libreoffice.org/5093
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/source/it/sw/source/ui/utlui.po b/source/it/sw/source/ui/utlui.po
index d2c3a4c..822c92cc 100644
--- a/source/it/sw/source/ui/utlui.po
+++ b/source/it/sw/source/ui/utlui.po
@@ -126,7 +126,7 @@ msgctxt 
 STR_HEADER\n
 string.text
 msgid Header
-msgstr Intestazione
+msgstr Riga d'intestazione
 
 #: attrdesc.src
 msgctxt 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Arnaud Versini]

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

New commits:
commit da9fc8ed138bdcb5ebd65c5900e71a7f4e1ada74
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Thu Jul 25 10:02:55 2013 +0200

Updated core
Project: translations  7e3fda6cf95975f43e5cc89b7b49a724a4ad059d

fdo#67093 Change traduction of Header in it to avoid conflict with Heading

Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
Reviewed-on: https://gerrit.libreoffice.org/5093
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/translations b/translations
index b2d3ee8..7e3fda6 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b2d3ee8989e207e7263dc53fb0535cbd3414f03f
+Subproject commit 7e3fda6cf95975f43e5cc89b7b49a724a4ad059d
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: source/it

[Arnaud Versini]

 source/it/sw/source/ui/utlui.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit beb092fb3ee30faabbe1479279d8426900f53943
Author: Arnaud Versini arnaud.vers...@gmail.com
Date:   Thu Jul 25 10:02:55 2013 +0200

fdo#67093 Change traduction of Header in it to avoid conflict with Heading

Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
Reviewed-on: https://gerrit.libreoffice.org/5092
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/source/it/sw/source/ui/utlui.po b/source/it/sw/source/ui/utlui.po
index 2553927..759ad55 100644
--- a/source/it/sw/source/ui/utlui.po
+++ b/source/it/sw/source/ui/utlui.po
@@ -126,7 +126,7 @@ msgctxt 
 STR_HEADER\n
 string.text
 msgid Header
-msgstr Intestazione
+msgstr Riga d'intestazione
 
 #: attrdesc.src
 msgctxt 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua

[Tor Lillqvist]

 vcl/aqua/source/gdi/salnativewidgets.cxx |   63 ++-
 1 file changed, 54 insertions(+), 9 deletions(-)

New commits:
commit c64554aec5a90daa800dd3a70b777dca510c56dc
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jul 24 23:27:06 2013 +0300

fdo#46271: No arrows in scrollbars in OS X 10.7 and later

So no need to take them into account when calculating the geometries
of the scrollbar parts.

(cherry picked from commit e8c467d134c1c49d2b25c72fbd45dd1c6b77b171)

Change-Id: Ie8d4b3810743e6ff8c26aec3537638976f98
Reviewed-on: https://gerrit.libreoffice.org/5090
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx 
b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 3de4118..f52775b 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -135,26 +135,56 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */  
ControlPart nPart,
 switch( nPart )
 {
 case PART_BUTTON_UP:
-if( GetSalData()-mbIsScrollbarDoubleMax )
-rResultRect.Top() = rControlRect.Bottom() - 2*BUTTON_HEIGHT;
-rResultRect.Bottom() = rResultRect.Top() + BUTTON_HEIGHT;
+if (NSAppKitVersionNumber  NSAppKitVersionNumber10_7)
+{
+if( GetSalData()-mbIsScrollbarDoubleMax )
+rResultRect.Top() = rControlRect.Bottom() - 
2*BUTTON_HEIGHT;
+rResultRect.Bottom() = rResultRect.Top() + BUTTON_HEIGHT;
+}
+else
+{
+rResultRect.Bottom() = rResultRect.Top();
+}
 break;
 
 case PART_BUTTON_DOWN:
-rResultRect.Top() = rControlRect.Bottom() - BUTTON_HEIGHT;
+if (NSAppKitVersionNumber  NSAppKitVersionNumber10_7)
+{
+rResultRect.Top() = rControlRect.Bottom() - BUTTON_HEIGHT;
+}
+else
+{
+rResultRect.Top() = rResultRect.Bottom();
+}
 break;
 
 case PART_BUTTON_LEFT:
-if( GetSalData()-mbIsScrollbarDoubleMax )
-rResultRect.Left() = rControlRect.Right() - 2*BUTTON_WIDTH;
-rResultRect.Right() = rResultRect.Left() + BUTTON_WIDTH;
+if (NSAppKitVersionNumber  NSAppKitVersionNumber10_7)
+{
+if( GetSalData()-mbIsScrollbarDoubleMax )
+rResultRect.Left() = rControlRect.Right() - 2*BUTTON_WIDTH;
+rResultRect.Right() = rResultRect.Left() + BUTTON_WIDTH;
+}
+else
+{
+rResultRect.Right() = rResultRect.Left();
+}
 break;
 
 case PART_BUTTON_RIGHT:
-rResultRect.Left() = rControlRect.Right() - BUTTON_WIDTH;
+if (NSAppKitVersionNumber  NSAppKitVersionNumber10_7)
+{
+rResultRect.Left() = rControlRect.Right() - BUTTON_WIDTH;
+}
+else
+{
+rResultRect.Left() = rResultRect.Right();
+}
 break;
 
 case PART_TRACK_HORZ_AREA:
+if (NSAppKitVersionNumber = NSAppKitVersionNumber10_7)
+break;
 rResultRect.Right() -= BUTTON_WIDTH + 1;
 if( GetSalData()-mbIsScrollbarDoubleMax )
 rResultRect.Right() -= BUTTON_WIDTH;
@@ -163,6 +193,8 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */  
ControlPart nPart,
 break;
 
 case PART_TRACK_VERT_AREA:
+if (NSAppKitVersionNumber = NSAppKitVersionNumber10_7)
+break;
 rResultRect.Bottom() -= BUTTON_HEIGHT + 1;
 if( GetSalData()-mbIsScrollbarDoubleMax )
 rResultRect.Bottom() -= BUTTON_HEIGHT;
@@ -170,6 +202,8 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */  
ControlPart nPart,
 rResultRect.Top() += BUTTON_HEIGHT + 1;
 break;
 case PART_THUMB_HORZ:
+if (NSAppKitVersionNumber = NSAppKitVersionNumber10_7)
+break;
 if( GetSalData()-mbIsScrollbarDoubleMax )
 {
 rResultRect.Left() += 8;
@@ -182,6 +216,8 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */  
ControlPart nPart,
 }
 break;
 case PART_THUMB_VERT:
+if (NSAppKitVersionNumber = NSAppKitVersionNumber10_7)
+break;
 if( GetSalData()-mbIsScrollbarDoubleMax )
 {
 rResultRect.Top() += 8;
@@ -194,24 +230,32 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */  
ControlPart nPart,
 }
 break;
 case PART_TRACK_HORZ_LEFT:
+if (NSAppKitVersionNumber = NSAppKitVersionNumber10_7)
+  

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/data/fdo60990.odt   |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   15 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |   16 ++--
 3 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit 6d67b812403e1c22ee09b70dddf6b2ac13e73b58
Author: Miklos Vajna vmik...@suse.cz
Date:   Wed Jul 24 16:15:51 2013 +0200

fdo#60990 VML export: handle paragraph/run properties of shape text

(cherry picked from commits 1753c4f9f1713ca4a9a1ac3a145269c850eef6fb,
0ffed545adbb8a27a024d4d6a74dcaa8a87ba66a and
94b3ec0597ee21b933d02496402ff0f3a416e6a3)

Change-Id: Iaeb7f9826308ea94a036cb4bfa87bf65f0cfe22f
Reviewed-on: https://gerrit.libreoffice.org/5094
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/qa/extras/ooxmlexport/data/fdo60990.odt 
b/sw/qa/extras/ooxmlexport/data/fdo60990.odt
new file mode 100644
index 000..c855f32
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo60990.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 4a58bf1..2ed291f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -72,6 +72,7 @@ public:
 void testI120928();
 void testN822175();
 void testFdo58577();
+void testFdo60990();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX)  !defined(WNT)
@@ -121,6 +122,7 @@ void Test::run()
 {i120928.docx, Test::testI120928},
 {n822175.odt, Test::testN822175},
 {fdo58577.odt, Test::testFdo58577},
+{fdo60990.odt, Test::testFdo60990},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -694,6 +696,19 @@ void Test::testFdo58577()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess-getCount());
 }
 
+void Test::testFdo60990()
+{
+// The shape had no background, no paragraph adjust and no font color.
+uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Referencecontainer::XIndexAccess 
xDraws(xDrawPageSupplier-getDrawPage(), uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xShape(xDraws-getByIndex(0), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00CFE7F5), getPropertysal_Int32(xShape, 
BackColor));
+uno::Referencetext::XText xText = 
uno::Referencetext::XTextRange(xShape, uno::UNO_QUERY)-getText();
+uno::Referencetext::XTextRange xParagraph = getParagraphOfText(1, xText);
+CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, 
static_caststyle::ParagraphAdjust(getPropertysal_Int16(xParagraph, 
ParaAdjust)));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00FF00), 
getPropertysal_Int32(getRun(xParagraph, 1), CharColor));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 153580c..08d79f0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2635,7 +2635,7 @@ void DocxAttributeOutput::WriteOutliner(const 
OutlinerParaObject rParaObj)
 
 sal_Int32 nPara = rEditObj.GetParagraphCount();
 
-m_pSerializer-startElementNS( XML_w, XML_textbox, FSEND );
+m_pSerializer-startElementNS( XML_v, XML_textbox, FSEND );
 m_pSerializer-startElementNS( XML_w, XML_txbxContent, FSEND );
 for (sal_Int32 n = 0; n  nPara; ++n)
 {
@@ -2647,12 +2647,24 @@ void DocxAttributeOutput::WriteOutliner(const 
OutlinerParaObject rParaObj)
 xub_StrLen nEnd = aStr.Len();
 
 m_pSerializer-startElementNS( XML_w, XML_p, FSEND );
+
+// Write paragraph properties.
+m_pSerializer-startElementNS(XML_w, XML_pPr, FSEND);
+aAttrIter.OutParaAttr(false);
+m_pSerializer-endElementNS(XML_w, XML_pPr);
+
 do {
 xub_StrLen nNextAttr = aAttrIter.WhereNext();
 if( nNextAttr  nEnd )
 nNextAttr = nEnd;
 
 m_pSerializer-startElementNS( XML_w, XML_r, FSEND );
+
+// Write run properties.
+m_pSerializer-startElementNS(XML_w, XML_rPr, FSEND);
+aAttrIter.OutAttr(nAktPos);
+m_pSerializer-endElementNS(XML_w, XML_rPr);
+
 bool bTxtAtr = aAttrIter.IsTxtAttr( nAktPos );
 if( !bTxtAtr )
 {
@@ -2669,7 +2681,7 @@ void DocxAttributeOutput::WriteOutliner(const 
OutlinerParaObject rParaObj)
 m_pSerializer-endElementNS( XML_w, XML_p );
 }
 m_pSerializer-endElementNS( XML_w, XML_txbxContent );
-m_pSerializer-endElementNS( XML_w, XML_textbox );
+m_pSerializer-endElementNS( XML_v, XML_textbox );
 }
 
 oox::drawingml::DrawingML DocxAttributeOutput::GetDrawingML()
___
Libreoffice-commits mailing list

[PUSHED libreoffice-4-1] fdo#67093 Change traduction of Header in it to avoid conflic...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/5093

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
Gerrit-PatchSet: 2
Gerrit-Project: translations
Gerrit-Branch: libreoffice-4-1
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

[PUSHED] fdo#67093 Change traduction of Header in it to avoid conflic...

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/5092

Approvals:
  Fridrich Strba: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2c7d4c7df2f492a6a10081c9ed4e99ac9e61e73
Gerrit-PatchSet: 2
Gerrit-Project: translations
Gerrit-Branch: master
Gerrit-Owner: Arnaud Versini arnaud.vers...@gmail.com
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org

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

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

[Tor Lillqvist]

 sc/source/ui/inc/reffact.hxx |   20 
 1 file changed, 16 insertions(+), 4 deletions(-)

New commits:
commit 964da7bd8f8a9cc0615ad19784861b8dee61bb80
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jul 25 11:18:11 2013 +0300

WaE: C4510: default constructor could not be generated)

So declare (but don't define) a default constructor so that the
compiler doesn't have to attempt to generate one.

Thanks to Stephan and Lubos.

Change-Id: Ic3dd5add26d774dcbaca65be9a409e766c5f9f9f

diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx
index eb131e3..08d191b 100644
--- a/sc/source/ui/inc/reffact.hxx
+++ b/sc/source/ui/inc/reffact.hxx
@@ -55,19 +55,31 @@ DECL_WRAPPER_WITHID(ScHighlightChgDlgWrapper)
 
 class ScDescriptiveStatisticsDialogWrapper :
 public ChildWindowWrapperSID_DESCRIPTIVE_STATISTICS_DIALOG
-{};
+{
+private:
+ScDescriptiveStatisticsDialogWrapper() SAL_DELETED_FUNCTION;
+};
 
 class ScSamplingDialogWrapper :
 public ChildWindowWrapperSID_SAMPLING_DIALOG
-{};
+{
+private:
+ScSamplingDialogWrapper() SAL_DELETED_FUNCTION;
+};
 
 class ScRandomNumberGeneratorDialogWrapper :
 public ChildWindowWrapperSID_RANDOM_NUMBER_GENERATOR_DIALOG
-{};
+{
+private:
+ScRandomNumberGeneratorDialogWrapper() SAL_DELETED_FUNCTION;
+};
 
 class ScAnalysisOfVarianceDialogWrapper :
 public ChildWindowWrapperSID_ANALYSIS_OF_VARIANCE_DIALOG
-{};
+{
+private:
+ScAnalysisOfVarianceDialogWrapper() SAL_DELETED_FUNCTION;
+};
 
 
 class ScAcceptChgDlgWrapper: public SfxChildWindow
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig

[Cor Nouws]

 include/sfx2/sfxcommands.h   |1 +
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |5 
+
 sc/uiconfig/scalc/menubar/menubar.xml|8 
+++-
 sd/uiconfig/sdraw/menubar/menubar.xml|8 
+++-
 sd/uiconfig/simpress/menubar/menubar.xml |8 
+++-
 sw/uiconfig/sglobal/menubar/menubar.xml  |8 
+++-
 sw/uiconfig/sweb/menubar/menubar.xml |8 
+++-
 sw/uiconfig/swform/menubar/menubar.xml   |8 
+++-
 sw/uiconfig/swreport/menubar/menubar.xml |8 
+++-
 sw/uiconfig/swriter/menubar/menubar.xml  |8 
+++-
 sw/uiconfig/swxform/menubar/menubar.xml  |8 
+++-
 11 files changed, 69 insertions(+), 9 deletions(-)

New commits:
commit 12a034623e015ca05b56c82ebb63230ce731bab4
Author: Cor Nouws oo...@nouenoff.nl
Date:   Fri Jun 14 17:35:25 2013 +0200

fdo#59427 first step for template menu

takes care for File  Template  Save and File  Template  Manage
however the menu for the latter comes from uno:NewDoc and thus has
to be changed  TODO

Change-Id: I0600847724fc5ccb3ef13d57355d8eb54970cc9b
Reviewed-on: https://gerrit.libreoffice.org/4284
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/include/sfx2/sfxcommands.h b/include/sfx2/sfxcommands.h
index 78cbd7a..4d4a9d3 100644
--- a/include/sfx2/sfxcommands.h
+++ b/include/sfx2/sfxcommands.h
@@ -50,6 +50,7 @@
 #define CMD_SID_CHECKIN .uno:CheckIn
 #define CMD_SID_OPENURL .uno:OpenUrl
 #define CMD_SID_OPTIONS .uno:Options
+#define CMD_SID_TEMPLATE_MENU   .uno:TemplateMenu
 #define CMD_SID_ORGANIZER   .uno:Organizer
 #define CMD_SID_PASTE   .uno:Paste
 #define CMD_SID_PASTE_SPECIAL   .uno:PasteSpecial
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 241e43e..809cee0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5594,6 +5594,11 @@
   value xml:lang=en-USTemplate Manager/value
 /prop
   /node
+  node oor:name=.uno:TemplateMenu oor:op=replace
+prop oor:name=Label oor:type=xs:string
+  value xml:lang=en-US~Templates/value
+/prop
+  /node
   node oor:name=.uno:ExternalEdit oor:op=replace
 prop oor:name=Label oor:type=xs:string
   value xml:lang=en-USEdit with External Tool/value
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index b217702..a45cf12 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -25,10 +25,16 @@
 menu:menuseparator/
 menu:menuitem menu:id=.uno:AutoPilotMenu/
 menu:menuseparator/
+menu:menu menu:id=.uno:TemplateMenu
+menu:menupopup
+menu:menuitem menu:id=.uno:SaveAsTemplate/
+menu:menuitem menu:id=.uno:NewDoc/
+/menu:menupopup
+/menu:menu
+menu:menuseparator/
 menu:menuitem menu:id=.uno:CloseDoc/
 menu:menuitem menu:id=.uno:Save/
 menu:menuitem menu:id=.uno:SaveAs/
-menu:menuitem menu:id=.uno:SaveAsTemplate/
 menu:menuitem menu:id=.uno:SaveAll/
 menu:menuitem menu:id=.uno:CheckOut/
 menu:menuitem menu:id=.uno:CancelCheckOut/
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 0f2d312..c3021faf 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -25,10 +25,16 @@
   menu:menuseparator/
   menu:menuitem menu:id=.uno:AutoPilotMenu/
   menu:menuseparator/
+menu:menu menu:id=.uno:TemplateMenu
+menu:menupopup
+menu:menuitem menu:id=.uno:SaveAsTemplate/
+menu:menuitem menu:id=.uno:NewDoc/
+/menu:menupopup
+/menu:menu
+  menu:menuseparator/
   menu:menuitem menu:id=.uno:CloseDoc/
   menu:menuitem menu:id=.uno:Save/
   menu:menuitem menu:id=.uno:SaveAs/
-  menu:menuitem menu:id=.uno:SaveAsTemplate/
   menu:menuitem menu:id=.uno:SaveAll/
   menu:menuitem menu:id=.uno:CheckOut/
   menu:menuitem menu:id=.uno:CancelCheckOut/
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 

Re: [GSoC] Impress Remote and Bonjour

[Thorsten Behrens]

Michael Meeks wrote:
   Has anyone managed to help you with some code pointers here yet ?

Was talking that over with Siqi on irc already - for something that
moves on screen, XSprite is the thing to use. ;)

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: starmath/inc starmath/source

[Fridrich Strba]

 starmath/inc/document.hxx|2 --
 starmath/source/document.cxx |7 ---
 2 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 5dd1cd72f45df0ec13842d4ee9c849726cb74ea9
Author: Fridrich Strba fridr...@documentfoundation.org
Date:   Thu Jul 25 08:55:35 2013 +

Revert Fix memory leak in Math, by holding SmModel pointer

Breaks unit tests of rtf import

This reverts commit ef66cc105e0051fa1414b72c5ee2bf1b2f9331cb

Change-Id: I95c13fc2bc3f9494a33153c62a7d52eb6f8efdd9
Reviewed-on: https://gerrit.libreoffice.org/5095
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index f86207d..4446ad0 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -39,7 +39,6 @@
 #include format.hxx
 #include parse.hxx
 #include smmod.hxx
-#include unomodel.hxx
 
 class SmNode;
 class SfxMenuBarManager;
@@ -96,7 +95,6 @@ class SmDocShell : public SfxObjectShell, public SfxListener
 OUStringaText;
 SmFormataFormat;
 SmParseraInterpreter;
-SmModel*pModel;
 OUStringaAccText;
 SmNode *pTree;
 SfxMenuBarManager  *pMenuMgr;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index edc635e..e49faec 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -684,7 +684,6 @@ void SmDocShell::Repaint()
 
 SmDocShell::SmDocShell( const sal_uInt64 i_nSfxCreationFlags ) :
 SfxObjectShell( i_nSfxCreationFlags ),
-pModel  ( new SmModel(this) ),
 pTree   ( 0 ),
 pEditEngineItemPool ( 0 ),
 pEditEngine ( 0 ),
@@ -704,9 +703,11 @@ SmDocShell::SmDocShell( const sal_uInt64 
i_nSfxCreationFlags ) :
 StartListening(aFormat);
 StartListening(*pp-GetConfig());
 
-SetBaseModel( pModel );
+SetBaseModel( new SmModel(this) );
 }
 
+
+
 SmDocShell::~SmDocShell()
 {
 SAL_INFO( starmath, starmath: SmDocShell::~SmDocShell );
@@ -716,6 +717,7 @@ SmDocShell::~SmDocShell()
 EndListening(aFormat);
 EndListening(*pp-GetConfig());
 
+
 if(pCursor)
 delete pCursor;
 pCursor = NULL;
@@ -724,7 +726,6 @@ SmDocShell::~SmDocShell()
 SfxItemPool::Free(pEditEngineItemPool);
 delete pTree;
 delete pPrinter;
-delete pModel;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/config

[Miklos Vajna]

 odk/config/configure.pl |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 475587e31821d9b8d89698ec5b0e5a6160ec3b5f
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 25 10:53:12 2013 +0200

odk: let configure find the office path by default on dev-install

Change-Id: I50a698a16b8487945b4928d2c0e1c33c00c7641d

diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 04bfb4b..588f80b 100755
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -734,6 +734,13 @@ sub searchoffice
 return $officepath;
 }
 
+# Before trying versioned directories, check if the sdk is directly under
+# the office path.
+$officepath = $main::sdkpath . /..;
+if (-d $officepath  -e $officepath/program/soffice) {
+return $officepath;
+}
+
 my $tmpversion = $main::OO_MAJORVERSION + 6;
 if ( $main::OO_MINORVERSION  0) {
 $tmpversion = $tmpversion.$main::OO_MINORVERSION;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - instsetoo_native/inc_openoffice scp2/source solenv/bin

[Fridrich Štrba]

 instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt |4 
 scp2/source/base/folderitem_base.scp   |6 
 scp2/source/calc/folderitem_calc.scp   |6 
 scp2/source/draw/folderitem_draw.scp   |6 
 scp2/source/impress/folderitem_impress.scp |6 
 scp2/source/math/folderitem_math.scp   |6 
 scp2/source/ooo/folderitem_ooo.scp |   12 
 scp2/source/writer/folderitem_writer.scp   |6 
 solenv/bin/modules/installer.pm|8 
 solenv/bin/modules/installer/windows/idtglobal.pm  |   10 
 solenv/bin/modules/installer/windows/msishortcutproperty.pm|  143 
++
 solenv/bin/modules/par2script/globals.pm   |6 
 solenv/bin/modules/pre2par/globals.pm  |4 
 13 files changed, 218 insertions(+), 5 deletions(-)

New commits:
commit 0fa175d2ce8a0d21fced2c5f61528797d919c0fa
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jul 23 21:34:06 2013 +0200

fdo#35785: Add MsiShortcutProperty table to the installer

This sets the different IDs for shortcuts and should help the jump-lists

WIP: data for the new MsiShortcutProperty installer table

Change-Id: If421383abe95738b8247aebc5cf43b1eaa346c39
(cherry picked from commit 20696b2a5741fcda3b9cff5fb41da4d2688312c4)

OK, so this was not just a bogus stray mess :)

Change-Id: I39287c4bf882438c409157ab5e4fa586f5289c5c
(cherry picked from commit 6c098943d600db20640264d52792c09ae336fdfb)

Some more fixups towards the MsiShortcutProperty table

Change-Id: I961a2c05c175512ee1fb4b0f11d0da1d5eae1c71
(cherry picked from commit 7137605eefb6b4efe80c89c4468e33591b1e474f)

Some more typos in perl code

Change-Id: I2123a6f4cbac0c4870495a70f5f283b75d3a5191
(cherry picked from commit 748be656846d5d698a47f63735f2ef58763a1ef6)

And a bit more of fixes

Change-Id: Ib247391d83773cddc18e37d5e979552a13dd19eb
(cherry picked from commit b36d311899fde2f80e22bcc034ab8c9bdd795b76)

Another typo

Change-Id: I57a9592359a171eb3a6f230f5de2dc44a44b7181
(cherry picked from commit 045a7c675d04c258fdf97c6178ca9ad106d47deb)

Hopefully the last installement of my perl saga

Change-Id: I2d437062e3ce468591621e7323cacb13789edf06
(cherry picked from commit 6205c58e262e9b82e815855199de462775fcd35b)

And my hope was not true

Change-Id: I41877db65b66fa3732040fc21f98a5f2be2fdcb7
(cherry picked from commit d72151ff930ff1961f2ab7b1e895958cdaabe91b)
Reviewed-on: https://gerrit.libreoffice.org/5081
Reviewed-by: Jesús Corrius jcorr...@gmail.com
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
index 193873a..c5945ae 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/_Validat.idt
@@ -296,6 +296,10 @@ MsiFileHashHashPart2   N   
Size of file in bytes (long integer).
 MsiFileHashHashPart3   N   
Size of file in bytes (long integer).
 MsiFileHashHashPart4   N   
Size of file in bytes (long integer).
 MsiFileHashOptions N   0   32767   
Various options and attributes for this hash.
+MsiShortcutPropertyMsiShortcutProperty N   
Identifier  Unique identifier for this row of the 
MsiShortcutProperty table
+MsiShortcutPropertyShortcut_   N   
Identifier  A key into the Shortcut table that identifies the 
shortcut having a property set
+MsiShortcutPropertyPropertyKey N   
Formatted   A string value that provides information for the 
PROPERTYKEY structure
+MsiShortcutPropertyPropVariantValueN   
Formatted   A string value that provides information for 
the PROPVARIANT structure.
 ODBCAttribute  Attribute   N   Text
Name of ODBC driver attribute
 ODBCAttribute  Driver_ N   ODBCDriver  1   
Identifier  Reference to ODBC driver in ODBCDriver table
 ODBCAttribute  Value   Y   Text
Value for ODBC driver attribute
diff --git 

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

[Tor Lillqvist]

 sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92442a9276e58f0c82e0a84fa4c47f549f25b629
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jul 25 13:07:57 2013 +0300

WaE: default constructor could not be generated (because of const member(s))

The aCalculationNameId member doesn't need to be const, the data in
the lclCalcDefinitions array (which is the only use for the
StatisticCalculation struct) will be const anyway because the array is
const.

(The aFormula member isn't const, it's a pointer to const chars;))

Change-Id: I8b2549009d72a4b7df992651597247dff2c45be9

diff --git a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx 
b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
index ed9d57b..b4d8915 100644
--- a/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx
@@ -33,7 +33,7 @@ namespace
 {
 
 struct StatisticCalculation {
-const sal_Int16 aCalculationNameId;
+sal_Int16 aCalculationNameId;
 const char* aFormula;
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Michael Meeks michael.me...@novell.com changed:

   What|Removed |Added

 Depends on||67297

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

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

[Ivan Timofeev]

 sw/source/ui/ribbar/workctrl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a645a14cf46a1160c426052823772ad117f0bd8b
Author: Ivan Timofeev timofeev@gmail.com
Date:   Thu Jul 25 14:58:42 2013 +0400

Related: fdo#67113 restore some code, it has side effects

these lines were removed in 8275c8fc33b63aa40a0a8a8c215f32b9986edab6

fixes missing AutoText menu entries and AutoText insertion via menu

Change-Id: Ifa498d1cbfc096cca7751de9c9667fda6f1b3b48

diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index b7d959c..384db99 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -207,6 +207,7 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 {
 // Acquire group name with path extension
 String sTitle;
+pGlossaryList-GetGroupName(i - 1, sal_False, sTitle);
 sal_uInt16 nBlockCount = pGlossaryList-GetBlockCount(i 
-1);
 if(nBlockCount)
 {
@@ -303,6 +304,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
 SwGlossaryList* pGlossaryList = ::GetGlossaryList();
 String sShortName;
 String sGroup = pGlossaryList-GetGroupName(nBlock - 1, false);
+pGlossaryList-GetBlockName(nBlock - 1, nId - (100 * nBlock) - 1, 
sShortName);
 
 SwGlossaryHdl* pGlosHdl = pView-GetGlosHdl();
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] Impress Remote and Bonjour

[Siqi Liu]

Hello Michael and Thorsten,

I'm now working on refactoring the Avahi/Bonjour integration to get a
platform independent abstraction for publishing zeroconf service. And I
will move on to continue with the pointer functionality once I've finished
the Avahi/Bonjour one.

I've already attempted to follow the example of
engine/slideshow/waitsymbol.cxx as pointed out by Thorsten but I am a bit
lost here when it comes to calling the setPointerVisble and
setPointerPosition methods that I've defined in
ui/source/slideshow/slideshowImpl, from within the Receiver.cxx class in
source/remotecontrol.

The problem is that I only have access to XPresentation2 and
XSlideShowController interface and I don't know how can we call those
methods defined in the slideshowImpl...I've git grep for other methods
defined in the slideshowImp but it seems that they are called from no where
outside the class itself... maybe I've made some silly mistakes by defining
those methods in the slideshowImpl in the first place?

It has become much more complicated when it comes to coding on the
LibreOffice code base itself than coding in my little corner for the iOS ^^
But I'll try to get up to speed here.

Siqi


2013/7/25 Michael Meeks michael.me...@suse.com


 On Thu, 2013-07-25 at 10:51 +0200, Thorsten Behrens wrote:
  Michael Meeks wrote:
   Has anyone managed to help you with some code pointers here yet ?
 
  Was talking that over with Siqi on irc already - for something that
  moves on screen, XSprite is the thing to use. ;)

 Thanks - sorry for duplicating that ;-) Siqi - do you have the
 structural overview of what you need and/or how to couple that into the
 remote code ? :-) I guess the nominally thread-safe UNO API for
 slideshow might be a help here, though I'd be rather tempted to do idle
 rendering / dispatch of anything graphical in the main UI thread and not
 trust the thread-safety: it already caused significant problems around
 thumbnailing IIRC.

 Anyhow - looking forward to seeing this feature ;-) IMHO it's a
 really
 neat one.

 ATB,

 Michael.

 --
 michael .me...@suse.com  , Pseudo Engineer, itinerant idiot




-- 


Cordialement,
Siqi LIU

Étudiant Ingérieur, Université de Technologie de Compiègne
Vice-Président de l'association robotique UTCoupe
Responsable d'atelier de ClubChine

--
  Tel. +33 7 61 16 95 83
  email: m...@siqi.fr
--
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 starmath/inc/ElementsDockingWindow.hxx|1 +
 starmath/source/ElementsDockingWindow.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit cad969704977941390ffb1d156960daec175226e
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 12:37:09 2013 +0100

have my own stab at fixing the leaking SmDocShell

i.e. alternatives to
5dd1cd72f45df0ec13842d4ee9c849726cb74ea9
ef66cc105e0051fa1414b72c5ee2bf1b2f9331cb
f9e981ba0e2da6ce122e3ef30aef057c439c8fb8
d3cf684146162a1528046ab2bcd7d9fa94443c69

Change-Id: Ib094f5ac1455a9770c99aeac5eb1af118bdab829

diff --git a/starmath/inc/ElementsDockingWindow.hxx 
b/starmath/inc/ElementsDockingWindow.hxx
index c46cf79..9b58be7 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -100,6 +100,7 @@ class SmElementsControl : public Control
 
 public:
 SmElementsControl(Window *pParent, const ResId rResId);
+virtual ~SmElementsControl();
 
 void setElementSetId(sal_uInt16 aSetId);
 
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 8f71602..5e2b229 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -178,6 +178,11 @@ SmElementsControl::SmElementsControl(Window *pParent, 
const ResId rResId) :
 maFormat.SetBaseSize(PixelToLogic(Size(0, 24)));
 }
 
+SmElementsControl::~SmElementsControl()
+{
+mpDocShell-DoClose();
+}
+
 void SmElementsControl::setVerticalMode(bool bVerticalMode)
 {
 mbVerticalMode = bVerticalMode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Štrba]

 scp2/source/base/folderitem_base.scp   |2 +-
 scp2/source/calc/folderitem_calc.scp   |2 +-
 scp2/source/draw/folderitem_draw.scp   |2 +-
 scp2/source/impress/folderitem_impress.scp |2 +-
 scp2/source/math/folderitem_math.scp   |2 +-
 scp2/source/ooo/folderitem_ooo.scp |4 ++--
 scp2/source/writer/folderitem_writer.scp   |2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 42b8705e7cca785efc7ffa234ddb49cca8168a0a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 14:14:20 2013 +0200

Add some consistency to the world as we know it

Change-Id: Ib1720a1797facf783eee9524afef7fadcd986c6f

diff --git a/scp2/source/base/folderitem_base.scp 
b/scp2/source/base/folderitem_base.scp
index 1cc5b3f..7c5420b 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sbase
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
 End
 
-FolderItemProperty git_Folderitem_Sbase_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Sbase_AppID
 ShortcutID = gid_Folderitem_Sbase;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Base;
diff --git a/scp2/source/calc/folderitem_calc.scp 
b/scp2/source/calc/folderitem_calc.scp
index fcf4518..a5de033 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Scalc
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
 End
 
-FolderItemProperty git_Folderitem_Scalc_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Scalc_AppID
 ShortcutID = gid_Folderitem_Scalc;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Calc;
diff --git a/scp2/source/draw/folderitem_draw.scp 
b/scp2/source/draw/folderitem_draw.scp
index be67511..16b19b0 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sdraw
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
 End
 
-FolderItemProperty git_Folderitem_Sdraw_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Sdraw_AppID
 ShortcutID = gid_Folderitem_Sdraw;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Draw;
diff --git a/scp2/source/impress/folderitem_impress.scp 
b/scp2/source/impress/folderitem_impress.scp
index 1f787e4..5419044 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Simpress
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
 End
 
-FolderItemProperty git_Folderitem_Simpress_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Simpress_AppID
 ShortcutID = gid_Folderitem_Simpress;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Impress;
diff --git a/scp2/source/math/folderitem_math.scp 
b/scp2/source/math/folderitem_math.scp
index 565beee..5ba71cc 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Smath
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
 End
 
-FolderItemProperty git_Folderitem_Smath_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Smath_AppID
 ShortcutID = gid_Folderitem_Smath;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Math;
diff --git a/scp2/source/ooo/folderitem_ooo.scp 
b/scp2/source/ooo/folderitem_ooo.scp
index c9b24c1..1a1b52a 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -35,7 +35,7 @@ FolderItem gid_Folderitem_LibreOffice
 Parameter = ;
 End
 
-FolderItemProperty git_Folderitem_LibreOffice_AppIDProperty
+FolderItemProperty git_Folderitemproperty_LibreOffice_AppID
 ShortcutID = gid_Folderitem_LibreOffice;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Startcenter;
@@ -59,7 +59,7 @@ FolderItem gid_Folderitem_Soffice_Desktop
 ComponentCondition = CREATEDESKTOPLINK=1;
 End
 
-FolderItemProperty git_Folderitem_Soffice_Desktop_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Soffice_Desktop_AppID
 ShortcutID = gid_Folderitem_Soffice_Desktop;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Startcenter;
diff --git a/scp2/source/writer/folderitem_writer.scp 
b/scp2/source/writer/folderitem_writer.scp
index 47ce8ec..ff4268b 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Swriter
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
 End
 
-FolderItemProperty git_Folderitem_Swriter_AppIDProperty
+FolderItemProperty git_Folderitempropery_Swriter_AppID
 ShortcutID = gid_Folderitem_Swriter;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Writer;

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

[Fridrich Štrba]

 scp2/source/writer/folderitem_writer.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 129a0d8c6f5da9cd536971507d0a7df056a6
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 14:22:07 2013 +0200

A Torsdag without typo would not be a Torsdag

Change-Id: I305d8fb874f42c18de03255bc64160639defcb50

diff --git a/scp2/source/writer/folderitem_writer.scp 
b/scp2/source/writer/folderitem_writer.scp
index ff4268b..b4aaee2 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Swriter
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_WRITER);
 End
 
-FolderItemProperty git_Folderitempropery_Swriter_AppID
+FolderItemProperty git_Folderitemproperty_Swriter_AppID
 ShortcutID = gid_Folderitem_Swriter;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Writer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/qa/unit/data/ods/rich-text-cells.ods |binary
 sc/qa/unit/subsequent_filters-test.cxx  |   57 +++-
 2 files changed, 49 insertions(+), 8 deletions(-)

New commits:
commit a45098d295eeb1848dbe53f79047ffbb75f5f38e
Author: Eike Rathke er...@redhat.com
Date:   Tue Jul 23 22:58:25 2013 +0200

unit test for text:s in text:p and text:span, fdo#67094

Change-Id: I033668dcdcdcc1a5710f2ddacadf9a1a5344638e
(cherry picked from commit 038d162b175b62d67a94d4418b3a15a1a382419d)
Reviewed-on: https://gerrit.libreoffice.org/5096
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sc/qa/unit/data/ods/rich-text-cells.ods 
b/sc/qa/unit/data/ods/rich-text-cells.ods
index da3a1ed..b039c37 100644
Binary files a/sc/qa/unit/data/ods/rich-text-cells.ods and 
b/sc/qa/unit/data/ods/rich-text-cells.ods differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index fcd6bd3..219b2ca 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1688,18 +1688,20 @@ void ScFiltersTest::testRichTextContentODS()
 
 // first line is bold.
 pEditText-GetCharAttribs(0, aAttribs);
-bool bHasBold = false;
-for (it = aAttribs.begin(), itEnd = aAttribs.end(); it != itEnd; ++it)
 {
-if (it-pAttr-Which() == EE_CHAR_WEIGHT)
+bool bHasBold = false;
+for (it = aAttribs.begin(), itEnd = aAttribs.end(); it != itEnd; ++it)
 {
-const SvxWeightItem rItem = static_castconst 
SvxWeightItem(*it-pAttr);
-bHasBold = (rItem.GetWeight() == WEIGHT_BOLD);
-if (bHasBold)
-break;
+if (it-pAttr-Which() == EE_CHAR_WEIGHT)
+{
+const SvxWeightItem rItem = static_castconst 
SvxWeightItem(*it-pAttr);
+bHasBold = (rItem.GetWeight() == WEIGHT_BOLD);
+if (bHasBold)
+break;
+}
 }
+CPPUNIT_ASSERT_MESSAGE(First line should be bold., bHasBold);
 }
-CPPUNIT_ASSERT_MESSAGE(First line should be bold., bHasBold);
 
 // second line is italic.
 pEditText-GetCharAttribs(1, aAttribs);
@@ -1766,6 +1768,45 @@ void ScFiltersTest::testRichTextContentODS()
 const SvxURLField* pURLData = static_castconst SvxURLField*(pData);
 CPPUNIT_ASSERT_MESSAGE(URL is not absolute with respect to the file 
system., pURLData-GetURL().startsWith(file:///));
 
+// Embedded spaces as text:s text:c='4' /, normal text
+aPos.IncRow();
+CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc-GetCellType(aPos));
+CPPUNIT_ASSERT_EQUAL(OUString(one two), pDoc-GetString(aPos.Col(), 
aPos.Row(), aPos.Tab()));
+
+// Leading space as text:s /.
+aPos.IncRow();
+CPPUNIT_ASSERT_EQUAL(CELLTYPE_STRING, pDoc-GetCellType(aPos));
+CPPUNIT_ASSERT_EQUAL(OUString( =3+4), pDoc-GetString(aPos.Col(), 
aPos.Row(), aPos.Tab()));
+
+// Embedded spaces with text:s text:c='4' / inside a text:span, text
+// partly bold.
+aPos.IncRow();
+CPPUNIT_ASSERT_EQUAL(CELLTYPE_EDIT, pDoc-GetCellType(aPos));
+pEditText = pDoc-GetEditText(aPos);
+CPPUNIT_ASSERT_MESSAGE(Failed to retrieve edit text object., pEditText);
+CPPUNIT_ASSERT_EQUAL(static_castsal_Int32(1), 
pEditText-GetParagraphCount());
+aParaText = pEditText-GetText(0);
+CPPUNIT_ASSERT_EQUAL(OUString(one two), aParaText);
+pEditText-GetCharAttribs(0, aAttribs);
+{
+bool bHasBold = false;
+for (it = aAttribs.begin(), itEnd = aAttribs.end(); it != itEnd; ++it)
+{
+if (it-pAttr-Which() == EE_CHAR_WEIGHT)
+{
+const SvxWeightItem rItem = static_castconst 
SvxWeightItem(*it-pAttr);
+bHasBold = (rItem.GetWeight() == WEIGHT_BOLD);
+if (bHasBold)
+{
+OUString aSeg = aParaText.copy(it-nStart, it-nEnd - 
it-nStart);
+CPPUNIT_ASSERT_EQUAL(OUString(e t), aSeg);
+break;
+}
+}
+}
+CPPUNIT_ASSERT_MESSAGE(Expected a bold sequence., bHasBold);
+}
+
 xDocSh-DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/source/control/edit.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 74a3450b6d681b9ca0fa3e4d01522bfd4269ab5e
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 12:08:37 2013 +0100

Resolves: fdo#63618 don't include border size twice in edit optimal size

CalcSize calls CalcWindowSize, but we will call that also in 
GetOptimalSize, so
undo the first one with CalcOutputSize. This makes the editboxes especially
less tall under MacOSX

(cherry picked from commit 0fcf74d203d97b7e829e72b7e55782d86a048802)

Change-Id: Ibbbf5a30e0c640744b1a979937301f87d250873a
Reviewed-on: https://gerrit.libreoffice.org/5098
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index e8798a2..bb94ee3 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -2894,7 +2894,9 @@ Size Edit::CalcMinimumSizeForText(const OUString 
rString) const
 Size aSize;
 if (mnWidthInChars != -1)
 {
-aSize = CalcSize(mnWidthInChars);
+//CalcSize calls CalcWindowSize, but we will call that also in this
+//function, so undo the first one with CalcOutputSize
+aSize = CalcOutputSize(CalcSize(mnWidthInChars));
 }
 else
 {
@@ -2907,9 +2909,13 @@ Size Edit::CalcMinimumSizeForText(const OUString 
rString) const
 aSize.Height() = GetTextHeight();
 aSize.Width() = GetTextWidth(aString);
 aSize.Width() += ImplGetExtraOffset() * 2;
+
 // do not create edit fields in which one cannot enter anything
 // a default minimum width should exist for at least 3 characters
-Size aMinSize(CalcSize(3));
+
+//CalcSize calls CalcWindowSize, but we will call that also in this
+//function, so undo the first one with CalcOutputSize
+Size aMinSize(CalcOutputSize(CalcSize(3)));
 if (aSize.Width()  aMinSize.Width())
 aSize.Width() = aMinSize.Width();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit fc1b46e03f9b93a6b9ad6f9cc25bf8066715088f
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 25 15:32:09 2013 +0200

fdo#67269 adapt checkTable to getTableName change

getTableName used to return schema.table;
now it returns just table
But tables are indexed by schema.table in getTables(), so reconstruct that 
for the lookup.

Change-Id: I53da1e43762b3a470e34b5dfdb0e1bb3dc914780

diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 8a8845f..15bbc5c 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -213,9 +213,10 @@ void ResultSetMetaData::checkTable()
 }
 if( tables.is() )
 {
-OUString name = getTableName( 1 );
-// if( tables-hasByName( name ) )
-tables-getByName( name ) = m_table;
+const OUString name   (getTableName ( 1 ));
+const OUString schema (getSchemaName( 1 ));
+const OUString composedName( schema.isEmpty() ? name : (schema 
+ . + name) );
+tables-getByName( composedName ) = m_table;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/inc

[Kohei Yoshida]

 sc/inc/calcmacros.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d1121f807f5d394d1a94c74fd48e9db880c3e013
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 09:37:54 2013 -0400

I forgot to turn this off.

Change-Id: I86f60ee3ae748abd6ec2e8308ba067b836aa3ab4

diff --git a/sc/inc/calcmacros.hxx b/sc/inc/calcmacros.hxx
index 21a51fb..9516522 100644
--- a/sc/inc/calcmacros.hxx
+++ b/sc/inc/calcmacros.hxx
@@ -12,7 +12,7 @@
 
 #define DEBUG_COLUMN_STORAGE 0
 #define DEBUG_PIVOT_TABLE 0
-#define DEBUG_FORMULA_COMPILER 1
+#define DEBUG_FORMULA_COMPILER 0
 
 #if DEBUG_PIVOT_TABLE || DEBUG_COLUMN_STORAGE || DEBUG_FORMULA_COMPILER
 #include iostream
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sc/inc/calcmacros.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33cf07c3076834c781fcabcfc8b830531eb1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 09:37:54 2013 -0400

I forgot to turn this off.

Change-Id: I86f60ee3ae748abd6ec2e8308ba067b836aa3ab4

diff --git a/sc/inc/calcmacros.hxx b/sc/inc/calcmacros.hxx
index 21a51fb..9516522 100644
--- a/sc/inc/calcmacros.hxx
+++ b/sc/inc/calcmacros.hxx
@@ -12,7 +12,7 @@
 
 #define DEBUG_COLUMN_STORAGE 0
 #define DEBUG_PIVOT_TABLE 0
-#define DEBUG_FORMULA_COMPILER 1
+#define DEBUG_FORMULA_COMPILER 0
 
 #if DEBUG_PIVOT_TABLE || DEBUG_COLUMN_STORAGE || DEBUG_FORMULA_COMPILER
 #include iostream
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: configure.ac src/lib

[Fridrich Štrba]

 configure.ac |4 ++--
 src/lib/VSDZipStream.cpp |4 
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 6fdf57fb028536659727b681a335823189576c14
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 15:42:18 2013 +0200

Hard depend on libwpd 0.9.5

diff --git a/configure.ac b/configure.ac
index 77bbe05..b310448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,8 +58,8 @@ AC_SUBST(GPERF)
 # Find additional apps
 # 
 PKG_CHECK_MODULES([WPD],[
-   libwpd-0.9
-   libwpd-stream-0.9
+   libwpd-0.9 = 0.9.5
+   libwpd-stream-0.9 = 0.9.5
 ])
 
 PKG_CHECK_MODULES([WPG],[
diff --git a/src/lib/VSDZipStream.cpp b/src/lib/VSDZipStream.cpp
index f00f906..3b3e08a 100644
--- a/src/lib/VSDZipStream.cpp
+++ b/src/lib/VSDZipStream.cpp
@@ -161,11 +161,7 @@ WPXInputStream 
*libvisio::VSDZipStream::getDocumentOLEStream(const char *name)
 
 bool libvisio::VSDZipStreamImpl::findCentralDirectoryEnd()
 {
-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
-#endif
 m_input-seek(m_cdir_offset, WPX_SEEK_SET);
   try
   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Štrba]

 writerperfect/source/common/WPXSvStream.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 93d0e38ccc06060f20073a9461c53f471a1b9c03
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 15:43:58 2013 +0200

Use inconditionally the libwpd = 0.9.5 path

Since libwpd does not output the version number anymore

Change-Id: I1bc3f7081552795fc2ed33f033a093fa5b40fda8

diff --git a/writerperfect/source/common/WPXSvStream.cxx 
b/writerperfect/source/common/WPXSvStream.cxx
index a79ac6c..e0c8d8c 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -134,12 +134,8 @@ int WPXSvInputStreamImpl::seek(long offset, WPX_SEEK_TYPE 
seekType)
 sal_Int64 tmpOffset = offset;
 if (seekType == WPX_SEEK_CUR)
 tmpOffset += tmpPosition;
-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
- (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 
 (LIBWPD_STREAM_VERSION_MINOR  9 \
-|| (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
 if (seekType == WPX_SEEK_END)
 tmpOffset += mnLength;
-#endif
 
 int retVal = 0;
 if (tmpOffset  0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/app/swmodule.cxx|2 
 sw/source/ui/inc/workctrl.hxx|   25 +++
 sw/source/ui/ribbar/workctrl.cxx |  256 ---
 3 files changed, 186 insertions(+), 97 deletions(-)

New commits:
commit bb98778dbf761a0c88c96117add00a66e5cc6c95
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 14:47:01 2013 +0100

Resolves: fdo#67113 split insert autotext and field controls

autotext is a modal dialog and insert field is a modeless dialog so I don't
want autotext to show a toggle in insert-autotext

At the same time we want the autotext entry in the insert toolbar to have a
dropdown and we appear to want to be able to close the insert field dialog 
from
the toolbar.

So split the combined handler class into two and remove the other if/else
branch in each with the insert field a SfxBoolItem and the insert autotext 
an
SfxVoidItem.

Change-Id: I3d59052ee70a00d63f7706166290b00ad9ae22c0

diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index fb53d18..b0465ca 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -300,7 +300,7 @@ void SwDLL::RegisterControls()
 SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod );
 SwTbxInsertCtrl::RegisterControl(FN_INSERT_CTRL, pMod );
 SwTbxInsertCtrl::RegisterControl(FN_INSERT_OBJ_CTRL, pMod );
-SwTbxAutoTextCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod );
+SwTbxFieldCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod );
 SwTbxAutoTextCtrl::RegisterControl(FN_GLOSSARY_DLG, pMod );
 
 SvxTbxCtlCustomShapes::RegisterControl( SID_DRAWTBX_CS_BASIC, pMod );
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 8dcd318..1c7b231 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -95,7 +95,7 @@ public:
 SFX_DECL_TOOLBOX_CONTROL();
 
 SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox rTbx );
-~SwTbxAutoTextCtrl();
+virtual ~SwTbxAutoTextCtrl();
 
 virtual SfxPopupWindowType  GetPopupWindowType() const;
 virtual SfxPopupWindow* CreatePopupWindow();
@@ -106,6 +106,29 @@ public:
 DECL_LINK(PopupHdl, PopupMenu*);
 };
 
+class SwTbxFieldCtrl : public SfxToolBoxControl
+{
+PopupMenu*  pPopup;
+SwView* pView;
+
+
+voidDelPopup();
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+
+SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox rTbx );
+virtual ~SwTbxFieldCtrl();
+
+virtual SfxPopupWindowType  GetPopupWindowType() const;
+virtual SfxPopupWindow* CreatePopupWindow();
+virtual voidStateChanged( sal_uInt16 nSID,
+  SfxItemState eState,
+  const SfxPoolItem* pState );
+
+DECL_LINK(PopupHdl, PopupMenu*);
+};
+
+
 
 //
 //
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 384db99..ccbc2bf 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -57,7 +57,8 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
 
 SFX_IMPL_TOOLBOX_CONTROL( SwTbxInsertCtrl, SfxImageItem);
-SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxBoolItem );
+SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxVoidItem );
+SFX_IMPL_TOOLBOX_CONTROL( SwTbxFieldCtrl, SfxBoolItem );
 
 SwTbxInsertCtrl::SwTbxInsertCtrl(
 sal_uInt16 nSlotId,
@@ -187,44 +188,30 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 {
 Link aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
 
-if (GetSlotId() == FN_INSERT_FIELD_CTRL)
+pPopup = new PopupMenu;
+SwGlossaryList* pGlossaryList = ::GetGlossaryList();
+sal_uInt16 nGroupCount = pGlossaryList-GetGroupCount();
+for(sal_uInt16 i = 1; i = nGroupCount; i++)
 {
-pPopup = new PopupMenu(SW_RES(RID_INSERT_FIELD_CTRL));
-pPopup-SetSelectHdl(aLnk);
-
-if (::GetHtmlMode(pView-GetDocShell())  HTMLMODE_ON)
-{
-
pPopup-RemoveItem(pPopup-GetItemPos(FN_INSERT_FLD_PGCOUNT));
-
pPopup-RemoveItem(pPopup-GetItemPos(FN_INSERT_FLD_TOPIC));
-}
-}
-else
-{
-pPopup = new PopupMenu;
-SwGlossaryList* pGlossaryList = ::GetGlossaryList();
-sal_uInt16 nGroupCount = pGlossaryList-GetGroupCount();
-for(sal_uInt16 i = 1; i = nGroupCount; i++)
+// Acquire group name with path extension
+String sTitle;
+pGlossaryList-GetGroupName(i - 1, sal_False, sTitle);
+sal_uInt16 nBlockCount = 

[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - sd/source

[Vishv Brahmbhatt]

 sd/source/core/sdpage.cxx |   96 --
 1 file changed, 93 insertions(+), 3 deletions(-)

New commits:
commit 047017b3b0d33a88334459697efc46467cc69e0a
Author: Vishv Brahmbhatt vishvbrahmbhat...@gmail.com
Date:   Thu Jul 25 19:25:01 2013 +0530

Added a for loop to CalcAutoLayoutRectangles to change logic.

Changed the logic of switch case in CalcAutoLayoutRectangles.This for 
loop basically traverse through the layoutlist.xml and
find the appropriate node to a particular layout and then fills in the 
property values to all of it's presobj in the layout.
Currently,I have not deleted the switch case,but this 'for loop' aims to 
replace it.

Change-Id: I114614292934af179f9380277021aea350e3b35d

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index ecd481f..0aace256 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1261,7 +1261,8 @@ void readLayoutPropFromFile(const ReferenceXElement 
root, const rtl::OUString
 ReferenceXNodeList layoutchildrens = 
layoutnode-getChildNodes();
 presobjsize = layoutchildrens-getLength(); //get the 
length of that of the layout(number of pres objects)
 for( long j=0; j presobjsize ; j++)
-{   rtl::OUString nodename;
+{
+rtl::OUString nodename;
 ReferenceXNode presobj = layoutchildrens-item(j);
//get the j'th presobj for that layout
 nodename=presobj-getNodeName();
 if(nodename==presobj)//check whether children is blank 
'text-node' or 'presobj' node
@@ -1299,10 +1300,40 @@ void readLayoutPropFromFile(const ReferenceXElement 
root, const rtl::OUString
 }
 }
 
-static void CalcAutoLayoutRectangles( SdPage rPage, int nLayout, Rectangle* 
rRectangle )
+rtl::OUString enumtoString(AutoLayout aut)
+{
+rtl::OUString retstr;
+switch (aut)
+{
+case AUTOLAYOUT_TITLE_CONTENT:
+retstr=AUTOLAYOUT_TITLE_CONTENT;
+break;
+case AUTOLAYOUT_TITLE_2VTEXT:
+retstr=AUTOLAYOUT_TITLE_2VTEXT;
+break;
+case AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT:
+retstr=AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT;
+break;
+case AUTOLAYOUT_TITLE_CONTENT_2CONTENT:
+retstr=AUTOLAYOUT_TITLE_CONTENT_2CONTENT;
+break;
+default:
+retstr=unknown;
+break;
+// case AUTOLAYOUT_TITLE_4SCONTENT:return 
AUTOLAYOUT_TITLE_4SCONTENT;
+}
+return retstr;
+}
+
+static void CalcAutoLayoutRectangles( SdPage rPage, int nLayout, Rectangle* 
rRectangle ,const rtl::OUString autolayout)
 {
 Rectangle aTitleRect;
 Rectangle aLayoutRect;
+long presobjsize;
+long layoutlistsize;
+rtl::OUString sLayoutAttName;
+rtl::OUString sPresObjKindAttName;
+bool bnoprop=true;   //use it to skip the remaining loop 
,once propvalue is obtained
 double propvalue[4];
 
 if( rPage.GetPageKind() != PK_HANDOUT )
@@ -1345,6 +1376,63 @@ static void CalcAutoLayoutRectangles( SdPage rPage, int 
nLayout, Rectangle* rRe
 
 sal_BoolbRightToLeft = ( rPage.GetModel()  static_cast 
SdDrawDocument* ( rPage.GetModel() )-GetDefaultWritingMode() == 
::com::sun::star::text::WritingMode_RL_TB );
 
+const ReferenceXNodeList layoutlist = 
root-getElementsByTagName(layout);
+layoutlistsize=layoutlist-getLength();
+rtl::OUString sLayoutType = autolayout;
+for( long index=0; indexlayoutlistsize ;index++)
+{
+if(bnoprop)
+{
+ReferenceXNode layoutnode = layoutlist-item(index);  //get 
i'th layout element
+ReferenceXNamedNodeMap layoutattrlist 
=layoutnode-getAttributes();
+ReferenceXNode layoutattr = layoutattrlist-getNamedItem(type);
+sLayoutAttName=layoutattr-getNodeValue();  //get the 
attribute value of layout(i.e it's type)
+
+if(sLayoutAttName==sLayoutType)
+{
+ReferenceXNodeList layoutchildrens = 
layoutnode-getChildNodes();
+presobjsize = layoutchildrens-getLength(); //get the 
length of that of the layout(number of pres objects)
+for( long j=1; j presobjsize ; j++)
+{
+rtl::OUString nodename;
+ReferenceXNode presobj = layoutchildrens-item(j);
//get the j'th presobj for that layout
+nodename=presobj-getNodeName();
+if(nodename==presobj)//check whether children is blank 
'text-node' or 'presobj' node
+{
+ReferenceXNamedNodeMap presObjAttributes = 
presobj-getAttributes();
+ReferenceXNode presObjKindAttr = 
presObjAttributes-getNamedItem(kind);
+sPresObjKindAttName = presObjKindAttr-getNodeValue(); 
 //get the value of it's 

[Libreoffice-commits] libcdr.git: configure.ac src/lib

[Fridrich Štrba]

 configure.ac |4 ++--
 src/lib/CDRZipStream.cpp |4 
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 7a9f8be1d17e8e74d2d0e60da36152a300a4de6c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 16:06:59 2013 +0200

Hard depend on libwpd 0.9.5

diff --git a/configure.ac b/configure.ac
index c963784..689e44d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ PKG_PROG_PKG_CONFIG([0.20])
 # Find additional apps
 # 
 PKG_CHECK_MODULES([WPD],[
-   libwpd-0.9
-   libwpd-stream-0.9
+   libwpd-0.9 = 0.9.5
+   libwpd-stream-0.9 = 0.9.5
 ])
 AC_SUBST(WPD_CFLAGS)
 AC_SUBST(WPD_LIBS)
diff --git a/src/lib/CDRZipStream.cpp b/src/lib/CDRZipStream.cpp
index d904057..eacd342 100644
--- a/src/lib/CDRZipStream.cpp
+++ b/src/lib/CDRZipStream.cpp
@@ -160,11 +160,7 @@ WPXInputStream 
*libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
 
 bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd()
 {
-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
-#endif
 m_input-seek(m_cdir_offset, WPX_SEEK_SET);
   try
   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/cellform.hxx|5 -
 sc/inc/cellvalue.hxx   |   11 ++-
 sc/inc/chgtrack.hxx|7 +
 sc/inc/editutil.hxx|   13 ++-
 sc/inc/global.hxx  |7 +
 sc/qa/unit/subsequent_filters-test.cxx |9 ++
 sc/qa/unit/ucalc.cxx   |2 
 sc/source/core/data/cellvalue.cxx  |4 -
 sc/source/core/data/column.cxx |2 
 sc/source/core/data/column2.cxx|   26 +++
 sc/source/core/data/column3.cxx|   23 +++---
 sc/source/core/data/conditio.cxx   |9 +-
 sc/source/core/data/dociter.cxx|   10 +-
 sc/source/core/data/document.cxx   |2 
 sc/source/core/data/global.cxx |   16 
 sc/source/core/data/table3.cxx |2 
 sc/source/core/data/table4.cxx |   10 +-
 sc/source/core/data/validat.cxx|2 
 sc/source/core/tool/cellform.cxx   |   10 +-
 sc/source/core/tool/chgtrack.cxx   |   22 +++---
 sc/source/core/tool/editutil.cxx   |   61 +++--
 sc/source/core/tool/interpr4.cxx   |   10 +-
 sc/source/core/tool/rangeseq.cxx   |2 
 sc/source/filter/dif/difexp.cxx|2 
 sc/source/filter/html/htmlexp.cxx  |2 
 sc/source/filter/xcl97/XclExpChangeTrack.cxx   |2 
 sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |8 +-
 sc/source/ui/docshell/docsh.cxx|4 -
 sc/source/ui/docshell/docsh3.cxx   |4 -
 sc/source/ui/docshell/externalrefmgr.cxx   |4 -
 sc/source/ui/miscdlgs/acredlin.cxx |4 -
 sc/source/ui/unoobj/cellsuno.cxx   |4 -
 sc/source/ui/view/output2.cxx  |3 
 33 files changed, 191 insertions(+), 111 deletions(-)

New commits:
commit 1ecdc7aaf661e97a33cf521f553481d79cd26de2
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 25 15:33:49 2013 +0200

resolved fdo#67249 use ScFieldEditEngine to resolve field content

ScEditUtil::GetString() iterated over the paragraphs of an
EditTextObject where GetText() does not resolve field content but
returns the embedded field markers. To resolve field content an
ScFieldEditEngine is needed.

This makes it necessary to pass an ScDocument* to obtain the
ScFieldEditEngine from, or for cases where there is no ScDocument in the
context use a static ScFieldEditEngine which unfortunately is not
capable of resolving document specific fields of course, such as
DOCINFO_TITLE and TABLE.

Also added unit test.

Change-Id: Ife3c23b2fec2514b32303239d276c49869786eb5

diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index 6a164a0..d384e54 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -43,7 +43,7 @@ public:
 
 static void GetString(
 ScRefCellValue rCell, sal_uLong nFormat, OUString rString,
-Color** ppColor, SvNumberFormatter rFormatter, bool bNullVals = true,
+Color** ppColor, SvNumberFormatter rFormatter, const ScDocument* 
pDoc, bool bNullVals = true,
 bool bFormula  = false, ScForceTextFmt eForceTextFmt = ftDontForce,
 bool bUseStarFormat = false );
 
@@ -53,7 +53,8 @@ public:
 bool bFormula  = false, ScForceTextFmt eForceTextFmt = ftDontForce, 
bool bUseStarFormat = false );
 
 static void GetInputString(
-ScRefCellValue rCell, sal_uLong nFormat, OUString rString, 
SvNumberFormatter rFormatter );
+ScRefCellValue rCell, sal_uLong nFormat, OUString rString, 
SvNumberFormatter rFormatter,
+const ScDocument* pDoc );
 };
 
 
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 43e7a05..0e2987c 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -134,7 +134,16 @@ struct SC_DLLPUBLIC ScRefCellValue
 
 double getValue();
 
-OUString getString();
+/** Retrieve string value.
+
+@param  pDoc
+Needed to resolve EditCells' field contents, obtain a
+ScFieldEditEngine from that document. May be NULL if there is
+no ScDocument in the calling context but then the document
+specific fields can not be resolved. See
+ScEditUtil::GetString().
+ */
+OUString getString( const ScDocument* pDoc );
 
 bool isEmpty() const;
 
diff --git a/sc/inc/chgtrack.hxx b/sc/inc/chgtrack.hxx
index aef13cf..872f268 100644
--- a/sc/inc/chgtrack.hxx
+++ b/sc/inc/chgtrack.hxx
@@ -702,7 +702,8 @@ class ScChangeActionContent : public 

[Libreoffice-commits] core.git: Branch 'feature/cmis' - 2 commits - ucb/Library_ucpcmis1.mk ucb/source

[Cédric Bosdonnat]

 ucb/Library_ucpcmis1.mk|1 
 ucb/source/core/provprox.cxx   |3 
 ucb/source/ucp/cmis/certvalidation_handler.cxx |  101 +
 ucb/source/ucp/cmis/certvalidation_handler.hxx |   42 ++
 ucb/source/ucp/cmis/cmis_content.cxx   |6 +
 ucb/source/ucp/cmis/cmis_repo_content.cxx  |   41 ++
 6 files changed, 179 insertions(+), 15 deletions(-)

New commits:
commit cced6aadec633dd36a299c9cf8d32db29f024baa
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Thu Jul 25 15:42:16 2013 +0200

UCB Show more infos about errors loading UCP

Change-Id: Ibc67cde1766f1259f4e5099160d469412fb4e89e

diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx
index 4447cc8..bae3f77 100644
--- a/ucb/source/core/provprox.cxx
+++ b/ucb/source/core/provprox.cxx
@@ -347,8 +347,9 @@ UcbContentProviderProxy::getContentProvider()
 {
 throw;
 }
-catch ( Exception const  )
+catch ( Exception const  e)
 {
+SAL_INFO( ucb.core, Exception when getting content provider:  
 e.Message );
 }
 
 // registerInstance called at proxy, but not yet at original?
commit 16eb296df0ce4755f3cd7176a62da42bedbecce4
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Thu Jul 25 15:40:02 2013 +0200

fdo#61589: ask what to do with invalid SSL certificates in CMIS UCP

Change-Id: I3cf688f7070e3e8cb2db532d8e034961504a8160

diff --git a/ucb/Library_ucpcmis1.mk b/ucb/Library_ucpcmis1.mk
index 219aafc..57c3719 100644
--- a/ucb/Library_ucpcmis1.mk
+++ b/ucb/Library_ucpcmis1.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_use_externals,ucpcmis1,\
 
 $(eval $(call gb_Library_add_exception_objects,ucpcmis1,\
ucb/source/ucp/cmis/auth_provider \
+   ucb/source/ucp/cmis/certvalidation_handler \
ucb/source/ucp/cmis/cmis_content \
ucb/source/ucp/cmis/cmis_repo_content \
ucb/source/ucp/cmis/cmis_datasupplier \
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.cxx 
b/ucb/source/ucp/cmis/certvalidation_handler.cxx
new file mode 100644
index 000..7ac8cda
--- /dev/null
+++ b/ucb/source/ucp/cmis/certvalidation_handler.cxx
@@ -0,0 +1,101 @@
+/* -*- 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/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ */
+
+#include com/sun/star/security/XCertificate.hpp
+#include com/sun/star/security/CertificateValidity.hpp
+#include com/sun/star/xml/crypto/SEInitializer.hpp
+#include com/sun/star/xml/crypto/XSecurityEnvironment.hpp
+
+#include comphelper/sequence.hxx
+#include ucbhelper/simplecertificatevalidationrequest.hxx
+
+#include certvalidation_handler.hxx
+
+#define STD_TO_OUSTR( str ) OUString( str.c_str(), str.length( ), 
RTL_TEXTENCODING_UTF8 )
+
+using namespace std;
+using namespace com::sun::star;
+
+namespace cmis
+{
+bool CertValidationHandler::validateCertificate( vector string  
aCertificates )
+{
+bool bValidate = false;
+if ( !aCertificates.empty()  m_xEnv.is() )
+{
+uno::Reference xml::crypto::XSEInitializer  xSEInitializer;
+try
+{
+xSEInitializer = xml::crypto::SEInitializer::create( 
m_xContext );
+}
+catch ( uno::Exception const  )
+{
+}
+
+if ( xSEInitializer.is() )
+{
+uno::Reference xml::crypto::XXMLSecurityContext  
xSecurityContext(
+xSEInitializer-createSecurityContext( OUString() ) );
+
+uno::Reference xml::crypto::XSecurityEnvironment  
xSecurityEnv(
+xSecurityContext-getSecurityEnvironment() );
+
+vector string ::iterator pIt = aCertificates.begin();
+string sCert = *pIt;
+// We need to get rid of the PEM header/footer lines
+OUString sCleanCert = STD_TO_OUSTR( sCert );
+sCleanCert = sCleanCert.replaceAll( -BEGIN 
CERTIFICATE-,  );
+sCleanCert = sCleanCert.replaceAll( -END 
CERTIFICATE-,  );
+uno::Reference security::XCertificate  xCert(
+xSecurityEnv-createCertificateFromAscii(
+sCleanCert ) );
+
+std::vector uno::Reference security::XCertificate   
vecCerts;
+
+for ( ++pIt; pIt != aCertificates.end(); ++pIt )
+{
+sCert = *pIt;
+uno::Reference security::XCertificate xImCert(
+xSecurityEnv-createCertificateFromAscii(

[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - officecfg/registry test/Package_unittest.mk

[Vishv Brahmbhatt]

 officecfg/registry/schema/org/openoffice/Office/Impress.xcs |2 +-
 test/Package_unittest.mk|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fbfc097c29ebdc1930b2c25a216c50ad101ebdbf
Author: Vishv Brahmbhatt vishvbrahmbhat...@gmail.com
Date:   Thu Jul 25 19:40:43 2013 +0530

Solved the unit-test problem

Changed the destination path of test-profile at test/Package_unittest.mk.

Change-Id: I24ae595af22c38141add0ab8446281c3ccc84707

diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 882f46e..61c7cab1 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -480,7 +480,7 @@
   /desc
   labelList of files containing list of layouts/label
 /info
-value 
oor:separator=;vnd.sun.star.expand:$BRAND_BASE_DIR/../user/config/soffice.cfg/simpress/layoutlist.xml/value
+value 
oor:separator=;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/layoutlist.xml/value
   /prop
   prop oor:name=PreviewNewEffects oor:type=xs:boolean 
oor:nillable=false
 !-- OldPath: --
diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
index 4c1d9ad..83b2dba 100644
--- a/test/Package_unittest.mk
+++ b/test/Package_unittest.mk
@@ -25,7 +25,7 @@ $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/psetup.xpm,
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml))
-$(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/layoutlist.xml,user/config/soffice.cfg/simpress/layoutlist.xml))
+$(eval $(call 
gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/layoutlist.xml,user/config/soffice.cfg/simpress/layoutlist.xml))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/modules/empty_directory,user/config/soffice.cfg/modules/empty_directory))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/psetupl.xpm,user/config/psetupl.xpm))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/autocorr/empty_directory,user/autocorr/empty_directory))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Štrba]

 scp2/source/base/folderitem_base.scp   |2 +-
 scp2/source/calc/folderitem_calc.scp   |2 +-
 scp2/source/draw/folderitem_draw.scp   |2 +-
 scp2/source/impress/folderitem_impress.scp |2 +-
 scp2/source/math/folderitem_math.scp   |2 +-
 scp2/source/ooo/folderitem_ooo.scp |4 ++--
 scp2/source/writer/folderitem_writer.scp   |2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit d49366dffaebbe98165a2dbd816107b97bbb0cb8
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 14:14:20 2013 +0200

Add some consistency to the world as we know it

Change-Id: Ib1720a1797facf783eee9524afef7fadcd986c6f
(cherry picked from commit 42b8705e7cca785efc7ffa234ddb49cca8168a0a)

A Torsdag without typo would not be a Torsdag

Change-Id: I305d8fb874f42c18de03255bc64160639defcb50
(cherry picked from commit 129a0d8c6f5da9cd536971507d0a7df056a6)
Reviewed-on: https://gerrit.libreoffice.org/5097
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/scp2/source/base/folderitem_base.scp 
b/scp2/source/base/folderitem_base.scp
index 1cc5b3f..7c5420b 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sbase
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
 End
 
-FolderItemProperty git_Folderitem_Sbase_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Sbase_AppID
 ShortcutID = gid_Folderitem_Sbase;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Base;
diff --git a/scp2/source/calc/folderitem_calc.scp 
b/scp2/source/calc/folderitem_calc.scp
index fcf4518..a5de033 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Scalc
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
 End
 
-FolderItemProperty git_Folderitem_Scalc_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Scalc_AppID
 ShortcutID = gid_Folderitem_Scalc;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Calc;
diff --git a/scp2/source/draw/folderitem_draw.scp 
b/scp2/source/draw/folderitem_draw.scp
index be67511..16b19b0 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Sdraw
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
 End
 
-FolderItemProperty git_Folderitem_Sdraw_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Sdraw_AppID
 ShortcutID = gid_Folderitem_Sdraw;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Draw;
diff --git a/scp2/source/impress/folderitem_impress.scp 
b/scp2/source/impress/folderitem_impress.scp
index 1f787e4..5419044 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Simpress
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
 End
 
-FolderItemProperty git_Folderitem_Simpress_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Simpress_AppID
 ShortcutID = gid_Folderitem_Simpress;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Impress;
diff --git a/scp2/source/math/folderitem_math.scp 
b/scp2/source/math/folderitem_math.scp
index 565beee..5ba71cc 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -31,7 +31,7 @@ FolderItem gid_Folderitem_Smath
 ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
 End
 
-FolderItemProperty git_Folderitem_Smath_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Smath_AppID
 ShortcutID = gid_Folderitem_Smath;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Math;
diff --git a/scp2/source/ooo/folderitem_ooo.scp 
b/scp2/source/ooo/folderitem_ooo.scp
index c9b24c1..1a1b52a 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -35,7 +35,7 @@ FolderItem gid_Folderitem_LibreOffice
 Parameter = ;
 End
 
-FolderItemProperty git_Folderitem_LibreOffice_AppIDProperty
+FolderItemProperty git_Folderitemproperty_LibreOffice_AppID
 ShortcutID = gid_Folderitem_LibreOffice;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Startcenter;
@@ -59,7 +59,7 @@ FolderItem gid_Folderitem_Soffice_Desktop
 ComponentCondition = CREATEDESKTOPLINK=1;
 End
 
-FolderItemProperty git_Folderitem_Soffice_Desktop_AppIDProperty
+FolderItemProperty git_Folderitemproperty_Soffice_Desktop_AppID
 ShortcutID = gid_Folderitem_Soffice_Desktop;
 Key = System.AppUserModel.ID;
 Value = TheDocumentFoundation.LibreOffice.Startcenter;
diff --git a/scp2/source/writer/folderitem_writer.scp 
b/scp2/source/writer/folderitem_writer.scp
index 47ce8ec..b4aaee2 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac writerperfect/source

[Fridrich Štrba]

 configure.ac|2 +-
 writerperfect/source/stream/WPXSvStream.cxx |4 
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 9a3d3ee99d5e751bd2cb6e64110d944f2dd6b427
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 15:43:58 2013 +0200

Use inconditionally the libwpd = 0.9.5 path

Since libwpd does not output the version number anymore

(cherry picked from commit 93d0e38ccc06060f20073a9461c53f471a1b9c03)

Conflicts:
writerperfect/source/common/WPXSvStream.cxx

Change-Id: I1bc3f7081552795fc2ed33f033a093fa5b40fda8
Reviewed-on: https://gerrit.libreoffice.org/5103
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/configure.ac b/configure.ac
index e97379d..21b68cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6996,7 +6996,7 @@ AC_MSG_CHECKING([which libwpd to use])
 if test $with_system_libwpd = yes; then
 AC_MSG_RESULT([external])
 SYSTEM_LIBWPD=YES
-PKG_CHECK_MODULES( WPD, libwpd-0.9 libwpd-stream-0.9 )
+PKG_CHECK_MODULES( WPD, libwpd-0.9 = 0.9.5 libwpd-stream-0.9 = 0.9.5 )
 elif test $_os = iOS; then
 AC_MSG_RESULT([none])
 else
diff --git a/writerperfect/source/stream/WPXSvStream.cxx 
b/writerperfect/source/stream/WPXSvStream.cxx
index b058b87..5354b72 100644
--- a/writerperfect/source/stream/WPXSvStream.cxx
+++ b/writerperfect/source/stream/WPXSvStream.cxx
@@ -99,12 +99,8 @@ int WPXSvInputStream::seek(long offset, WPX_SEEK_TYPE 
seekType)
 sal_Int64 tmpOffset = offset;
 if (seekType == WPX_SEEK_CUR)
 tmpOffset += tmpPosition;
-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
- (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 
 (LIBWPD_STREAM_VERSION_MINOR  9 \
-|| (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
 if (seekType == WPX_SEEK_END)
 tmpOffset += mnLength;
-#endif
 
 int retVal = 0;
 if (tmpOffset  0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Štrba]

 configure.ac|2 +-
 writerperfect/source/common/WPXSvStream.cxx |4 
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 32afec7662fed6eea0714a8bf23e9f040672cb5a
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 15:43:58 2013 +0200

Use inconditionally the libwpd = 0.9.5 path

Since libwpd does not output the version number anymore

Change-Id: I1bc3f7081552795fc2ed33f033a093fa5b40fda8
(cherry picked from commit 93d0e38ccc06060f20073a9461c53f471a1b9c03)
Reviewed-on: https://gerrit.libreoffice.org/5102
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/configure.ac b/configure.ac
index b4ce4a2..03d2ef8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7221,7 +7221,7 @@ libo_CHECK_SYSTEM_MODULE([libcmis],[CMIS],[libcmis-0.3 = 
0.3.1])
 dnl ===
 dnl Check for system libwpd
 dnl ===
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 
libwpd-stream-0.9],[-I${WORKDIR}/UnpackedTarball/libwpd/inc],[-L${OUTDIR}/lib
 -lwpdlib])
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 = 0.9.5 libwpd-stream-0.9 
= 0.9.5],[-I${WORKDIR}/UnpackedTarball/libwpd/inc],[-L${OUTDIR}/lib 
-lwpdlib])
 
 dnl ===
 dnl Check for system lcms2
diff --git a/writerperfect/source/common/WPXSvStream.cxx 
b/writerperfect/source/common/WPXSvStream.cxx
index a79ac6c..e0c8d8c 100644
--- a/writerperfect/source/common/WPXSvStream.cxx
+++ b/writerperfect/source/common/WPXSvStream.cxx
@@ -134,12 +134,8 @@ int WPXSvInputStreamImpl::seek(long offset, WPX_SEEK_TYPE 
seekType)
 sal_Int64 tmpOffset = offset;
 if (seekType == WPX_SEEK_CUR)
 tmpOffset += tmpPosition;
-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
- (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0 
 (LIBWPD_STREAM_VERSION_MINOR  9 \
-|| (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
 if (seekType == WPX_SEEK_END)
 tmpOffset += mnLength;
-#endif
 
 int retVal = 0;
 if (tmpOffset  0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - drawinglayer/source

[Herbert Dürr]

 drawinglayer/source/processor2d/vclprocessor2d.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 78f54616efdcfb1c8cbd1a75d3cf9faf7b5e1b8a
Author: Herbert Dürr h...@apache.org
Date:   Thu Jul 25 13:14:42 2013 +

#i122836# fix rotated images looking corrupted on MacOSX

The solution is to intialize the images rotation mask to be opaque,
an approach that also the fix for bug #i122758#.

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 2fc409d..b14fdb0 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -423,7 +423,8 @@ namespace drawinglayer
 // parts will be uncovered, extend aBitmapEx with a mask bitmap
 const Bitmap aContent(aBitmapEx.GetBitmap());
 #if defined(MACOSX)
-const AlphaMask aMaskBmp( aContent.GetSizePixel());
+AlphaMask aMaskBmp( aContent.GetSizePixel());
+aMaskBmp.Erase( 0);
 #else
 Bitmap aMaskBmp( aContent.GetSizePixel(), 1);
 aMaskBmp.Erase(Color(COL_BLACK)); // #122758# Initialize to 
non-transparent
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: libcdr/libcdr-wpx_seek_end.patch.1 libcdr/UnpackedTarball_libcdr.mk libvisio/libvisio-wpx_seek_end.patch.1 libvisio/UnpackedTarball_libvisio.mk

[Fridrich Štrba]

 libcdr/UnpackedTarball_libcdr.mk   |4 
 libcdr/libcdr-wpx_seek_end.patch.1 |   14 ++
 libvisio/UnpackedTarball_libvisio.mk   |1 +
 libvisio/libvisio-wpx_seek_end.patch.1 |   14 ++
 4 files changed, 33 insertions(+)

New commits:
commit e4906561219fe88345ace8aa4d6f48cbb01262d8
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 16:25:00 2013 +0200

Use the WPX_SEEK_SET inconditionally

Change-Id: I8d202d843b8ecf5a32131058ae1a5cd465e6069c

diff --git a/libcdr/UnpackedTarball_libcdr.mk b/libcdr/UnpackedTarball_libcdr.mk
index a91bc8e..d25d241 100644
--- a/libcdr/UnpackedTarball_libcdr.mk
+++ b/libcdr/UnpackedTarball_libcdr.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\
+   libcdr/libcdr-wpx_seek_end.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-wpx_seek_end.patch.1 
b/libcdr/libcdr-wpx_seek_end.patch.1
new file mode 100644
index 000..67b8587
--- /dev/null
+++ b/libcdr/libcdr-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- a/src/lib/CDRZipStream.cpp
 b/src/lib/CDRZipStream.cpp
+@@ -160,11 +160,7 @@ WPXInputStream 
*libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
+ 
+ bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd()
+ {
+-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
+-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
+-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
+   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
+-#endif
+ m_input-seek(m_cdir_offset, WPX_SEEK_SET);
+   try
+   {
diff --git a/libvisio/UnpackedTarball_libvisio.mk 
b/libvisio/UnpackedTarball_libvisio.mk
index 8b41f4a..64f2b75 100644
--- a/libvisio/UnpackedTarball_libvisio.mk
+++ b/libvisio/UnpackedTarball_libvisio.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
libvisio/libvisio-0.0.30-msvc.patch.1 \
+   libvisio/libvisio-wpx_seek_end.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-wpx_seek_end.patch.1 
b/libvisio/libvisio-wpx_seek_end.patch.1
new file mode 100644
index 000..55bbf57
--- /dev/null
+++ b/libvisio/libvisio-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- a/src/lib/VSDZipStream.cpp
 b/src/lib/VSDZipStream.cpp
+@@ -161,11 +161,7 @@ WPXInputStream 
*libvisio::VSDZipStream::getDocumentOLEStream(const char *name)
+ 
+ bool libvisio::VSDZipStreamImpl::findCentralDirectoryEnd()
+ {
+-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
+-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
+-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
+   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
+-#endif
+ m_input-seek(m_cdir_offset, WPX_SEEK_SET);
+   try
+   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basic/source include/vcl vcl/inc vcl/source

[Gergo Mocsi]

 basctl/source/basicide/baside2.hxx|4 
 basctl/source/basicide/baside2b.cxx   |   16 ++-
 basctl/source/basicide/codecompleteoptionsdlg.cxx |5 -
 basic/source/classes/codecompletecache.cxx|7 -
 include/vcl/lstbox.hxx|2 
 include/vcl/quickselectionengine.hxx  |2 
 vcl/inc/ilstbox.hxx   |1 
 vcl/source/control/ilstbox.cxx|4 
 vcl/source/control/lstbox.cxx |4 
 vcl/source/control/quickselectionengine.cxx   |   92 --
 10 files changed, 81 insertions(+), 56 deletions(-)

New commits:
commit 890e3da2594c60914982b0a51b3672a960da23cd
Author: Gergo Mocsi gmocs...@gmail.com
Date:   Thu Jul 25 16:15:27 2013 +0200

GSOC work, disable QuickSelectionEngine+ListBox navigation modification

Added a function to disable QuickSelectionEngine in ListBox, beacuse it's 
not needed.
ListBox navigation changed: it is not hiding/showing entries, instead of 
it, jumps to the longest match without filtering.
Arrow behavior remains the same.

Change-Id: I8982c280f20929c74f9630cbaa95010820d2e234

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 8737091..42904b2 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -476,10 +476,6 @@ class CodeCompleteListBox: public ListBox
 {
 friend class CodeCompleteWindow;
 private:
-std::vector OUString  aEntryVect;
-/* vector to hold all entries for showing/hiding
- * when typing a letter/word
- * */
 OUStringBuffer aFuncBuffer;
 /* a buffer to build up function name when typing
  * a function name, used for showing/hiding listbox values
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index ac1f0c9..e6aa0b9 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2425,6 +2425,10 @@ long CodeCompleteListBox::PreNotify( NotifyEvent rNEvt )
 
pCodeCompleteWindow-pParent-GetEditView()-DeleteSelected();
 SetVisibleEntries();
 }
+else
+{
+pCodeCompleteWindow-ClearAndHide();
+}
 return 0;
 case KEY_RETURN:
 InsertSelectedEntry();
@@ -2437,12 +2441,13 @@ long CodeCompleteListBox::PreNotify( NotifyEvent rNEvt 
)
 
 void CodeCompleteListBox::SetVisibleEntries()
 {
-Clear();
-for( unsigned int j=0; j  aEntryVect.size(); ++j )
+for(sal_uInt16 i=0; i GetEntryCount(); ++i)
 {
-if( aEntryVect[j].startsWithIgnoreAsciiCase(aFuncBuffer.toString()) )
+OUString sEntry = (OUString) GetEntry(i);
+if( sEntry.startsWithIgnoreAsciiCase( aFuncBuffer.toString() ) )
 {
-InsertEntry(aEntryVect[j]);
+SelectEntry(sEntry);
+break;
 }
 }
 }
@@ -2461,18 +2466,17 @@ void CodeCompleteWindow::InitListBox()
 pListBox-SetSizePixel( Size(150,150) ); //default, this will adopt the 
line length
 pListBox-Show();
 pListBox-GrabFocus();
+pListBox-EnableQuickSelection( false );
 }
 
 void CodeCompleteWindow::InsertEntry( const OUString aStr )
 {
 pListBox-InsertEntry( aStr );
-pListBox-aEntryVect.push_back( aStr );
 }
 
 void CodeCompleteWindow::ClearListBox()
 {
 pListBox-Clear();
-pListBox-aEntryVect.clear();
 pListBox-aFuncBuffer.makeStringAndClear();
 }
 
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx 
b/basctl/source/basicide/codecompleteoptionsdlg.cxx
index 96d1ca7..6dcde74 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.cxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx
@@ -41,8 +41,9 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window* 
pWindow )
 pCancelBtn-SetClickHdl( LINK( this, CodeCompleteOptionsDlg, CancelHdl ) );
 
 pCodeCompleteChk-Check( CodeCompleteOptions::IsCodeCompleteOn() );
-pAutocloseProcChk-Check( CodeCompleteOptions::IsProcedureAutoCompleteOn() 
);
+//pAutocloseProcChk-Check( 
CodeCompleteOptions::IsProcedureAutoCompleteOn() );
 
+pAutocloseProcChk-Enable( false );
 pAutocloseBracesChk-Enable( false );
 pAutocloseQuotesChk-Enable( false );
 }
@@ -54,7 +55,7 @@ CodeCompleteOptionsDlg::~CodeCompleteOptionsDlg()
 IMPL_LINK_NOARG(CodeCompleteOptionsDlg, OkHdl)
 {
 CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk-IsChecked() );
-CodeCompleteOptions::SetProcedureAutoCompleteOn( 
pCodeCompleteChk-IsChecked() );
+//CodeCompleteOptions::SetProcedureAutoCompleteOn( 
pCodeCompleteChk-IsChecked() );
 Close();
 return 0;
 }
diff --git a/basic/source/classes/codecompletecache.cxx 
b/basic/source/classes/codecompletecache.cxx
index cb5d4db..952e4ee 100644
--- 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - libcdr/libcdr-wpx_seek_end.patch.1 libcdr/UnpackedTarball_cdr.mk libvisio/libvisio-wpx_seek_end.patch.1 libvisio/UnpackedTarball_visio.mk

[Fridrich Štrba]

 libcdr/UnpackedTarball_cdr.mk  |1 +
 libcdr/libcdr-wpx_seek_end.patch.1 |   14 ++
 libvisio/UnpackedTarball_visio.mk  |1 +
 libvisio/libvisio-wpx_seek_end.patch.1 |   14 ++
 4 files changed, 30 insertions(+)

New commits:
commit ce89313670c38328db49542a67cbda63ee20a7a6
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 16:25:00 2013 +0200

Use the WPX_SEEK_SET inconditionally

(cherry picked from commit e4906561219fe88345ace8aa4d6f48cbb01262d8)

Conflicts:
libcdr/UnpackedTarball_libcdr.mk
libvisio/UnpackedTarball_libvisio.mk

Change-Id: I8d202d843b8ecf5a32131058ae1a5cd465e6069c
Reviewed-on: https://gerrit.libreoffice.org/5105
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/libcdr/UnpackedTarball_cdr.mk b/libcdr/UnpackedTarball_cdr.mk
index 8affb0b..cea4b29 100644
--- a/libcdr/UnpackedTarball_cdr.mk
+++ b/libcdr/UnpackedTarball_cdr.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,cdr,$(CDR_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,cdr,\
libcdr/msvc2008.patch.1 \
+   libcdr/libcdr-wpx_seek_end.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-wpx_seek_end.patch.1 
b/libcdr/libcdr-wpx_seek_end.patch.1
new file mode 100644
index 000..67b8587
--- /dev/null
+++ b/libcdr/libcdr-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- a/src/lib/CDRZipStream.cpp
 b/src/lib/CDRZipStream.cpp
+@@ -160,11 +160,7 @@ WPXInputStream 
*libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
+ 
+ bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd()
+ {
+-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
+-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
+-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
+   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
+-#endif
+ m_input-seek(m_cdir_offset, WPX_SEEK_SET);
+   try
+   {
diff --git a/libvisio/UnpackedTarball_visio.mk 
b/libvisio/UnpackedTarball_visio.mk
index 20ed993..882a87c0 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,visio,\
libvisio/libvisio-0.0.30-msvc.patch.1 \
+   libvisio/libvisio-wpx_seek_end.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-wpx_seek_end.patch.1 
b/libvisio/libvisio-wpx_seek_end.patch.1
new file mode 100644
index 000..55bbf57
--- /dev/null
+++ b/libvisio/libvisio-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- a/src/lib/VSDZipStream.cpp
 b/src/lib/VSDZipStream.cpp
+@@ -161,11 +161,7 @@ WPXInputStream 
*libvisio::VSDZipStream::getDocumentOLEStream(const char *name)
+ 
+ bool libvisio::VSDZipStreamImpl::findCentralDirectoryEnd()
+ {
+-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
+-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
+-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
+   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
+-#endif
+ m_input-seek(m_cdir_offset, WPX_SEEK_SET);
+   try
+   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - libcdr/libcdr-wpx_seek_end.patch.1 libcdr/UnpackedTarball_libcdr.mk libvisio/libvisio-wpx_seek_end.patch.1 libvisio/UnpackedTarball_libvisio.

[Fridrich Štrba]

 libcdr/UnpackedTarball_libcdr.mk   |4 
 libcdr/libcdr-wpx_seek_end.patch.1 |   14 ++
 libvisio/UnpackedTarball_libvisio.mk   |1 +
 libvisio/libvisio-wpx_seek_end.patch.1 |   14 ++
 4 files changed, 33 insertions(+)

New commits:
commit 79d2084fd8f60f4bc4076e51c31bf136ce2818ba
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Jul 25 16:25:00 2013 +0200

Use the WPX_SEEK_SET inconditionally

Change-Id: I8d202d843b8ecf5a32131058ae1a5cd465e6069c
(cherry picked from commit e4906561219fe88345ace8aa4d6f48cbb01262d8)
Reviewed-on: https://gerrit.libreoffice.org/5104
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/libcdr/UnpackedTarball_libcdr.mk b/libcdr/UnpackedTarball_libcdr.mk
index a91bc8e..d25d241 100644
--- a/libcdr/UnpackedTarball_libcdr.mk
+++ b/libcdr/UnpackedTarball_libcdr.mk
@@ -11,4 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libcdr))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr,\
+   libcdr/libcdr-wpx_seek_end.patch.1 \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libcdr/libcdr-wpx_seek_end.patch.1 
b/libcdr/libcdr-wpx_seek_end.patch.1
new file mode 100644
index 000..67b8587
--- /dev/null
+++ b/libcdr/libcdr-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- a/src/lib/CDRZipStream.cpp
 b/src/lib/CDRZipStream.cpp
+@@ -160,11 +160,7 @@ WPXInputStream 
*libcdr::CDRZipStream::getDocumentOLEStream(const char *name)
+ 
+ bool libcdr::CDRZipStreamImpl::findCentralDirectoryEnd()
+ {
+-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
+-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
+-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
+   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
+-#endif
+ m_input-seek(m_cdir_offset, WPX_SEEK_SET);
+   try
+   {
diff --git a/libvisio/UnpackedTarball_libvisio.mk 
b/libvisio/UnpackedTarball_libvisio.mk
index 8b41f4a..64f2b75 100644
--- a/libvisio/UnpackedTarball_libvisio.mk
+++ b/libvisio/UnpackedTarball_libvisio.mk
@@ -13,6 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libvisio,$(VISIO_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libvisio,\
libvisio/libvisio-0.0.30-msvc.patch.1 \
+   libvisio/libvisio-wpx_seek_end.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-wpx_seek_end.patch.1 
b/libvisio/libvisio-wpx_seek_end.patch.1
new file mode 100644
index 000..55bbf57
--- /dev/null
+++ b/libvisio/libvisio-wpx_seek_end.patch.1
@@ -0,0 +1,14 @@
+--- a/src/lib/VSDZipStream.cpp
 b/src/lib/VSDZipStream.cpp
+@@ -161,11 +161,7 @@ WPXInputStream 
*libvisio::VSDZipStream::getDocumentOLEStream(const char *name)
+ 
+ bool libvisio::VSDZipStreamImpl::findCentralDirectoryEnd()
+ {
+-#if defined(LIBWPD_STREAM_VERSION_MAJOR)  
defined(LIBWPD_STREAM_VERSION_MINOR)  defined(LIBWPD_STREAM_VERSION_REVISION) 
\
+-   (LIBWPD_STREAM_VERSION_MAJOR  0 || (LIBWPD_STREAM_VERSION_MAJOR == 0  
(LIBWPD_STREAM_VERSION_MINOR  9 \
+-  || (LIBWPD_STREAM_VERSION_MINOR == 9  LIBWPD_STREAM_VERSION_REVISION = 
5
+   if (m_cdir_offset || m_input-seek(-1024, WPX_SEEK_END))
+-#endif
+ m_input-seek(m_cdir_offset, WPX_SEEK_SET);
+   try
+   {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Daily Win32 debug builds

[Lubos Lunak]

 Hello,

 as mentioned earlier, I've switched #6 tinderbox to do --enable-debug builds, 
and thanks to Fridrich by now I have also a working version that allows 
anybody to get usable backtraces.

 In short, besides daily builds at 
http://dev-builds.libreoffice.org/daily/master/Win-x86@6-debug/ there is also 
a symbols directory. If you add the 
http://dev-builds.libreoffice.org/daily/master/Win-x86@6-debug/symbols URL to 
MSVC-Tools-Options-Debugging-Symbols , then MSVC will fetch needed .pdb 
files when debugging one of those builds.

 I have no yet updated the wiki and made this public in any other way, as I'd 
like this to be somewhat checked first, and I'm also not completely sure the 
server can handle it. Each full set of .pdb files is about 2.5GiB , the 
tinderbox currently uploads them only for the last 5 dailies for master. 
Additionally, the .pdb symbols store stuff is smart enough to reuse 
unchanged .pdb files (which is quite likely to happen for #6 tinderbox, as it 
does incremental builds, I'm not sure if that'd work also with clean 
rebuilds).

 So I think my questions are basically:
- how much space can I take with this on dev-builds? If I enable it also for 
4.0 and 4.1 tinderbox and keep it for 5 last dailies, the space requirements 
should be somewhere below 100GiB tops, but in practice probably less.
- can the server take the bandwith load? Tinderbox is rate-limited for upload, 
so that's not a problem, but I don't have an estimate for download. MSVC 
downloads only those .pdb files it actually needs, and it can cache them 
locally, so it's hopefully not that much.
- is there any other option I should be asking :) ?

 Attached is a tinderbox master.sh script I currently use.

-- 
 Lubos Lunak
 l.lu...@suse.cz


master.sh
Description: application/shellscript
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - readlicense_oo/docs

[Lionel Elie Mamane]

 readlicense_oo/docs/readme.xrm |   17 -
 1 file changed, 4 insertions(+), 13 deletions(-)

New commits:
commit 94ae7c3f5eb62a46ca6cf984eef260123ec03cce
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Fri Jul 19 03:16:54 2013 +0200

fdo#67061 bring install readme in sync with changed reality

Change-Id: I919311bf8e84b3bd4fbdc595b45625862575405c
Reviewed-on: https://gerrit.libreoffice.org/4975
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 57204c2..018f29d 100755
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -129,35 +129,26 @@
/div
p id=Precautions xml:lang=en-USPlease make sure 
you have enough free memory in the temporary directory on your system, and 
please ensure that read, write and run access rights have been granted. Close 
all other programs before starting the installation process./p
h3 id=sdfsdfgf42s xml:lang=en-USInstallation of 
${PRODUCTNAME} on Debian/Ubuntu-based Linux systems/h3
-   p id=debianinstall1 xml:lang=en-USIf you have a 
previous version of ${PRODUCTNAME} already installed, then you will need to 
de-install it before proceeding further. For instructions on how to install a 
language pack (after having installed the US English version of 
${PRODUCTNAME}), please read the section below entitled Installing a Language 
Pack./p
+   p id=debianinstall1 xml:lang=en-USFor 
instructions on how to install a language pack (after having installed the US 
English version of ${PRODUCTNAME}), please read the section below entitled 
Installing a Language Pack./p
p id=debianinstall2 xml:lang=en-USWhen you unpack 
the downloaded archive, you will see that the contents have been decompressed 
into a sub-directory. Open a file manager window, and change directory to the 
one starting with LibreOffice_, followed by the version number and some 
platform information./p
p id=debianinstall3 xml:lang=en-USThis directory 
contains a subdirectory called DEBS. Change directory to the DEBS 
directory./p
p id=debianinstall4 xml:lang=en-USRight-click 
within the directory and choose Open in Terminal. A terminal window will 
open. From the command line of the terminal window, enter the following command 
(you will be prompted to enter your root user's password before the command 
will execute):/p
p id=debianinstall5 xml:lang=en-USThe following 
commands will install LibreOffice and the desktop integration packages (you may 
just copy and paste them into the terminal screen rather than trying to type 
them):/p
p id=debianinstall6 xml:lang=en-USsudo dpkg -i 
*.deb/p
-   p id=debianinstall7 xml:lang=en-UScd 
desktop-integration/p
-   p id=debianinstall8 xml:lang=en-USsudo dpkg -i 
*.deb/p
p id=debianinstall9 xml:lang=en-USThe 
installation process is now completed, and you should have icons for all the 
${PRODUCTNAME} applications in your desktop's Applications/Office menu./p
h3 id=sdfsdfgf42t xml:lang=en-USInstallation of 
${PRODUCTNAME} on Fedora, openSUSE, Mandriva and other Linux systems using RPM 
packages/h3
-   p id=rpminstall1 xml:lang=en-USIf you have a 
previous version of ${PRODUCTNAME} already installed, then you will need to 
de-install it before proceeding further. For instructions on how to install a 
language pack (after having installed the US English version of 
${PRODUCTNAME}), please read the section below entitled Installing a Language 
Pack./p
+   p id=rpminstall1 xml:lang=en-USFor instructions 
on how to install a language pack (after having installed the US English 
version of ${PRODUCTNAME}), please read the section below entitled Installing a 
Language Pack./p
p id=rpminstall2 xml:lang=en-USWhen you unpack 
the downloaded archive, you will see that the contents have been decompressed 
into a sub-directory. Open a file manager window, and change directory to the 
one starting with LibreOffice_, followed by the version number and some 
platform information./p
p id=rpminstall3 xml:lang=en-USThis directory 
contains a subdirectory called RPMS. Change directory to the RPMS 
directory./p
p id=rpminstall4 xml:lang=en-USRight-click within 
the directory and choose Open in Terminal. A terminal window will open. From 
the command line of the terminal window, enter the following command (you will 
be prompted to enter your root user's password before the command will 
execute):/p
p 

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

[Noel Power]

 sc/source/ui/vba/vbarange.cxx |   34 +++---
 1 file changed, 31 insertions(+), 3 deletions(-)

New commits:
commit 85299e408b780e560be9f0ac2adf526a6250a244
Author: Noel Power noel.po...@suse.com
Date:   Thu Jul 25 14:45:36 2013 +0100

better support Range.FormulaArray ( set )

Change-Id: Ic6c7b6908db2eb01a026aab14bb417dccdbe55b4

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 348e8b7..a0a88e8 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -170,7 +170,8 @@
 
 #include ooo/vba/excel/Range.hpp
 #include com/sun/star/bridge/oleautomation/Date.hpp
-
+#include tokenarray.hxx
+#include tokenuno.hxx
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 using ::std::vector;
@@ -1969,6 +1970,15 @@ ScVbaRange::getFormulaArray() throw 
(uno::RuntimeException)
 return xRange-getFormulaArray();
 }
 
+// return a formula if there is one or else an array
+// still not sure when the return as array code should run
+// ( I think it is if there is more than one formula ) at least
+// that is what the doc says ( but I am not even sure how to detect that )
+// for the moment any tests we have pass
+uno::Reference sheet::XArrayFormulaRange xFormulaArray( mxRange, 
uno::UNO_QUERY_THROW );
+if ( xFormulaArray.is()  !xFormulaArray-getArrayFormula().isEmpty() )
+return uno::makeAny( xFormulaArray-getArrayFormula() );
+
 uno::Reference sheet::XCellRangeFormula xCellRangeFormula( mxRange, 
uno::UNO_QUERY_THROW );
 uno::Reference script::XTypeConverter  xConverter = getTypeConverter( 
mxContext );
 uno::Any aSingleValueOrMatrix;
@@ -1999,8 +2009,26 @@ ScVbaRange::setFormulaArray(const uno::Any rFormula) 
throw (uno::RuntimeExcepti
 }
 // #TODO need to distinguish between getFormula and getFormulaArray e.g. 
(R1C1)
 // but for the moment its just easier to treat them the same for setting
-
-setFormula( rFormula );
+// seems
+uno::Reference lang::XMultiServiceFactory  xModelFactory( getUnoModel(), 
uno::UNO_QUERY_THROW );
+uno::Reference sheet::XFormulaParser  xParser( 
xModelFactory-createInstance( com.sun.star.sheet.FormulaParser ), 
uno::UNO_QUERY_THROW );
+uno::Reference sheet::XCellRangeAddressable  xSource( mxRange, 
uno::UNO_QUERY_THROW);
+
+table::CellRangeAddress aRangeAddress = xSource-getRangeAddress();
+// #TODO check if api orders the address
+// e.g. do we need to order the RangeAddress to get the topleft ( or can 
we assume it
+// is in the correct order )
+table::CellAddress aAddress;
+aAddress.Sheet = aRangeAddress.Sheet;
+aAddress.Column = aRangeAddress.StartColumn;
+aAddress.Row = aRangeAddress.StartRow;
+OUString sFormula;
+rFormula = sFormula;
+uno::Sequencesheet::FormulaToken aTokens = xParser-parseFormula( 
sFormula, aAddress );
+ScTokenArray aTokenArray;
+(void)ScTokenConversion::ConvertToTokenArray( *getScDocument(), 
aTokenArray, aTokens );
+
+getScDocShell()-GetDocFunc().EnterMatrix( *getScRangeList()[0], NULL, 
aTokenArray, OUString(), sal_True, sal_True, EMPTY_STRING, 
formula::FormulaGrammar::GRAM_PODF_A1 );
 }
 
 OUString
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

Bug 60270 depends on bug 67061, which changed state.

Bug 67061 Summary: Install README outdated
https://bugs.freedesktop.org/show_bug.cgi?id=67061

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 78/f54616efdcfb1c8cbd1a75d3cf9faf7b5e1b8a

[Caolán McNamara]

 78/f54616efdcfb1c8cbd1a75d3cf9faf7b5e1b8a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b1fbd2910aea897e13c82a2b57dba330bb6ac9f7
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 16:12:34 2013 +0100

Notes added by 'git notes add'

diff --git a/78/f54616efdcfb1c8cbd1a75d3cf9faf7b5e1b8a 
b/78/f54616efdcfb1c8cbd1a75d3cf9faf7b5e1b8a
new file mode 100644
index 000..9e5cc45
--- /dev/null
+++ b/78/f54616efdcfb1c8cbd1a75d3cf9faf7b5e1b8a
@@ -0,0 +1 @@
+merged as: ff14c3b595ebe71153f97ebb8871cf024ea76959
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 uui/source/newerverwarn.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0d874ee2e452ea67c03a27bf1a7f26d0ffc617dc
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Jul 25 17:11:29 2013 +0200

Fix configuration access path for URL group member

...broken with 20430c74f391ceffd8a063c0b6b8a8fd615abac0 fdo#46037: no more
comphelper/configurationhelper.hxx in uui (but note that
NewerVersionWarningDialog is dead code anyway since
718c0fe73251be083d032f0905880058128d4054 Ported
sfx2-remove-check-update-on-fileload.diff from ooo-build.

Change-Id: I7095044b73888aad12704d76a39551158e6c6b33

diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx
index ac83576..8e4877a 100644
--- a/uui/source/newerverwarn.cxx
+++ b/uui/source/newerverwarn.cxx
@@ -28,6 +28,7 @@
 #include com/sun/star/setup/UpdateCheckConfig.hpp
 #include com/sun/star/util/URLTransformer.hpp
 #include com/sun/star/util/XURLTransformer.hpp
+#include com/sun/star/container/XHierarchicalNameAccess.hpp
 #include com/sun/star/container/XNameReplace.hpp
 
 #include comphelper/processfactory.hxx
@@ -105,10 +106,10 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl)
 
 // TODO: do we need to respect the bUpdateCheckEnabled flag? 
Finally, its meaning is are automatic
 // updates enabled, but this here is not an automatic update, but 
one triggered explicitly by the user.
-css::uno::Reference css::container::XNameAccess  xOfficeHelp = 
officecfg::Office::Addons::AddonUI::OfficeHelp::get(xContext);
+css::uno::Reference css::container::XHierarchicalNameAccess  
xOfficeHelp(officecfg::Office::Addons::AddonUI::OfficeHelp::get(xContext), 
css::uno::UNO_QUERY_THROW);
 
 util::URL aURL;
-if ( xOfficeHelp-getByName(UpdateCheckJob) = aURL.Complete )
+if ( xOfficeHelp-getByHierarchicalName(['UpdateCheckJob']/URL) 
= aURL.Complete )
 {
 uno::Reference util::XURLTransformer  xTransformer( 
util::URLTransformer::create(xContext) );
 xTransformer-parseStrict( aURL );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/uiconfig/ui/optsavepage.ui |   40 +---
 1 file changed, 21 insertions(+), 19 deletions(-)

New commits:
commit 767b02bd7614059dd80d0cd1be306d9b63291f31
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 16:26:54 2013 +0100

Related: fdo#61544 convert save opt page from box to grid

grids compress better than boxes if there isn't enough available space

Change-Id: I12ec10c556fbe80fc1b74b12df47d6fc4b626f6c

diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index 54320f8..a3702fb 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -1,19 +1,11 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
-  object class=GtkAdjustment id=adjustment1
-property name=lower1/property
-property name=upper60/property
-property name=value15/property
-property name=step_increment1/property
-property name=page_increment10/property
-  /object
-  object class=GtkBox id=OptSavePage
+  object class=GtkGrid id=OptSavePage
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=border_width6/property
-property name=orientationvertical/property
-property name=spacing12/property
+property name=row_spacing12/property
 child
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
@@ -84,9 +76,10 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position0/property
+property name=left_attach0/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
 child
@@ -268,9 +261,10 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position1/property
+property name=left_attach0/property
+property name=top_attach1/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
 child
@@ -487,10 +481,18 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position2/property
+property name=left_attach0/property
+property name=top_attach2/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
   /object
+  object class=GtkAdjustment id=adjustment1
+property name=lower1/property
+property name=upper60/property
+property name=value15/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
 /interface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/uiconfig/ui/optgeneralpage.ui |   54 --
 1 file changed, 29 insertions(+), 25 deletions(-)

New commits:
commit c852f83bc4d91de51c61ad4be0edf1b848247eaa
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 16:16:54 2013 +0100

Related: fdo#61544 convert language page from box to grid

grids compress better than boxes if there isn't enough available space

Change-Id: I91b537ec9e26548b3f75482b8e2cce718abbb10f

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 2e59fd9..92597d7 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -1,19 +1,11 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
-  object class=GtkAdjustment id=adjustment1
-property name=lower1583/property
-property name=upper9857/property
-property name=value1930/property
-property name=step_increment1/property
-property name=page_increment10/property
-  /object
-  object class=GtkBox id=OptGeneralPage
+  object class=GtkGrid id=OptGeneralPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=border_width6/property
-property name=orientationvertical/property
-property name=spacing12/property
+property name=row_spacing12/property
 child
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
@@ -83,9 +75,10 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position0/property
+property name=left_attach0/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
 child
@@ -153,9 +146,10 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position1/property
+property name=left_attach0/property
+property name=top_attach1/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
 child
@@ -195,9 +189,10 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position2/property
+property name=left_attach0/property
+property name=top_attach2/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
 child
@@ -267,9 +262,10 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position3/property
+property name=left_attach0/property
+property name=top_attach3/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
 child
@@ -349,10 +345,18 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position4/property
+property name=left_attach0/property
+property name=top_attach4/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
   /object
+  object class=GtkAdjustment id=adjustment1
+property name=lower1583/property
+property name=upper9857/property
+property name=value1930/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
 /interface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 cui/uiconfig/ui/optgeneralpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4f2fa58f027707254cc6d8f076354787c252a26f
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 16:32:42 2013 +0100

Related: fdo#61544 put help tips checkboxes side-by-side

sucks some height out of the page

Change-Id: If1aa064e2ca6515fdde55c077381806942a255bb

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 92597d7..4888d95 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -53,8 +53,8 @@
 property name=draw_indicatorTrue/property
   /object
   packing
-property name=left_attach0/property
-property name=top_attach1/property
+property name=left_attach1/property
+property name=top_attach0/property
 property name=width1/property
 property name=height1/property
   /packing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source

[Noel Power]

 sc/source/ui/vba/vbarange.cxx |   34 +++---
 1 file changed, 31 insertions(+), 3 deletions(-)

New commits:
commit e1082c3af7924ff0eba8740a290e92397388d6e7
Author: Noel Power noel.po...@suse.com
Date:   Thu Jul 25 14:45:36 2013 +0100

better support Range.FormulaArray ( set )

Change-Id: Ic6c7b6908db2eb01a026aab14bb417dccdbe55b4

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 852fefa..dd09b37 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -170,7 +170,8 @@
 
 #include ooo/vba/excel/Range.hpp
 #include com/sun/star/bridge/oleautomation/Date.hpp
-
+#include tokenarray.hxx
+#include tokenuno.hxx
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 using ::std::vector;
@@ -1968,6 +1969,15 @@ ScVbaRange::getFormulaArray() throw 
(uno::RuntimeException)
 return xRange-getFormulaArray();
 }
 
+// return a formula if there is one or else an array
+// still not sure when the return as array code should run
+// ( I think it is if there is more than one formula ) at least
+// that is what the doc says ( but I am not even sure how to detect that )
+// for the moment any tests we have pass
+uno::Reference sheet::XArrayFormulaRange xFormulaArray( mxRange, 
uno::UNO_QUERY_THROW );
+if ( xFormulaArray.is()  !xFormulaArray-getArrayFormula().isEmpty() )
+return uno::makeAny( xFormulaArray-getArrayFormula() );
+
 uno::Reference sheet::XCellRangeFormula xCellRangeFormula( mxRange, 
uno::UNO_QUERY_THROW );
 uno::Reference script::XTypeConverter  xConverter = getTypeConverter( 
mxContext );
 uno::Any aSingleValueOrMatrix;
@@ -1998,8 +2008,26 @@ ScVbaRange::setFormulaArray(const uno::Any rFormula) 
throw (uno::RuntimeExcepti
 }
 // #TODO need to distinguish between getFormula and getFormulaArray e.g. 
(R1C1)
 // but for the moment its just easier to treat them the same for setting
-
-setFormula( rFormula );
+// seems
+uno::Reference lang::XMultiServiceFactory  xModelFactory( getUnoModel(), 
uno::UNO_QUERY_THROW );
+uno::Reference sheet::XFormulaParser  xParser( 
xModelFactory-createInstance( com.sun.star.sheet.FormulaParser ), 
uno::UNO_QUERY_THROW );
+uno::Reference sheet::XCellRangeAddressable  xSource( mxRange, 
uno::UNO_QUERY_THROW);
+
+table::CellRangeAddress aRangeAddress = xSource-getRangeAddress();
+// #TODO check if api orders the address
+// e.g. do we need to order the RangeAddress to get the topleft ( or can 
we assume it
+// is in the correct order )
+table::CellAddress aAddress;
+aAddress.Sheet = aRangeAddress.Sheet;
+aAddress.Column = aRangeAddress.StartColumn;
+aAddress.Row = aRangeAddress.StartRow;
+OUString sFormula;
+rFormula = sFormula;
+uno::Sequencesheet::FormulaToken aTokens = xParser-parseFormula( 
sFormula, aAddress );
+ScTokenArray aTokenArray;
+(void)ScTokenConversion::ConvertToTokenArray( *getScDocument(), 
aTokenArray, aTokens );
+
+getScDocShell()-GetDocFunc().EnterMatrix( *getScRangeList()[0], NULL, 
aTokenArray, OUString(), sal_True, sal_True, EMPTY_STRING, 
formula::FormulaGrammar::GRAM_PODF_A1 );
 }
 
 OUString
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Cédric Bosdonnat]

 ucb/source/ucp/cmis/certvalidation_handler.cxx |   26 +
 1 file changed, 26 insertions(+)

New commits:
commit 1498cf0d9429f992affbe1ab5701b07e66cf1754
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date:   Thu Jul 25 18:00:18 2013 +0200

Store the decision about the certificate in a container to remember it

Change-Id: I19da6c1aeb7fada97166d37c68fa5ba242bbcaba

diff --git a/ucb/source/ucp/cmis/certvalidation_handler.cxx 
b/ucb/source/ucp/cmis/certvalidation_handler.cxx
index 7ac8cda..f13c75b 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.cxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.cxx
@@ -10,7 +10,9 @@
  *
  */
 
+#include com/sun/star/security/CertificateContainer.hpp
 #include com/sun/star/security/XCertificate.hpp
+#include com/sun/star/security/XCertificateContainer.hpp
 #include com/sun/star/security/CertificateValidity.hpp
 #include com/sun/star/xml/crypto/SEInitializer.hpp
 #include com/sun/star/xml/crypto/XSecurityEnvironment.hpp
@@ -59,6 +61,26 @@ namespace cmis
 xSecurityEnv-createCertificateFromAscii(
 sCleanCert ) );
 
+uno::Reference security::XCertificateContainer  
xCertificateContainer;
+try
+{
+xCertificateContainer = 
security::CertificateContainer::create( m_xContext );
+}
+catch ( uno::Exception const  )
+{
+}
+
+if ( xCertificateContainer.is( ) )
+{
+security::CertificateContainerStatus status(
+xCertificateContainer-hasCertificate(
+m_sHostname, xCert-getSubjectName() ) );
+
+if ( status != security::CertificateContainerStatus_NOCERT 
)
+return status == 
security::CertificateContainerStatus_TRUSTED;
+}
+
+// If we had no certificate, ask what to do
 std::vector uno::Reference security::XCertificate   
vecCerts;
 
 for ( ++pIt; pIt != aCertificates.end(); ++pIt )
@@ -90,6 +112,10 @@ namespace cmis
 uno::Reference task::XInteractionApprove  xApprove(
 xSelection.get(), uno::UNO_QUERY );
 bValidate = xApprove.is();
+
+// Store the decision in the container
+xCertificateContainer-addCertificate(
+m_sHostname, xCert-getSubjectName(), bValidate );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/inc/cellform.hxx|5 -
 sc/inc/cellvalue.hxx   |   11 ++-
 sc/inc/chgtrack.hxx|7 +
 sc/inc/editutil.hxx|   13 ++-
 sc/inc/global.hxx  |7 +
 sc/qa/unit/subsequent_filters-test.cxx |9 ++
 sc/source/core/data/cellvalue.cxx  |4 -
 sc/source/core/data/column2.cxx|8 +-
 sc/source/core/data/column3.cxx|   12 +--
 sc/source/core/data/conditio.cxx   |9 +-
 sc/source/core/data/dociter.cxx|8 +-
 sc/source/core/data/document.cxx   |2 
 sc/source/core/data/global.cxx |   16 
 sc/source/core/data/table3.cxx |2 
 sc/source/core/data/validat.cxx|2 
 sc/source/core/tool/cellform.cxx   |   10 +-
 sc/source/core/tool/chgtrack.cxx   |   22 +++---
 sc/source/core/tool/editutil.cxx   |   61 +++--
 sc/source/core/tool/interpr4.cxx   |   10 +-
 sc/source/core/tool/rangeseq.cxx   |2 
 sc/source/filter/dif/difexp.cxx|2 
 sc/source/filter/html/htmlexp.cxx  |2 
 sc/source/filter/xcl97/XclExpChangeTrack.cxx   |2 
 sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |8 +-
 sc/source/ui/docshell/docsh.cxx|4 -
 sc/source/ui/docshell/docsh3.cxx   |4 -
 sc/source/ui/docshell/externalrefmgr.cxx   |4 -
 sc/source/ui/miscdlgs/acredlin.cxx |4 -
 sc/source/ui/unoobj/cellsuno.cxx   |4 -
 sc/source/ui/view/output2.cxx  |3 
 30 files changed, 167 insertions(+), 90 deletions(-)

New commits:
commit 8a42cb382fc1fff6ed0c57b33762080cdc0bd5a4
Author: Eike Rathke er...@redhat.com
Date:   Thu Jul 25 15:33:49 2013 +0200

resolved fdo#67249 use ScFieldEditEngine to resolve field content

ScEditUtil::GetString() iterated over the paragraphs of an
EditTextObject where GetText() does not resolve field content but
returns the embedded field markers. To resolve field content an
ScFieldEditEngine is needed.

This makes it necessary to pass an ScDocument* to obtain the
ScFieldEditEngine from, or for cases where there is no ScDocument in the
context use a static ScFieldEditEngine which unfortunately is not
capable of resolving document specific fields of course, such as
DOCINFO_TITLE and TABLE.

Also added unit test.

(cherry picked from commit 1ecdc7aaf661e97a33cf521f553481d79cd26de2)

Conflicts:
sc/qa/unit/subsequent_filters-test.cxx
sc/qa/unit/ucalc.cxx
sc/source/core/data/column.cxx
sc/source/core/data/column2.cxx
sc/source/core/data/column3.cxx
sc/source/core/data/dociter.cxx
sc/source/core/data/table3.cxx
sc/source/core/data/table4.cxx

Change-Id: Ife3c23b2fec2514b32303239d276c49869786eb5
Reviewed-on: https://gerrit.libreoffice.org/5106
Reviewed-by: Kohei Yoshida kohei.yosh...@suse.de
Tested-by: Kohei Yoshida kohei.yosh...@suse.de

diff --git a/sc/inc/cellform.hxx b/sc/inc/cellform.hxx
index 87181ca..a2369b7 100644
--- a/sc/inc/cellform.hxx
+++ b/sc/inc/cellform.hxx
@@ -43,7 +43,7 @@ public:
 
 static void GetString(
 ScRefCellValue rCell, sal_uLong nFormat, OUString rString,
-Color** ppColor, SvNumberFormatter rFormatter, bool bNullVals = true,
+Color** ppColor, SvNumberFormatter rFormatter, const ScDocument* 
pDoc, bool bNullVals = true,
 bool bFormula  = false, ScForceTextFmt eForceTextFmt = ftDontForce,
 bool bUseStarFormat = false );
 
@@ -53,7 +53,8 @@ public:
 bool bFormula  = false, ScForceTextFmt eForceTextFmt = ftDontForce, 
bool bUseStarFormat = false );
 
 static void GetInputString(
-ScRefCellValue rCell, sal_uLong nFormat, OUString rString, 
SvNumberFormatter rFormatter );
+ScRefCellValue rCell, sal_uLong nFormat, OUString rString, 
SvNumberFormatter rFormatter,
+const ScDocument* pDoc );
 };
 
 
diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index fb7c175..bdb483e 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -126,7 +126,16 @@ struct SC_DLLPUBLIC ScRefCellValue
 
 double getValue();
 
-OUString getString();
+/** Retrieve string value.
+
+@param  pDoc
+Needed to resolve EditCells' field contents, obtain a
+ScFieldEditEngine from that document. May be NULL if there is
+no ScDocument in the calling context but then the document
+specific 

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

[Csikós Tamás]

 sc/source/ui/miscdlgs/mvtabdlg.cxx|5 +
 sc/uiconfig/scalc/ui/movecopysheet.ui |4 +++-
 starmath/uiconfig/smath/ui/alignmentdialog.ui |1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 9a44e90c2c5c19fb310298ed525c2b77f49c97b8
Author: Csikós Tamás csks.t...@gmail.com
Date:   Thu Jul 25 17:56:47 2013 +0200

minor updates

alignmentdialog.ui - The default button's text was aligned to the right
mvtabdlg.cc - the warning text doesn't occupy the space, when there is no 
warning
movecopysheet.ui - top alignment set to 6, radiobuttons aligned horizontally

Change-Id: I5c3fbc512292917a2f4297e164fce73c56a124f3
Reviewed-on: https://gerrit.libreoffice.org/5110
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx 
b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index c3f0153..2dff426 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -157,6 +157,7 @@ void ScMoveTableDlg::CheckNewTabName()
 if (aNewName.isEmpty())
 {
 // New sheet name is empty.  This is not good.
+pFtWarn-Show(sal_True);
 pFtWarn-SetControlBackground(Color(COL_YELLOW));
 pFtWarn-SetText(msStrTabNameEmpty);
 pBtnOk-Disable();
@@ -166,6 +167,7 @@ void ScMoveTableDlg::CheckNewTabName()
 if (!ScDocument::ValidTabName(aNewName))
 {
 // New sheet name contains invalid characters.
+pFtWarn-Show(sal_True);
 pFtWarn-SetControlBackground(Color(COL_YELLOW));
 pFtWarn-SetText(msStrTabNameInvalid);
 pBtnOk-Disable();
@@ -187,12 +189,14 @@ void ScMoveTableDlg::CheckNewTabName()
 
 if ( bFound )
 {
+pFtWarn-Show(sal_True);
 pFtWarn-SetControlBackground(Color(COL_YELLOW));
 pFtWarn-SetText(msStrTabNameUsed);
 pBtnOk-Disable();
 }
 else
 {
+pFtWarn-Hide(sal_True);
 pFtWarn-SetControlBackground();
 pFtWarn-SetText(OUString());
 pBtnOk-Enable();
@@ -221,6 +225,7 @@ void ScMoveTableDlg::Init()
 pBtnMove-Check( true );
 pBtnCopy-Check( false );
 pEdTabName-Enable(false);
+pFtWarn-Hide(sal_True);
 InitDocListBox();
 SelHdl( pLbDoc );
 }
diff --git a/sc/uiconfig/scalc/ui/movecopysheet.ui 
b/sc/uiconfig/scalc/ui/movecopysheet.ui
index 28f0a8c..47b0bad 100644
--- a/sc/uiconfig/scalc/ui/movecopysheet.ui
+++ b/sc/uiconfig/scalc/ui/movecopysheet.ui
@@ -78,18 +78,19 @@
   object class=GtkAlignment id=alignment1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=top_padding6/property
 property name=left_padding12/property
 child
   object class=GtkBox id=box1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=orientationvertical/property
 child
   object class=GtkRadioButton id=move
 property name=label 
translatable=yes_Move/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
+property name=hexpandTrue/property
 property name=use_underlineTrue/property
 property name=xalign0/property
 property name=activeTrue/property
@@ -108,6 +109,7 @@
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultFalse/property
+property name=hexpandTrue/property
 property name=use_underlineTrue/property
 property name=xalign0/property
 property name=draw_indicatorTrue/property
diff --git a/starmath/uiconfig/smath/ui/alignmentdialog.ui 
b/starmath/uiconfig/smath/ui/alignmentdialog.ui
index 7368f21..e0b4fed 100644
--- a/starmath/uiconfig/smath/ui/alignmentdialog.ui
+++ b/starmath/uiconfig/smath/ui/alignmentdialog.ui
@@ -66,7 +66,6 @@
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
 property name=use_underlineTrue/property
-property name=image_positionright/property
   /object
   packing
 property name=expandFalse/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Siqi]

 sd/CppunitTest_sd_uimpress.mk   |   18 +-
 sd/Library_sd.mk|8 
 sd/source/ui/remotecontrol/DiscoveryService.cxx |4 +++-
 3 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit d1a6a00ab873111a6ab8eb7c515ddc65473e260a
Author: Siqi m...@siqi.fr
Date:   Thu Jul 25 17:59:30 2013 +0200

fix for OS where avahi is not present

Change-Id: Ib3e21b786821baa7c3c47755de5125e1de566c39

diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index c1a66ca..af4b821 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -72,13 +72,21 @@ $(eval $(call 
gb_CppunitTest_use_system_darwin_frameworks,sd_uimpress,\
 endif
 
 ifeq ($(OS), LINUX)
-$(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\
-   boost_headers \
-gtk \
-dbus \
-avahi \
+ifeq ($(ENABLE_AVAHI),TRUE)
+$(eval $(call gb_Library_use_externals,sd,\
+boost_headers \
+gtk \
+dbus \
+avahi \
 ))
 else
+$(eval $(call gb_Library_use_externals,sd,\
+boost_headers \
+gtk \
+dbus \
+))
+endif
+else
 $(eval $(call gb_CppunitTest_use_externals,sd_uimpress,\
boost_headers \
 gtk \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 9466102..f74514b 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -95,6 +95,7 @@ $(eval $(call gb_Library_use_libraries,sd,\
 ))
 
 ifeq ($(OS), LINUX)
+ifeq ($(ENABLE_AVAHI),TRUE)
 $(eval $(call gb_Library_use_externals,sd,\
boost_headers \
libxml2 \
@@ -108,6 +109,13 @@ $(eval $(call gb_Library_use_externals,sd,\
dbus \
 ))
 endif
+else
+$(eval $(call gb_Library_use_externals,sd,\
+   boost_headers \
+   libxml2 \
+   dbus \
+))
+endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,sd,\
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx 
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 262c47a..1b2db77 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -10,7 +10,6 @@
 #include errno.h
 #include stdlib.h
 #include string.h
-#include unistd.h
 #include algorithm
 #include vector
 #include iostream
@@ -29,6 +28,7 @@
   #include ws2tcpip.h
   typedef int socklen_t;
 #else
+  #include unistd.h
   #include sys/types.h
   #include sys/socket.h
   #include netinet/in.h
@@ -58,12 +58,14 @@ DiscoveryService::DiscoveryService()
 zService = new OSXNetworkService();
 #endif
 #ifdef LINUX
+#ifdef ENABLE_AVAHI
 // Avahi for Linux
 char hostname[1024];
 hostname[1023] = '\0';
 gethostname(hostname, 1023);
 
 zService = new AvahiNetworkService(hostname);
+#endif
 #endif
 
 zService-setup();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/layout.hxx |1 
 sd/source/ui/remotecontrol/AvahiNetworkService.hxx |2 
 sd/source/ui/remotecontrol/ZeroconfService.hxx |1 
 vcl/source/window/layout.cxx   |   54 -
 4 files changed, 45 insertions(+), 13 deletions(-)

New commits:
commit 0b8e897647d8ea0356c5f2e204c1ee3e4512df18
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 17:23:25 2013 +0100

WaE: virtual dtor warnings

Change-Id: I22b79ed43db2233b5c8edd90092ca387bfd0ca9a

diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx 
b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
index 62809af..8f506f1 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
@@ -28,7 +28,7 @@ namespace sd {
 public:
 AvahiNetworkService(const std::string aname = , uint aport = 1599)
 : ZeroconfService(aname, aport){}
-~AvahiNetworkService();
+virtual ~AvahiNetworkService(){}
 
 void clear();
 void setup();
diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx 
b/sd/source/ui/remotecontrol/ZeroconfService.hxx
index a3e92fa..a31776d 100644
--- a/sd/source/ui/remotecontrol/ZeroconfService.hxx
+++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx
@@ -28,6 +28,7 @@ namespace sd{
 public:
 explicit ZeroconfService(const std::string aname, uint aport)
 :name(aname), port(aport){}
+virtual ~ZeroconfService(){}
 
 std::string getName() const {return name;}
 void setName(const char * n) {name = n;}
commit b64adf65afb1cfe1bd48fed0d71ac333ad962776
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 16:58:36 2013 +0100

Resolves: fdo#61544 improve handling of grid's not enough layout space

Change-Id: I9a73e90f639bb853b67daa98d5daac155dab5900

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 2178aff..1463569 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -388,6 +388,7 @@ public:
 private:
 void calcMaxs(const array_type A, std::vectorValue rWidths, 
std::vectorValue rHeights) const;
 
+Size calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32 
nColSpacing) const;
 virtual Size calculateRequisition() const;
 virtual void setAllocation(const Size rAllocation);
 public:
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index ba62a22..d458a8a 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -984,6 +984,11 @@ VclGrid::Value accumulateValues(const VclGrid::Value i, 
const VclGrid::Value j
 
 Size VclGrid::calculateRequisition() const
 {
+return calculateRequisitionForSpacings(get_row_spacing(), 
get_column_spacing());
+}
+
+Size VclGrid::calculateRequisitionForSpacings(sal_Int32 nRowSpacing, sal_Int32 
nColSpacing) const
+{
 array_type A = assembleGrid();
 
 if (isNullGrid(A))
@@ -1004,7 +1009,7 @@ Size VclGrid::calculateRequisition() const
 nTotalWidth = std::accumulate(aWidths.begin(), aWidths.end(), Value(), 
accumulateValues).m_nValue;
 }
 
-nTotalWidth += get_column_spacing() * (aWidths.size()-1);
+nTotalWidth += nColSpacing * (aWidths.size()-1);
 
 long nTotalHeight = 0;
 if (get_row_homogeneous())
@@ -1017,7 +1022,7 @@ Size VclGrid::calculateRequisition() const
 nTotalHeight = std::accumulate(aHeights.begin(), aHeights.end(), 
Value(), accumulateValues).m_nValue;
 }
 
-nTotalHeight += get_row_spacing() * (aHeights.size()-1);
+nTotalHeight += nRowSpacing * (aHeights.size()-1);
 
 return Size(nTotalWidth, nTotalHeight);
 }
@@ -1041,9 +1046,12 @@ void VclGrid::setAllocation(const Size rAllocation)
 calcMaxs(A, aWidths, aHeights);
 }
 
+sal_Int32 nColSpacing(get_column_spacing());
+sal_Int32 nRowSpacing(get_row_spacing());
+
 long nAvailableWidth = rAllocation.Width();
 if (nMaxX)
-nAvailableWidth -= get_column_spacing() * (nMaxX - 1);
+nAvailableWidth -= nColSpacing * (nMaxX - 1);
 if (get_column_homogeneous())
 {
 for (sal_Int32 x = 0; x  nMaxX; ++x)
@@ -1057,9 +1065,20 @@ void VclGrid::setAllocation(const Size rAllocation)
 ++nExpandables;
 long nExtraWidthForExpanders = nExpandables ? (rAllocation.Width() - 
aRequisition.Width()) / nExpandables : 0;
 
-if (rAllocation.Width()  aRequisition.Width())
+//We don't fit and there is no volunteer to be shrunk
+if (!nExpandables  rAllocation.Width()  aRequisition.Width())
 {
-long nExtraWidth = (rAllocation.Width() - aRequisition.Width() - 
nExtraWidthForExpanders * nExpandables) / nMaxX;
+//first reduce spacing, to a min of 3
+while (nColSpacing = 6)
+{
+nColSpacing /= 2;
+aRequisition = calculateRequisitionForSpacings(nRowSpacing, 

[Libreoffice-commits] core.git: 2 commits - config_host.mk.in configure.ac

[Tor Lillqvist]

 config_host.mk.in |6 +++---
 configure.ac  |3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 08fc25e8db2edcd1e82c2c43207af6d009ae2329
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 25 19:29:24 2013 +0300

Move the Avahi entries into sorted location

Change-Id: I35e638ffa0766fe39cdfef2123f1db31d9558438

diff --git a/config_host.mk.in b/config_host.mk.in
index 343d9b5..6fb1cc8 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -25,6 +25,8 @@ export AR=@AR@
 export ASSERT_ALWAYS_ABORT=@ASSERT_ALWAYS_ABORT@
 export ATL_INCLUDE=@ATL_INCLUDE@
 export ATL_LIB=@ATL_LIB@
+export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@
+export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@
 export LIBATOMIC_OPS_CFLAGS=$(gb_SPACE)@LIBATOMIC_OPS_CFLAGS@
 export LIBATOMIC_OPS_LIBS=$(gb_SPACE)@LIBATOMIC_OPS_LIBS@
 export AWTLIB=@AWTLIB@
@@ -103,6 +105,7 @@ export DOCDIR=@DOCDIR@
 export DOXYGEN=@DOXYGEN@
 export DO_FETCH_TARBALLS=@DO_FETCH_TARBALLS@
 export DPKG=@DPKG@
+export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CORETEXT=@ENABLE_CORETEXT@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
@@ -116,7 +119,6 @@ export ENABLE_EVOAB2=@ENABLE_EVOAB2@
 export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
 export ENABLE_GCONF=@ENABLE_GCONF@
 export ENABLE_GIO=@ENABLE_GIO@
-export ENABLE_AVAHI=@ENABLE_AVAHI@
 export ENABLE_GNOMEVFS=@ENABLE_GNOMEVFS@
 export ENABLE_GRAPHITE=@ENABLE_GRAPHITE@
 export ENABLE_HARFBUZZ=@ENABLE_HARFBUZZ@
@@ -178,8 +180,6 @@ export GCONF_CFLAGS=$(gb_SPACE)@GCONF_CFLAGS@
 export GCONF_LIBS=$(gb_SPACE)@GCONF_LIBS@
 export GIO_CFLAGS=$(gb_SPACE)@GIO_CFLAGS@
 export GIO_LIBS=$(gb_SPACE)@GIO_LIBS@
-export AVAHI_CFLAGS=$(gb_SPACE)@AVAHI_CFLAGS@
-export AVAHI_LIBS=$(gb_SPACE)@AVAHI_LIBS@
 export GIT_REFERENCE_SRC=@GIT_REFERENCE_SRC@
 export GIT_LINK_SRC=@GIT_LINK_SRC@
 export GIT_NEEDED_SUBMODULES=@GIT_NEEDED_SUBMODULES@
commit 4a2a7060696b42bd7002f35e91b1d88046e504d5
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 25 19:12:12 2013 +0300

Clean up configure output for Avahi

Change-Id: Ice3d3058b0b60642769c09496258cf34e022ff89

diff --git a/configure.ac b/configure.ac
index 496c29d..1a65c0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11388,7 +11388,6 @@ AC_SUBST(CAIRO_LIBS)
 dnl ===
 dnl Test whether to use avahi
 dnl ===
-AC_MSG_CHECKING([whether to enable avahi support])
 if test $_os != WINNT -a $_os != Darwin -a $enable_avahi = yes; 
then
 PKG_CHECK_MODULES([AVAHI], [avahi-client = 0.6.10],
   [ENABLE_AVAHI=TRUE], [ENABLE_AVAHI=])
@@ -11396,8 +11395,6 @@ if test $_os != WINNT -a $_os != Darwin -a 
$enable_avahi = yes; then
 AC_DEFINE(ENABLE_AVAHI)
 AVAHI_CFLAGS=$(printf '%s' $AVAHI_CFLAGS | sed -e 
s/-I/${ISYSTEM?}/g)
 fi
-else
-AC_MSG_RESULT([no])
 fi
 
 AC_SUBST(ENABLE_AVAHI)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/Library_sd.mk

[Tor Lillqvist]

 sd/Library_sd.mk |   12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit 9f161a847a5fefbb400f6dd5b257fba56b0cadcc
Author: Tor Lillqvist t...@iki.fi
Date:   Thu Jul 25 19:46:57 2013 +0300

Avoid duplication, use if function instead of ifeq

Change-Id: I1ea52a43278f2e9971987037e80842f8c55a8782

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index f74514b..21a4ab8 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -95,12 +95,13 @@ $(eval $(call gb_Library_use_libraries,sd,\
 ))
 
 ifeq ($(OS), LINUX)
-ifeq ($(ENABLE_AVAHI),TRUE)
 $(eval $(call gb_Library_use_externals,sd,\
boost_headers \
libxml2 \
dbus \
-   avahi \
+   $(if $(ENABLE_AVAHI), \
+   avahi \
+   ) \
 ))
 else
 $(eval $(call gb_Library_use_externals,sd,\
@@ -109,13 +110,6 @@ $(eval $(call gb_Library_use_externals,sd,\
dbus \
 ))
 endif
-else
-$(eval $(call gb_Library_use_externals,sd,\
-   boost_headers \
-   libxml2 \
-   dbus \
-))
-endif
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,sd,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basic/source include/basic

[Gergo Mocsi]

 basctl/source/basicide/baside2b.cxx   |   24 +-
 basctl/source/basicide/codecompleteoptionsdlg.cxx |5 +--
 basic/source/classes/codecompletecache.cxx|2 -
 basic/source/classes/sbxmod.cxx   |   29 ++
 include/basic/codecompletecache.hxx   |   16 +++-
 include/basic/sbmod.hxx   |   20 +--
 6 files changed, 62 insertions(+), 34 deletions(-)

New commits:
commit 3f8a8754e890a2b85e171d5d10d3b1bafb030429
Author: Gergo Mocsi gmocs...@gmail.com
Date:   Thu Jul 25 19:12:37 2013 +0200

GSOC work, procedure autoclose implementation

Now, function procedure autoclose is working.
Created a struct named IncompleteProcData to store the line number, type 
and name of the inclomplete procedure. Procedures are store in a vector 
(IncompleteProcedures), and are as a member in SbModule.
I've created a function called SbModule::GetIncompleteProcedures() to 
extract the data. Data extraction uses SbModule::SetSource32, beacuse that one 
tokenizes sthe source file, and recognizes procedures.
Closing procedures is triggered ky pressing the Enter key when typing. It 
checks the actual sub, and if it's incomplete, adds the correct ending( End 
Sub/End Function).
There is only one problem: function SbModule::SetSource32 is not too often 
calle, maybe extraction should be done by a timer.

Change-Id: Id88daaef329e8b5c194b765c5261d356bfb3a0c9

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index e6aa0b9..5f1af6a 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -499,6 +499,29 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
 // see if there is an accelerator to be processed first
 bool bDone = SfxViewShell::Current()-KeyInput( rKEvt );
 
+if( rKEvt.GetKeyCode().GetCode() == KEY_RETURN  
CodeCompleteOptions::IsProcedureAutoCompleteOn() )
+{//autoclose implementation
+TextSelection aSel = GetEditView()-GetSelection();
+sal_uLong nLine =  aSel.GetStart().GetPara();
+OUString sActSub = GetActualSubName( nLine );
+IncompleteProcedures aProcData = 
rModulWindow.GetSbModule()-GetIncompleteProcedures();
+for( unsigned int i = 0; i  aProcData.size(); ++i )
+{
+if( aProcData[i].sProcName == sActSub )
+{//found the procedure to autocomplete
+TextPaM aEnd( aProcData[i].nLine, 0 );
+TextPaM aStart( aProcData[i].nLine, 0 );
+GetEditView()-SetSelection( TextSelection( aStart, aEnd ) );
+if( aProcData[i].aType == AutocompleteType::ACSUB )
+GetEditView()-InsertText( OUString(\nEnd Sub\n) );
+if( aProcData[i].aType == AutocompleteType::ACFUNC )
+GetEditView()-InsertText( OUString(\nEnd Function\n) );
+GetEditView()-SetSelection( aSel );
+break;
+}
+}
+}
+
 if( rKEvt.GetKeyCode().GetCode() == KEY_POINT  
CodeCompleteOptions::IsCodeCompleteOn() )
 {
 rModulWindow.UpdateModule();
@@ -506,7 +529,6 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
 TextSelection aSel = GetEditView()-GetSelection();
 sal_uLong nLine =  aSel.GetStart().GetPara();
 OUString aLine( pEditEngine-GetText( nLine ) ); // the line being 
modified
-//OUString sActSub = GetActualSubName( nLine );
 std::vector OUString  aVect;
 
 HighlightPortions aPortions;
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx 
b/basctl/source/basicide/codecompleteoptionsdlg.cxx
index 6dcde74..0f4ab3a 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.cxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx
@@ -41,9 +41,8 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window* 
pWindow )
 pCancelBtn-SetClickHdl( LINK( this, CodeCompleteOptionsDlg, CancelHdl ) );
 
 pCodeCompleteChk-Check( CodeCompleteOptions::IsCodeCompleteOn() );
-//pAutocloseProcChk-Check( 
CodeCompleteOptions::IsProcedureAutoCompleteOn() );
+pAutocloseProcChk-Check( CodeCompleteOptions::IsProcedureAutoCompleteOn() 
);
 
-pAutocloseProcChk-Enable( false );
 pAutocloseBracesChk-Enable( false );
 pAutocloseQuotesChk-Enable( false );
 }
@@ -55,7 +54,7 @@ CodeCompleteOptionsDlg::~CodeCompleteOptionsDlg()
 IMPL_LINK_NOARG(CodeCompleteOptionsDlg, OkHdl)
 {
 CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk-IsChecked() );
-//CodeCompleteOptions::SetProcedureAutoCompleteOn( 
pCodeCompleteChk-IsChecked() );
+CodeCompleteOptions::SetProcedureAutoCompleteOn( 
pAutocloseProcChk-IsChecked() );
 Close();
 return 0;
 }
diff --git a/basic/source/classes/codecompletecache.cxx 
b/basic/source/classes/codecompletecache.cxx
index 952e4ee..51eee1c 100644
--- 

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

[Kohei Yoshida]

 sc/inc/column.hxx|1 +
 sc/inc/table.hxx |6 ++
 sc/source/core/data/column.cxx   |   21 +
 sc/source/core/data/document.cxx |   28 
 sc/source/core/data/table2.cxx   |8 
 5 files changed, 64 insertions(+)

New commits:
commit 7299db371e38d1a3ecd51eb3811344ee5bb3a086
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 12:24:01 2013 -0400

Propagate change on COLUMN() and ROW() functions on position change.

1) Insert =COLUMN() or =ROW() in arbitrary cell.
2) Have another cell reference that cell.
3) Insert or delete column or row to change the cell that contains
   COLUMN or ROW function. This will change the result of that cell.
4) Check the result of the 2nd cell that references the first.  The
   value change is not propagated.

This commit fixes that.

NB: master has a similar but different fix. Due to the difference in
cell storage between master and 4.1, I had to devise a different fix
for the 4.1 branch.

Change-Id: Ib1b730e7a4a70a11b967b88730a68362e061a8a0
Reviewed-on: https://gerrit.libreoffice.org/5113
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index dfc46b0..935c07e 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -440,6 +440,7 @@ public:
 voidStartAllListeners();
 voidStartNeededListeners(); // only for cells where 
NeedsListening()==true
 voidSetRelNameDirty();
+void BroadcastRecalcOnRefMove();
 
 voidCompileDBFormula();
 voidCompileDBFormula( bool bCreateFormulaString );
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b62fa1e..20b0ed7 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -853,6 +853,12 @@ public:
 void DeleteBroadcasters( sc::ColumnBlockPosition rBlockPos, SCCOL nCol, 
SCROW nRow1, SCROW nRow2 );
 bool HasBroadcaster( SCCOL nCol ) const;
 
+/**
+ * Broadcast dirty formula cells that contain functions such as CELL(),
+ * COLUMN() or ROW() which may change its value on move.
+ */
+void BroadcastRecalcOnRefMove();
+
 /** Replace behaves differently to the Search; adjust the rCol and rRow 
accordingly.
 
 'Replace' replaces at the 'current' position, but in order to achieve
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 88cb65d..b687489 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2175,6 +2175,27 @@ void ScColumn::SetRelNameDirty()
 pDocument-SetAutoCalc( bOldAutoCalc );
 }
 
+void ScColumn::BroadcastRecalcOnRefMove()
+{
+bool bOldAutoCalc = pDocument-GetAutoCalc();
+pDocument-SetAutoCalc( false );// no multiple recalculation
+
+ScHint aHint(SC_HINT_DATACHANGED, ScAddress(nCol, 0, nTab));
+for (SCSIZE i=0; imaItems.size(); i++)
+{
+if (maItems[i].pCell-GetCellType() != CELLTYPE_FORMULA)
+continue;
+
+ScFormulaCell* p = static_castScFormulaCell*(maItems[i].pCell);
+if (p-GetDirty()  p-GetCode()-IsRecalcModeOnRefMove())
+{
+aHint.GetAddress().SetRow(maItems[i].nRow);
+pDocument-Broadcast(aHint);
+}
+
+}
+pDocument-SetAutoCalc( bOldAutoCalc );
+}
 
 void ScColumn::CalcAll()
 {
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 4933e5d..02d6e21 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -1115,6 +1115,18 @@ bool ScDocument::CanInsertRow( const ScRange rRange ) 
const
 return bTest;
 }
 
+namespace {
+
+struct BroadcastRecalcOnRefMoveHandler : std::unary_functionScTable*, void
+{
+void operator() (ScTable* p)
+{
+if (p)
+p-BroadcastRecalcOnRefMove();
+}
+};
+
+}
 
 bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab,
 SCCOL nEndCol,   SCTAB nEndTab,
@@ -1194,6 +1206,10 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB 
nStartTab,
 for (; it != maTabs.end(); ++it)
 if (*it)
 (*it)-SetRelNameDirty();
+
+// Cells containing functions such as CELL, COLUMN or ROW may have
+// changed their values on relocation. Broadcast them.
+std::for_each(maTabs.begin(), maTabs.end(), 
BroadcastRecalcOnRefMoveHandler());
 }
 bRet = true;
 }
@@ -1285,6 +1301,10 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB 
nStartTab,
 for (; it != maTabs.end(); ++it)
 if (*it)
 (*it)-SetRelNameDirty();
+
+// Cells containing functions such as CELL, COLUMN or ROW may have
+// changed their values on relocation. Broadcast them.
+std::for_each(maTabs.begin(), maTabs.end(), 

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

[Caolán McNamara]

 sw/source/ui/app/swmodule.cxx|2 
 sw/source/ui/inc/workctrl.hxx|   25 +++
 sw/source/ui/ribbar/workctrl.cxx |  256 ---
 3 files changed, 186 insertions(+), 97 deletions(-)

New commits:
commit cf908fbf1119446000fe75c57f15d08046b8091d
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 14:47:01 2013 +0100

Resolves: fdo#67113 split insert autotext and field controls

autotext is a modal dialog and insert field is a modeless dialog so I don't
want autotext to show a toggle in insert-autotext

At the same time we want the autotext entry in the insert toolbar to have a
dropdown and we appear to want to be able to close the insert field dialog 
from
the toolbar.

So split the combined handler class into two and remove the other if/else
branch in each with the insert field a SfxBoolItem and the insert autotext 
an
SfxVoidItem.

Change-Id: I3d59052ee70a00d63f7706166290b00ad9ae22c0
(cherry picked from commit bb98778dbf761a0c88c96117add00a66e5cc6c95)
Reviewed-on: https://gerrit.libreoffice.org/5112
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index fb53d18..b0465ca 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -300,7 +300,7 @@ void SwDLL::RegisterControls()
 SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod );
 SwTbxInsertCtrl::RegisterControl(FN_INSERT_CTRL, pMod );
 SwTbxInsertCtrl::RegisterControl(FN_INSERT_OBJ_CTRL, pMod );
-SwTbxAutoTextCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod );
+SwTbxFieldCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod );
 SwTbxAutoTextCtrl::RegisterControl(FN_GLOSSARY_DLG, pMod );
 
 SvxTbxCtlCustomShapes::RegisterControl( SID_DRAWTBX_CS_BASIC, pMod );
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index 8dcd318..1c7b231 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -95,7 +95,7 @@ public:
 SFX_DECL_TOOLBOX_CONTROL();
 
 SwTbxAutoTextCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox rTbx );
-~SwTbxAutoTextCtrl();
+virtual ~SwTbxAutoTextCtrl();
 
 virtual SfxPopupWindowType  GetPopupWindowType() const;
 virtual SfxPopupWindow* CreatePopupWindow();
@@ -106,6 +106,29 @@ public:
 DECL_LINK(PopupHdl, PopupMenu*);
 };
 
+class SwTbxFieldCtrl : public SfxToolBoxControl
+{
+PopupMenu*  pPopup;
+SwView* pView;
+
+
+voidDelPopup();
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+
+SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox rTbx );
+virtual ~SwTbxFieldCtrl();
+
+virtual SfxPopupWindowType  GetPopupWindowType() const;
+virtual SfxPopupWindow* CreatePopupWindow();
+virtual voidStateChanged( sal_uInt16 nSID,
+  SfxItemState eState,
+  const SfxPoolItem* pState );
+
+DECL_LINK(PopupHdl, PopupMenu*);
+};
+
+
 
 //
 //
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 384db99..ccbc2bf 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -57,7 +57,8 @@ using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::frame;
 
 SFX_IMPL_TOOLBOX_CONTROL( SwTbxInsertCtrl, SfxImageItem);
-SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxBoolItem );
+SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxVoidItem );
+SFX_IMPL_TOOLBOX_CONTROL( SwTbxFieldCtrl, SfxBoolItem );
 
 SwTbxInsertCtrl::SwTbxInsertCtrl(
 sal_uInt16 nSlotId,
@@ -187,44 +188,30 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 {
 Link aLnk = LINK(this, SwTbxAutoTextCtrl, PopupHdl);
 
-if (GetSlotId() == FN_INSERT_FIELD_CTRL)
+pPopup = new PopupMenu;
+SwGlossaryList* pGlossaryList = ::GetGlossaryList();
+sal_uInt16 nGroupCount = pGlossaryList-GetGroupCount();
+for(sal_uInt16 i = 1; i = nGroupCount; i++)
 {
-pPopup = new PopupMenu(SW_RES(RID_INSERT_FIELD_CTRL));
-pPopup-SetSelectHdl(aLnk);
-
-if (::GetHtmlMode(pView-GetDocShell())  HTMLMODE_ON)
-{
-
pPopup-RemoveItem(pPopup-GetItemPos(FN_INSERT_FLD_PGCOUNT));
-
pPopup-RemoveItem(pPopup-GetItemPos(FN_INSERT_FLD_TOPIC));
-}
-}
-else
-{
-pPopup = new PopupMenu;
-SwGlossaryList* pGlossaryList = ::GetGlossaryList();
-sal_uInt16 nGroupCount = pGlossaryList-GetGroupCount();
-for(sal_uInt16 i = 

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

[Ivan Timofeev]

 sw/source/ui/ribbar/workctrl.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit ab79f3def7ce98d27e096e6b40203787dde2f3fb
Author: Ivan Timofeev timofeev@gmail.com
Date:   Thu Jul 25 14:58:42 2013 +0400

Related: fdo#67113 restore some code, it has side effects

these lines were removed in 8275c8fc33b63aa40a0a8a8c215f32b9986edab6

fixes missing AutoText menu entries and AutoText insertion via menu

Change-Id: Ifa498d1cbfc096cca7751de9c9667fda6f1b3b48
(cherry picked from commit a645a14cf46a1160c426052823772ad117f0bd8b)
Reviewed-on: https://gerrit.libreoffice.org/5111
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index b7d959c..384db99 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -207,6 +207,7 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow()
 {
 // Acquire group name with path extension
 String sTitle;
+pGlossaryList-GetGroupName(i - 1, sal_False, sTitle);
 sal_uInt16 nBlockCount = pGlossaryList-GetBlockCount(i 
-1);
 if(nBlockCount)
 {
@@ -303,6 +304,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu)
 SwGlossaryList* pGlossaryList = ::GetGlossaryList();
 String sShortName;
 String sGroup = pGlossaryList-GetGroupName(nBlock - 1, false);
+pGlossaryList-GetBlockName(nBlock - 1, nId - (100 * nBlock) - 1, 
sShortName);
 
 SwGlossaryHdl* pGlosHdl = pView-GetGlosHdl();
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig

[Caolán McNamara]

 cui/uiconfig/ui/optsavepage.ui |   40 +---
 1 file changed, 21 insertions(+), 19 deletions(-)

New commits:
commit a80828ba6bfa68d3c23af98e2717bb1adc8983e8
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 16:26:54 2013 +0100

Related: fdo#61544 convert save opt page from box to grid

grids compress better than boxes if there isn't enough available space

Change-Id: I12ec10c556fbe80fc1b74b12df47d6fc4b626f6c
(cherry picked from commit 767b02bd7614059dd80d0cd1be306d9b63291f31)
Reviewed-on: https://gerrit.libreoffice.org/5107
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index 54320f8..a3702fb 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -1,19 +1,11 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
-  object class=GtkAdjustment id=adjustment1
-property name=lower1/property
-property name=upper60/property
-property name=value15/property
-property name=step_increment1/property
-property name=page_increment10/property
-  /object
-  object class=GtkBox id=OptSavePage
+  object class=GtkGrid id=OptSavePage
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=border_width6/property
-property name=orientationvertical/property
-property name=spacing12/property
+property name=row_spacing12/property
 child
   object class=GtkFrame id=frame1
 property name=visibleTrue/property
@@ -84,9 +76,10 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position0/property
+property name=left_attach0/property
+property name=top_attach0/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
 child
@@ -268,9 +261,10 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position1/property
+property name=left_attach0/property
+property name=top_attach1/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
 child
@@ -487,10 +481,18 @@
 /child
   /object
   packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=position2/property
+property name=left_attach0/property
+property name=top_attach2/property
+property name=width1/property
+property name=height1/property
   /packing
 /child
   /object
+  object class=GtkAdjustment id=adjustment1
+property name=lower1/property
+property name=upper60/property
+property name=value15/property
+property name=step_increment1/property
+property name=page_increment10/property
+  /object
 /interface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig

[Caolán McNamara]

 cui/uiconfig/ui/optgeneralpage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ab8f39aae069f65a8ebd3cad45d33e2e75426597
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jul 25 16:32:42 2013 +0100

Related: fdo#61544 put help tips checkboxes side-by-side

sucks some height out of the page

Change-Id: If1aa064e2ca6515fdde55c077381806942a255bb
(cherry picked from commit 4f2fa58f027707254cc6d8f076354787c252a26f)
Reviewed-on: https://gerrit.libreoffice.org/5108
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/cui/uiconfig/ui/optgeneralpage.ui 
b/cui/uiconfig/ui/optgeneralpage.ui
index 2e59fd9..98e757f 100644
--- a/cui/uiconfig/ui/optgeneralpage.ui
+++ b/cui/uiconfig/ui/optgeneralpage.ui
@@ -61,8 +61,8 @@
 property name=draw_indicatorTrue/property
   /object
   packing
-property name=left_attach0/property
-property name=top_attach1/property
+property name=left_attach1/property
+property name=top_attach0/property
 property name=width1/property
 property name=height1/property
   /packing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit cb859a727dd796f5c9d47deb860df8b25b17fe97
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 25 15:32:09 2013 +0200

fdo#67269 adapt checkTable to getTableName change

getTableName used to return schema.table;
now it returns just table
But tables are indexed by schema.table in getTables(), so reconstruct that 
for the lookup.

Change-Id: I53da1e43762b3a470e34b5dfdb0e1bb3dc914780
Reviewed-on: https://gerrit.libreoffice.org/5100
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 8a8845f..15bbc5c 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -213,9 +213,10 @@ void ResultSetMetaData::checkTable()
 }
 if( tables.is() )
 {
-OUString name = getTableName( 1 );
-// if( tables-hasByName( name ) )
-tables-getByName( name ) = m_table;
+const OUString name   (getTableName ( 1 ));
+const OUString schema (getSchemaName( 1 ));
+const OUString composedName( schema.isEmpty() ? name : (schema 
+ . + name) );
+tables-getByName( composedName ) = m_table;
 }
 }
 }
___
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' - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c39c9c8ca312e569066e9d717c00bc99613b3189
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Thu Jul 25 15:32:09 2013 +0200

fdo#67269 adapt checkTable to getTableName change

getTableName used to return schema.table;
now it returns just table
But tables are indexed by schema.table in getTables(), so reconstruct that 
for the lookup.

Change-Id: I53da1e43762b3a470e34b5dfdb0e1bb3dc914780
Reviewed-on: https://gerrit.libreoffice.org/5101
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx 
b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
index 6d9abf9..a6b4904 100644
--- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
+++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx
@@ -239,9 +239,10 @@ void ResultSetMetaData::checkTable()
 }
 if( tables.is() )
 {
-OUString name = getTableName( 1 );
-// if( tables-hasByName( name ) )
-tables-getByName( name ) = m_table;
+const OUString name   (getTableName ( 1 ));
+const OUString schema (getSchemaName( 1 ));
+const OUString composedName( schema.isEmpty() ? name : (schema 
+ . + name) );
+tables-getByName( composedName ) = m_table;
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/android-remote-ng' - 0 commits -

[Unknown]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source basic/source include/basic

[Gergo Mocsi]

 basctl/source/basicide/baside2b.cxx   |   19 ++-
 basctl/source/basicide/codecompleteoptionsdlg.cxx |3 ++-
 basic/source/classes/codecompletecache.cxx|   13 -
 include/basic/codecompletecache.hxx   |4 
 include/basic/sbmod.hxx   |1 -
 5 files changed, 36 insertions(+), 4 deletions(-)

New commits:
commit 2284b77b6c2b8bd6485130157c6cf0b4e51122a8
Author: Gergo Mocsi gmocs...@gmail.com
Date:   Thu Jul 25 20:15:45 2013 +0200

GSOC work, implemented Autoclose Double Quotes option

Feature autoclosing double quotes (strings) implemented.
When the user presses the '' key, it's pair is also being inserted (only 
when the previous character is also a ''), and the cursor is being placed 
inside the two quotes.
Also, if the there was a string (like: aaa), the second one is not 
inserted.

Change-Id: I3e4a5e426d2d4bdbf56899fe3e36359ae161b52a

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 5f1af6a..d75aae9 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -499,10 +499,27 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
 // see if there is an accelerator to be processed first
 bool bDone = SfxViewShell::Current()-KeyInput( rKEvt );
 
+if( rKEvt.GetCharCode() == ''  
CodeCompleteOptions::IsAutoCloseQuotesOn() )
+{//autoclose double quotes
+TextSelection aSel = GetEditView()-GetSelection();
+sal_uLong nLine =  aSel.GetStart().GetPara();
+OUString aLine( pEditEngine-GetText( nLine ) ); // the line being 
modified
+
+HighlightPortions aPortions;
+aHighlighter.getHighlightPortions( nLine, aLine, aPortions );
+if( aLine[aLine.getLength()-1] != ''  
(aPortions[aPortions.size()-1].tokenType != 4) )
+{
+GetEditView()-InsertText(OUString(\));
+//leave the cursor on it's place: inside the two double quotes
+TextPaM aEnd(nLine, aSel.GetEnd().GetIndex());
+GetEditView()-SetSelection( TextSelection( aEnd, aEnd ) );
+}
+}
+
 if( rKEvt.GetKeyCode().GetCode() == KEY_RETURN  
CodeCompleteOptions::IsProcedureAutoCompleteOn() )
 {//autoclose implementation
 TextSelection aSel = GetEditView()-GetSelection();
-sal_uLong nLine =  aSel.GetStart().GetPara();
+sal_uLong nLine = aSel.GetStart().GetPara();
 OUString sActSub = GetActualSubName( nLine );
 IncompleteProcedures aProcData = 
rModulWindow.GetSbModule()-GetIncompleteProcedures();
 for( unsigned int i = 0; i  aProcData.size(); ++i )
diff --git a/basctl/source/basicide/codecompleteoptionsdlg.cxx 
b/basctl/source/basicide/codecompleteoptionsdlg.cxx
index 0f4ab3a..ac2793f 100644
--- a/basctl/source/basicide/codecompleteoptionsdlg.cxx
+++ b/basctl/source/basicide/codecompleteoptionsdlg.cxx
@@ -42,9 +42,9 @@ CodeCompleteOptionsDlg::CodeCompleteOptionsDlg( Window* 
pWindow )
 
 pCodeCompleteChk-Check( CodeCompleteOptions::IsCodeCompleteOn() );
 pAutocloseProcChk-Check( CodeCompleteOptions::IsProcedureAutoCompleteOn() 
);
+pAutocloseQuotesChk-Check( CodeCompleteOptions::IsAutoCloseQuotesOn() );
 
 pAutocloseBracesChk-Enable( false );
-pAutocloseQuotesChk-Enable( false );
 }
 
 CodeCompleteOptionsDlg::~CodeCompleteOptionsDlg()
@@ -55,6 +55,7 @@ IMPL_LINK_NOARG(CodeCompleteOptionsDlg, OkHdl)
 {
 CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk-IsChecked() );
 CodeCompleteOptions::SetProcedureAutoCompleteOn( 
pAutocloseProcChk-IsChecked() );
+CodeCompleteOptions::SetAutoCloseQuotesOn( 
pAutocloseQuotesChk-IsChecked() );
 Close();
 return 0;
 }
diff --git a/basic/source/classes/codecompletecache.cxx 
b/basic/source/classes/codecompletecache.cxx
index 51eee1c..3e327c6 100644
--- a/basic/source/classes/codecompletecache.cxx
+++ b/basic/source/classes/codecompletecache.cxx
@@ -28,7 +28,8 @@ namespace
 
 CodeCompleteOptions::CodeCompleteOptions()
 : bIsCodeCompleteOn( false ),
-bIsProcedureAutoCompleteOn( true )
+bIsProcedureAutoCompleteOn( false ),
+bIsAutoCloseQuotesOn( false )
 {
 }
 
@@ -57,6 +58,16 @@ void CodeCompleteOptions::SetProcedureAutoCompleteOn( const 
bool b )
 theCodeCompleteOptions::get().bIsProcedureAutoCompleteOn = b;
 }
 
+bool CodeCompleteOptions::IsAutoCloseQuotesOn()
+{
+return theCodeCompleteOptions::get().aMiscOptions.IsExperimentalMode()  
theCodeCompleteOptions::get().bIsAutoCloseQuotesOn;
+}
+
+void CodeCompleteOptions::SetAutoCloseQuotesOn( const bool b )
+{
+theCodeCompleteOptions::get().bIsAutoCloseQuotesOn = b;
+}
+
 std::ostream operator (std::ostream aStream, const CodeCompleteDataCache 
aCache)
 {
 aStream  Global variables  std::endl;
diff --git a/include/basic/codecompletecache.hxx 
b/include/basic/codecompletecache.hxx
index e03c057..7280030 100644
--- a/include/basic/codecompletecache.hxx
+++ 

[ABANDONED] update ids for move tab dialog .ui conversion

[via Code Review]

Caolán McNamara has abandoned this change.

Change subject: update ids for move tab dialog .ui conversion
..


Patch Set 1: Abandoned

conversion collision

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ie0efc7dad30b37ce996b9de0e162e3ddbe024b06
Gerrit-PatchSet: 1
Gerrit-Project: help
Gerrit-Branch: master
Gerrit-Owner: Tamás Csikós csks.t...@gmail.com
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com

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

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

[MÁTÉ Gergely]

 sd/inc/CustomAnimationEffect.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 979ec69582608227ffb2a54c634076388b2428f8
Author: MÁTÉ Gergely sportem...@caesar.elte.hu
Date:   Thu Jul 25 14:59:29 2013 +0200

replacing a String to OUString in a sd header

Change-Id: I08d7949b6875f550bca4fbbdef7d92a4bc257d58
Reviewed-on: https://gerrit.libreoffice.org/5099
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 8b64065..3931d62 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -99,8 +99,8 @@ public:
 
 double  getAbsoluteDuration() const { return mfAbsoluteDuration; }
 
-const String   getName() const { return maName; }
-voidsetName( const String rName ) { maName = rName; }
+const OUString getName() const { return maName; }
+voidsetName( const OUString rName ) { maName = rName; }
 
 sal_Int16   getIterateType() const { return mnIterateType; }
 SD_DLLPUBLIC void   setIterateType( sal_Int16 nIterateType );
@@ -205,7 +205,7 @@ private:
 
 EffectSequenceHelper* mpEffectSequence;
 
-String  maName;
+OUStringmaName;
 
 ::com::sun::star::uno::Reference 
::com::sun::star::animations::XAnimationNode  mxNode;
 ::com::sun::star::uno::Reference ::com::sun::star::animations::XAudio  
mxAudio;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Palenik Mihály]

 sw/source/filter/html/css1atr.cxx |  251 --
 sw/source/filter/html/htmlatr.cxx |6 
 sw/source/filter/html/wrthtml.hxx |   14 +-
 3 files changed, 120 insertions(+), 151 deletions(-)

New commits:
commit e5223bd4c9480cd90cf7a961b6e6ed5e29d06241
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Tue Jul 23 17:54:15 2013 +0200

Change String class to OUString class in css1atr.cxx

I changed String class to OUString class in css1atr.cxx and its
dependencies.

Change-Id: Ibc216e28196bfdeec027b5d5eba4df5009e4e5a4
Reviewed-on: https://gerrit.libreoffice.org/5053
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index ee28a6b..32fc321 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -186,7 +186,7 @@ class SwCSS1OutMode
 public:
 
 SwCSS1OutMode( SwHTMLWriter rHWrt, sal_uInt16 nMode, bool 
bStartFirst=true,
-   const String *pSelector=0 ) :
+   const OUString *pSelector=0 ) :
 rWrt( rHWrt ),
 nOldMode( rHWrt.nCSS1OutMode )
 {
@@ -207,7 +207,7 @@ public:
 
 void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
  const sal_Char *pVal,
- const String *pSVal )
+ const OUString *pSVal )
 {
 OStringBuffer sOut;
 
@@ -661,15 +661,15 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc 
rPageDesc, sal_Bool bUsed )
 // wenn pPseudo gesetzt ist werden Styles-Sheets ausgegeben,
 // sonst wird nur nach Token und Class fuer ein Format gesucht
 sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, OString rToken,
-  String rClass, sal_uInt16 rRefPoolId,
-  String *pPseudo )
+  OUString rClass, sal_uInt16 rRefPoolId,
+  OUString *pPseudo )
 {
 sal_uInt16 nDeep = 0;
 rToken = OString();
-rClass.Erase();
+rClass = ;
 rRefPoolId = 0;
 if( pPseudo )
-pPseudo-Erase();
+*pPseudo = ;
 
 sal_Bool bChrFmt = RES_CHRFMT==pFmt-Which();
 
@@ -683,8 +683,8 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt 
*pFmt, OString rToken,
 if( USER_FMT  nPoolId )
 {
 // Benutzer-Vorlagen
-const String rNm = pPFmt-GetName();
-switch( rNm.GetChar(0) )
+const OUString rNm = pPFmt-GetName();
+switch( rNm[0] )
 {
 // nicht mehr unterstuetzt:
 // OOO_STRING_SVTOOLS_HTML_author
@@ -694,7 +694,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt 
*pFmt, OString rToken,
 // OOO_STRING_SVTOOLS_HTML_insertedtext
 // OOO_STRING_SVTOOLS_HTML_language
 // OOO_STRING_SVTOOLS_HTML_person
-case 'B':   if( !bChrFmt  
rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_blockquote) )
+case 'B':   if( !bChrFmt  rNm == 
OOO_STRING_SVTOOLS_HTML_blockquote )
 {
 rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
 rToken = 
OString(OOO_STRING_SVTOOLS_HTML_blockquote);
@@ -702,19 +702,19 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt 
*pFmt, OString rToken,
 break;
 case 'C':   if( bChrFmt )
 {
-if( 
rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_citiation) )
+if( rNm == OOO_STRING_SVTOOLS_HTML_citiation )
 {
 rRefPoolId = RES_POOLCHR_HTML_CITIATION;
 rToken = 
OString(OOO_STRING_SVTOOLS_HTML_citiation);
 }
-else if( 
rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_code) )
+else if( rNm == OOO_STRING_SVTOOLS_HTML_code )
 {
 rRefPoolId = RES_POOLCHR_HTML_CODE;
 rToken = OString(OOO_STRING_SVTOOLS_HTML_code);
 }
 }
 break;
-case 'D':   if( bChrFmt  
rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) )
+case 'D':   if( bChrFmt  rNm == 
OOO_STRING_SVTOOLS_HTML_definstance )
 {
 rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE;
 rToken = 
OString(OOO_STRING_SVTOOLS_HTML_definstance);
@@ -745,23 +745,23 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt 
*pFmt, OString rToken,
 }
 

[PUSHED] Change String class to OUString class in css1atr.cxx

[Norbert Thiebaud (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/5053

Approvals:
  LibreOffice gerrit bot: Verified
  Norbert Thiebaud: Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc216e28196bfdeec027b5d5eba4df5009e4e5a4
Gerrit-PatchSet: 5
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mihály Palenik palenik.mih...@gmail.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Luboš Luňák l.lu...@suse.cz
Gerrit-Reviewer: Mihály Palenik palenik.mih...@gmail.com
Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com

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

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

[Siqi]

 sd/source/ui/remotecontrol/AvahiNetworkService.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit fb73b3de561154486de425e51bc3a8acc3bbafd9
Author: Siqi m...@siqi.fr
Date:   Thu Jul 25 21:21:51 2013 +0200

remove unnecessary c++11 thread lib

Change-Id: I865f859c039bbd97c92d04f9df73a0cca47196b7

diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx 
b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
index 8f506f1..005ad35 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
@@ -7,7 +7,6 @@
 #include string.h
 #include algorithm
 #include vector
-#include thread
 #include iostream
 
 #include avahi-client/client.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-writer-char-borders' - 2 commits - include/svx sw/source

[Zolnai Tamás]

 include/svx/flagsdef.hxx  |2 --
 sw/source/core/txtnode/swfont.cxx |4 
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 3a43ae5da45d500c77ad40bdec93547add422655
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Thu Jul 25 21:22:05 2013 +0200

Remove some unused comment

Change-Id: I1500b849d2773a62f0e9191f1acd53443867bfc7

diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx
index e6523dd..1603ee5 100644
--- a/include/svx/flagsdef.hxx
+++ b/include/svx/flagsdef.hxx
@@ -26,8 +26,6 @@
 #define SW_BORDER_MODE_PARA 0x01
 #define SW_BORDER_MODE_TABLE0x02
 #define SW_BORDER_MODE_FRAME0x04
-//#define SW_BORDER_MODE_PAGE 0x08
-//#define SW_BORDER_MODE_CHAR 0x10
 
 // flags for SvxBackgroundTabPage
 #define SVX_SHOW_SELECTOR   0x01
commit e3021114248118e010243111ea886fce5e603baa
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Thu Jul 25 10:24:57 2013 +0200

Missing magic in font

Change-Id: Ic3f4d12729c0309e03992c06f8a57da3d004c24a

diff --git a/sw/source/core/txtnode/swfont.cxx 
b/sw/source/core/txtnode/swfont.cxx
index 783524a..7a62c47 100644
--- a/sw/source/core/txtnode/swfont.cxx
+++ b/sw/source/core/txtnode/swfont.cxx
@@ -84,6 +84,7 @@ void SwFont::SetTopBorder( const editeng::SvxBorderLine* 
pTopBorder )
 else
 m_aTopBorder = boost::none;
 bFntChg = sal_True;
+aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 void SwFont::SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder )
@@ -93,6 +94,7 @@ void SwFont::SetBottomBorder( const editeng::SvxBorderLine* 
pBottomBorder )
 else
 m_aBottomBorder = boost::none;
 bFntChg = sal_True;
+aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 void SwFont::SetRightBorder( const editeng::SvxBorderLine* pRightBorder )
@@ -102,6 +104,7 @@ void SwFont::SetRightBorder( const editeng::SvxBorderLine* 
pRightBorder )
 else
 m_aRightBorder = boost::none;
 bFntChg = sal_True;
+aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 void SwFont::SetLeftBorder( const editeng::SvxBorderLine* pLeftBorder )
@@ -111,6 +114,7 @@ void SwFont::SetLeftBorder( const editeng::SvxBorderLine* 
pLeftBorder )
 else
 m_aLeftBorder = boost::none;
 bFntChg = sal_True;
+aSub[SW_LATIN].pMagic = aSub[SW_CJK].pMagic = aSub[SW_CTL].pMagic = 0;
 }
 
 // maps directions for vertical layout
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier R]

 extras/source/autotext/lang/fr/acor/DocumentList.xml |   76 +--
 1 file changed, 55 insertions(+), 21 deletions(-)

New commits:
commit 81219456462e831cf931d7594657281b5c4c09a1
Author: Olivier R olivier.nore...@gmail.com
Date:   Thu Jul 25 20:32:28 2013 +0100

update the French autocorrection file

Change-Id: If5579f1cf7d94c4fe7a4289c2792c2f34e872a8f

diff --git a/extras/source/autotext/lang/fr/acor/DocumentList.xml 
b/extras/source/autotext/lang/fr/acor/DocumentList.xml
index ae475e2..1229acf 100644
--- a/extras/source/autotext/lang/fr/acor/DocumentList.xml
+++ b/extras/source/autotext/lang/fr/acor/DocumentList.xml
@@ -1,16 +1,36 @@
 ?xml version=1.0 encoding=utf-8?
 block-list:block-list 
xmlns:block-list=http://openoffice.org/2001/block-list;
+  block-list:block block-list:abbreviated-name=--- block-list:name=—/
   block-list:block block-list:abbreviated-name=-- block-list:name=–/
   block-list:block block-list:abbreviated-name=--gt; 
block-list:name=→/
   block-list:block block-list:abbreviated-name=-gt; block-list:name=→/
   block-list:block block-list:abbreviated-name=... block-list:name=…/
+  block-list:block block-list:abbreviated-name=+/- block-list:name=±/
+  block-list:block block-list:abbreviated-name==/= block-list:name=≠/
+  block-list:block block-list:abbreviated-name=./. block-list:name=÷/
+  block-list:block block-list:abbreviated-name=//. block-list:name=·/
+  block-list:block block-list:abbreviated-name=//o block-list:name=•/
+  block-list:block block-list:abbreviated-name=V- block-list:name=√/
   block-list:block block-list:abbreviated-name=(c) block-list:name=©/
   block-list:block block-list:abbreviated-name=(r) block-list:name=®/
   block-list:block block-list:abbreviated-name=(tm) block-list:name=™/
+  block-list:block block-list:abbreviated-name=gt;= block-list:name=≥/
+  block-list:block block-list:abbreviated-name=gt;lt; 
block-list:name=×/
+  block-list:block block-list:abbreviated-name=gt;gt; 
block-list:name=”/
   block-list:block block-list:abbreviated-name=lt;- block-list:name=←/
   block-list:block block-list:abbreviated-name=lt;-- 
block-list:name=←/
   block-list:block block-list:abbreviated-name=lt;--gt; 
block-list:name=↔/
   block-list:block block-list:abbreviated-name=lt;-gt; 
block-list:name=↔/
+  block-list:block block-list:abbreviated-name=lt;lt; 
block-list:name=“/
+  block-list:block block-list:abbreviated-name=lt;= block-list:name=≤/
+  block-list:block block-list:abbreviated-name=lt;== 
block-list:name=⇐/
+  block-list:block block-list:abbreviated-name===gt; 
block-list:name=⇒/
+  block-list:block block-list:abbreviated-name=a t'il 
block-list:name=a-t-il/
+  block-list:block block-list:abbreviated-name=a t'on 
block-list:name=a-t-on/
+  block-list:block block-list:abbreviated-name=a t'elle 
block-list:name=a-t-elle/
+  block-list:block block-list:abbreviated-name=a-t'il 
block-list:name=a-t-il/
+  block-list:block block-list:abbreviated-name=a-t'on 
block-list:name=a-t-on/
+  block-list:block block-list:abbreviated-name=a-t'elle 
block-list:name=a-t-elle/
   block-list:block block-list:abbreviated-name=abandoner 
block-list:name=abandonner/
   block-list:block block-list:abbreviated-name=abcisse 
block-list:name=abscisse/
   block-list:block block-list:abbreviated-name=acalmie 
block-list:name=accalmie/
@@ -50,7 +70,6 @@
   block-list:block block-list:abbreviated-name=apparaitre 
block-list:name=apparaître/
   block-list:block block-list:abbreviated-name=appeller 
block-list:name=appeler/
   block-list:block block-list:abbreviated-name=appercevoir 
block-list:name=apercevoir/
-  block-list:block block-list:abbreviated-name=applciation 
block-list:name=application/
   block-list:block block-list:abbreviated-name=aprécie 
block-list:name=apprécie/
   block-list:block block-list:abbreviated-name=aprécier 
block-list:name=apprécier/
   block-list:block block-list:abbreviated-name=aprécies 
block-list:name=apprécies/
@@ -67,6 +86,8 @@
   block-list:block block-list:abbreviated-name=ateindre 
block-list:name=atteindre/
   block-list:block block-list:abbreviated-name=atestation 
block-list:name=attestation/
   block-list:block block-list:abbreviated-name=atrapper 
block-list:name=attrapper/
+  block-list:block block-list:abbreviated-name=au dela 
block-list:name=au-delà/
+  block-list:block block-list:abbreviated-name=au delà 
block-list:name=au-delà/
   block-list:block block-list:abbreviated-name=aujourd’hiu 
block-list:name=aujourd’hui/
   block-list:block block-list:abbreviated-name=aujourdhiu 
block-list:name=aujourd’hui/
   block-list:block block-list:abbreviated-name=ausi 
block-list:name=aussi/
@@ -74,6 +95,8 @@
   block-list:block block-list:abbreviated-name=autentique 
block-list:name=authentique/
   block-list:block block-list:abbreviated-name=autentiques 
block-list:name=authentiques/
   block-list:block block-list:abbreviated-name=authorisation 

[Libreoffice-commits] website.git: Branch 'update' - check.php

[Thorsten Behrens]

 check.php |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit a564a411a05fe10c8027677530c690d7aefc307e
Author: Thorsten Behrens tbehr...@suse.com
Date:   Thu Jul 25 21:37:22 2013 +0200

Update 3.6.6 users to 3.6.7, 4.0 series no longer latest.

diff --git a/check.php b/check.php
index 9cd27de..b428ec4 100644
--- a/check.php
+++ b/check.php
@@ -179,8 +179,12 @@ $build_hash_to_version = array(
 
 # 3.6.6 versions
 'a61ad19-949f691-349cf55-3bea8d1-2c85eb' = '3.6.6.1',
-# To be uncommented when 3.6.7 Final is out
-#'f969faf-c24b504-8c77064-174276e-40b382' = '3.6.6.2', # Final
+'f969faf-c24b504-8c77064-174276e-40b382' = '3.6.6.2', # Final
+
+# 3.6.7 versions
+'a61ad19-949f691-349cf55-3bea8d1-2c85eb' = '3.6.7.1',
+# to be uncommented when the 3.6 series is retired
+#'e183d5b-f8ccaf6-3804794-95b4be8-895629' = '3.6.7.2', # Final
 
 ##
 # 4.0.0 versions
@@ -220,18 +224,19 @@ $build_hash_to_version = array(
 #   where 'type' and 'lang' will be substitued with the right value
 #   NOTE: '' in the URL has to be escaped as amp;
 $update_map = array(
-'stable' = array('gitid'   = 
'f969faf-c24b504-8c77064-174276e-40b382',
-  'id'  = 'LibreOffice 3.6.6',
-  'version' = '3.6.6',
+'stable' = array('gitid'   = 
'e183d5b-f8ccaf6-3804794-95b4be8-895629',
+  'id'  = 'LibreOffice 3.6.7',
+  'version' = '3.6.7',
   'update_type' = 'text/html',
-  'update_src'  = 
'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=3.6.6',
+  'update_src'  = 
'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=3.6.7',
   'substitute'  = true ),
 
 'latest' = array('gitid'   = 
'9e9821abd0ffdbc09cd8c52eaa574fa09eb08f2',
   'id'  = 'LibreOffice 4.0.4',
   'version' = '4.0.4',
   'update_type' = 'text/html',
-  'update_src'  = 'http://www.libreoffice.org/download/'),
+  'update_src'  = 
'http://www.libreoffice.org/download/?type=typeamp;lang=langamp;version=4.0.4',
+  'substitute'  = true ),
 );
 
 # Print the update xml
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - 3 commits - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/calcmacros.hxx|2 
 sc/inc/tokenarray.hxx|2 
 sc/qa/unit/ucalc.cxx |4 -
 sc/qa/unit/ucalc_formula.cxx |   37 ++---
 sc/source/core/data/conditio.cxx |   32 +++
 sc/source/core/data/documen4.cxx |2 
 sc/source/core/data/formulacell.cxx  |   41 ++-
 sc/source/core/tool/compiler.cxx |6 +-
 sc/source/core/tool/token.cxx|   66 ++--
 sc/source/filter/excel/excform.cxx   |   32 +--
 sc/source/filter/excel/excform8.cxx  |   32 +--
 sc/source/filter/excel/xeformula.cxx |   26 +++-
 sc/source/filter/excel/xelink.cxx|   12 ++---
 sc/source/filter/lotus/lotform.cxx   |4 -
 sc/source/filter/lotus/tool.cxx  |6 --
 sc/source/ui/unoobj/tokenuno.cxx |   72 +++
 16 files changed, 234 insertions(+), 142 deletions(-)

New commits:
commit 7f78d759afc1cd05f25b37ee994b649351dad9dc
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 15:59:00 2013 -0400

Re-work reference update on sheet insertion  fix one bug on sheet deletion.

Change-Id: I1405eb54c3c530e2c22be1f1d7728fa0d84ad447

diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 2ae6c90..1e8ced1 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -143,6 +143,8 @@ public:
  */
 bool AdjustReferenceOnDeletedTab( SCTAB nDelPos, SCTAB nSheets, const 
ScAddress rOldPos );
 
+bool AdjustReferenceOnInsertedTab( SCTAB nInsPos, SCTAB nSheets, const 
ScAddress rOldPos );
+
 #if DEBUG_FORMULA_COMPILER
 void Dump() const;
 #endif
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 6407b72..531d1d3 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -765,12 +765,12 @@ void Test::testFormulaRefUpdateSheets()
 
 // Set formulas to B2 and B3 on sheet Sheet2.
 m_pDoc-SetString(ScAddress(1,1,1), =SUM(Sheet1.B2:C3));
-m_pDoc-SetString(ScAddress(1,2,1), =SUM(Sheet1.$B$2:$C$3));
+m_pDoc-SetString(ScAddress(1,2,1), =SUM($Sheet1.$B$2:$C$3));
 
 if (!checkFormula(*m_pDoc, ScAddress(1,1,1), SUM(Sheet1.B2:C3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
 
-if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM(Sheet1.$B$2:$C$3)))
+if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM($Sheet1.$B$2:$C$3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
 
 // Swap the sheets.
@@ -783,7 +783,7 @@ void Test::testFormulaRefUpdateSheets()
 if (!checkFormula(*m_pDoc, ScAddress(1,1,0), SUM(Sheet1.B2:C3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
 
-if (!checkFormula(*m_pDoc, ScAddress(1,2,0), SUM(Sheet1.$B$2:$C$3)))
+if (!checkFormula(*m_pDoc, ScAddress(1,2,0), SUM($Sheet1.$B$2:$C$3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
 
 // Swap back.
@@ -796,7 +796,7 @@ void Test::testFormulaRefUpdateSheets()
 if (!checkFormula(*m_pDoc, ScAddress(1,1,1), SUM(Sheet1.B2:C3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
 
-if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM(Sheet1.$B$2:$C$3)))
+if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM($Sheet1.$B$2:$C$3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
 
 // Insert a new sheet between the two.
@@ -810,7 +810,7 @@ void Test::testFormulaRefUpdateSheets()
 if (!checkFormula(*m_pDoc, ScAddress(1,1,2), SUM(Sheet1.B2:C3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
 
-if (!checkFormula(*m_pDoc, ScAddress(1,2,2), SUM(Sheet1.$B$2:$C$3)))
+if (!checkFormula(*m_pDoc, ScAddress(1,2,2), SUM($Sheet1.$B$2:$C$3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
 
 // Delete the temporary sheet.
@@ -822,7 +822,30 @@ void Test::testFormulaRefUpdateSheets()
 if (!checkFormula(*m_pDoc, ScAddress(1,1,1), SUM(Sheet1.B2:C3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
 
-if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM(Sheet1.$B$2:$C$3)))
+if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM($Sheet1.$B$2:$C$3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
+
+// Insert a new sheet before the first one.
+m_pDoc-InsertTab(0, Temp);
+
+m_pDoc-GetName(1, aName);
+CPPUNIT_ASSERT_EQUAL(OUString(Sheet1), aName);
+m_pDoc-GetName(2, aName);
+CPPUNIT_ASSERT_EQUAL(OUString(Sheet2), aName);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,1,2), SUM(Sheet1.B2:C3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,2,2), SUM($Sheet1.$B$2:$C$3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
+
+// Delete the temporary sheet.
+m_pDoc-DeleteTab(0);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,1,1), SUM(Sheet1.B2:C3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM($Sheet1.$B$2:$C$3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
 
  

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

[Tomaž Vajngerl]

 include/svtools/ruler.hxx|3 +
 include/svx/ruler.hxx|4 -
 svtools/source/control/ruler.cxx |   38 ++---
 svx/source/dialog/svxruler.cxx   |   85 +--
 4 files changed, 92 insertions(+), 38 deletions(-)

New commits:
commit bfa3f8584b2f2492f5c0573f22e4ebd96d9a8af5
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Thu Jul 25 23:55:05 2013 +0200

fdo#38144 Enhance snapping to markers, also snap to frame margins

Change-Id: I5de4f8bafecabf84224a0518d9515295d23d7321

diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 04237df..b37aa81 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -771,6 +771,9 @@ public:
 voidSetMargin2( long nPos, sal_uInt16 nMarginStyle = 
RULER_MARGIN_SIZEABLE );
 longGetMargin2() const;
 
+voidSetLeftFrameMargin( long nPos );
+voidSetRightFrameMargin( long nPos );
+
 voidSetLines( sal_uInt16 n = 0, const RulerLine* pLineAry 
= NULL );
 
 voidSetBorders( sal_uInt16 n = 0, const RulerBorder* 
pBrdAry = NULL );
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index a6faad7..f017daf 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -124,8 +124,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public 
SfxListener
 void UpdateColumns();
 void UpdateObject();
 
-// Normalize position to the ruler's tick value
-void NormalizePosition(long rValue) const;
+// Convert position to stick to ruler ticks
+long MakePositionSticky(long rValue, bool aSnapToFrameMargin = true) const;
 
 long PixelHAdjust(long lPos, long lPos2) const;
 long PixelVAdjust(long lPos, long lPos2) const;
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index d128975..e25452a 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -90,6 +90,8 @@ private:
 longnNullOff;
 longnMargin1;
 longnMargin2;
+longnLeftFrameMargin;
+longnRightFrameMargin;
 sal_uInt16  nLines;
 sal_uInt16  nBorders;
 sal_uInt16  nIndents;
@@ -1032,11 +1034,12 @@ void Ruler::ImplFormat()
 if ( mbCalc )
 ImplCalc();
 mpData-nNullVirOff = mnWinOff+mpData-nPageOff+mpData-nNullOff-mnVirOff;
+
 nNullVirOff = mpData-nNullVirOff;
 nVirLeft= mpData-nRulVirOff;
-nVirRight   = nVirLeft+mpData-nRulWidth-1;
+nVirRight   = nVirLeft + mpData-nRulWidth - 1;
 nVirTop = 0;
-nVirBottom  = mnVirHeight-1;
+nVirBottom  = mnVirHeight - 1;
 
 if ( !IsReallyVisible() )
 return;
@@ -1138,10 +1141,15 @@ void Ruler::ImplFormat()
 }
 
 // Lineal-Beschriftung (nur wenn keine Bemassungspfeile)
-longnMin = nVirLeft;
-longnMax = nP2;
-longnStart = mpData-bTextRTL ? mpData-nMargin2 + nNullVirOff : 
nNullVirOff;
-longnCenter = nVirTop+((nVirBottom-nVirTop)/2);
+long nMin = nVirLeft;
+long nMax = nP2;
+long nCenter = nVirTop + ((nVirBottom - nVirTop) / 2);
+long nStart = 0;
+
+if (mpData-bTextRTL)
+nStart = mpData-nRightFrameMargin + nNullVirOff;
+else
+nStart = mpData-nLeftFrameMargin + nNullVirOff;
 
 // Nicht Schatten uebermalen
 if ( nP1  nVirLeft )
@@ -2497,6 +2505,24 @@ void Ruler::SetNullOffset( long nPos )
 }
 }
 
+void Ruler::SetLeftFrameMargin( long nPos )
+{
+if ( (mpData-nLeftFrameMargin != nPos) )
+{
+mpData-nLeftFrameMargin  = nPos;
+ImplUpdate();
+}
+}
+
+void Ruler::SetRightFrameMargin( long nPos )
+{
+if ( (mpData-nRightFrameMargin != nPos) )
+{
+mpData-nRightFrameMargin  = nPos;
+ImplUpdate();
+}
+}
+
 // ---
 
 void Ruler::SetMargin1( long nPos, sal_uInt16 nMarginStyle )
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index d5ab943..41e377f 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -432,14 +432,34 @@ SvxRuler::~SvxRuler()
 pBindings-LeaveRegistrations();
 }
 
-/* Internal conversion routines */
-
-void SvxRuler::NormalizePosition(long rValue) const
+long SvxRuler::MakePositionSticky(long aPosition, bool aSnapToFrameMargin) 
const
 {
-long aNewPositionLogic = pEditWin-PixelToLogic(Size(0, rValue), 
GetCurrentMapMode()).Height();
-long aTickDivider = GetCurrentRulerUnit().nTick1;
-aNewPositionLogic = (aNewPositionLogic / aTickDivider) * aTickDivider;
-rValue = pEditWin-LogicToPixel(Size(0, aNewPositionLogic), 
GetCurrentMapMode()).Height();
+long aLeftFramePosition = ConvertHPosPixel(GetLeftFrameMargin());
+long aRightFramePosition = ConvertHPosPixel(GetRightFrameMargin());
+long aTick = 

[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source

[Efe Gürkan YALAMAN]

 cui/source/options/optaboutconfig.cxx |   36 ++
 1 file changed, 32 insertions(+), 4 deletions(-)

New commits:
commit 67e1d504e11611528d84fb1f592efd06b818fcb4
Author: Efe Gürkan YALAMAN efeyala...@gmail.com
Date:   Fri Jul 26 02:25:27 2013 +0300

initial implementation of mapping values

Change-Id: I04aae2c6586967b8788e6b3fcd2752b893831937

diff --git a/cui/source/options/optaboutconfig.cxx 
b/cui/source/options/optaboutconfig.cxx
index 3a04e39..ea66de6 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -123,10 +123,38 @@ void CuiAboutConfigTabPage::FillItems( Reference 
XNameAccess xNameAccess, OUSt
 
 if( bIsLeafNode )
 {
-Reference beans::XProperty  xProperty ( xNameAccess, 
uno::UNO_QUERY_THROW ) ;
-beans::Property aProp = xProperty-getAsProperty();
-OUString test = aProp.Type.getTypeName();
-InsertEntry( sPath, test,  sPath, sPath );//for testing only will 
change
+Any aProp = 
xHierarchicalNameAccess-getByHierarchicalName(seqItems[i]); 
//xProperty-getAsProperty();
+
+OUString test;
+if( aProp.hasValue() )
+{
+switch( aProp.getValueType().getTypeClass() )
+{
+case ::com::sun::star::uno::TypeClass_UNSIGNED_SHORT :
+case ::com::sun::star::uno::TypeClass_SHORT :
+case ::com::sun::star::uno::TypeClass_UNSIGNED_LONG :
+case ::com::sun::star::uno::TypeClass_LONG :
+//case ::com::sun::star::uno::TypeClass_INT :
+{
+sal_Int32 nVal = 0;
+if(aProp = nVal)
+{
+OUString aNumber( OUString::valueOf( nVal ) );
+test = aNumber;
+}
+}
+break;
+
+default:
+{
+test = OUString(test);
+}
+}
+}
+
+OUString sType = aProp.getValueTypeName();//.getTypeName() 
;//Type.getTypeName();
+OUString sPrefName = sPath + OUString(-) + seqItems[i] ;
+InsertEntry( sPrefName, test, sType , sPath );//for testing only 
will change
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Daily Win32 debug builds

[Thorsten Behrens]

Lubos Lunak wrote:
  So I think my questions are basically:
 - how much space can I take with this on dev-builds? If I enable it
   also for 4.0 and 4.1 tinderbox and keep it for 5 last dailies, the
   space requirements should be somewhere below 100GiB tops, but in
   practice probably less.

We've currently 565G free on the box, so I'd say have a go.

 - can the server take the bandwith load? Tinderbox is rate-limited
   for upload, so that's not a problem, but I don't have an estimate
   for download. MSVC downloads only those .pdb files it actually
   needs, and it can cache them locally, so it's hopefully not that
   much.

There's no way but trying. If opengrok becomes unbearably slow, we'll
know the root cause. ;)

Beyond that - great stuff!

-- Thorsten


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

[Libreoffice-commits] core.git: config_host/config_features.h.in configure.ac sd/source

[Siqi]

 config_host/config_features.h.in   |2 ++
 configure.ac   |1 +
 sd/source/ui/remotecontrol/AvahiNetworkService.hxx |   20 ++--
 sd/source/ui/remotecontrol/DiscoveryService.cxx|5 +++--
 4 files changed, 8 insertions(+), 20 deletions(-)

New commits:
commit 0dc8821659ffcca5d48c9c3a133c4f793017f783
Author: Siqi m...@siqi.fr
Date:   Fri Jul 26 02:04:45 2013 +0200

use config_features.h.in instead

Change-Id: I1332fc22caae759c65b64e6c43e73740245e4abd

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index fac764e..e5d5187 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -66,4 +66,6 @@
 
 #define HAVE_FEATURE_OPENCL 0
 
+#define HAVE_FEATURE_AVAHI 0
+
 #endif
diff --git a/configure.ac b/configure.ac
index eb6c160..10ffd2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11393,6 +11393,7 @@ if test $_os != WINNT -a $_os != Darwin -a 
$enable_avahi = yes; then
   [ENABLE_AVAHI=TRUE], [ENABLE_AVAHI=])
 if test $ENABLE_AVAHI = TRUE; then
 AC_DEFINE(ENABLE_AVAHI)
+AC_DEFINE(HAVE_FEATURE_AVAHI)
 AVAHI_CFLAGS=$(printf '%s' $AVAHI_CFLAGS | sed -e 
s/-I/${ISYSTEM?}/g)
 fi
 fi
diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx 
b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
index 005ad35..96e36db 100644
--- a/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
+++ b/sd/source/ui/remotecontrol/AvahiNetworkService.hxx
@@ -1,23 +1,7 @@
 #ifndef AVAHI_NETWORK_SERVICE_H
 #define AVAHI_NETWORK_SERVICE_H
 
-
-#include errno.h
-#include stdlib.h
-#include string.h
-#include algorithm
-#include vector
-#include iostream
-
-#include avahi-client/client.h
-#include avahi-client/publish.h
-#include avahi-common/thread-watch.h
-
-#include avahi-common/alternative.h
-#include avahi-common/malloc.h
-#include avahi-common/error.h
-#include avahi-common/timeval.h
-
+#include string
 #include ZeroconfService.hxx
 
 namespace sd {
@@ -25,7 +9,7 @@ namespace sd {
 class AvahiNetworkService : public ZeroconfService
 {
 public:
-AvahiNetworkService(const std::string aname = , uint aport = 1599)
+AvahiNetworkService(const std::string aname = , unsigned int aport 
= 1599)
 : ZeroconfService(aname, aport){}
 virtual ~AvahiNetworkService(){}
 
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx 
b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index 62c3e6e..22aca47 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -16,6 +16,7 @@
 
 #include comphelper/processfactory.hxx
 #include rtl/strbuf.hxx
+#include config_features.h
 
 #include DiscoveryService.hxx
 
@@ -43,7 +44,7 @@
   #import OSXNetworkService.hxx
 #endif
 
-#ifdef LINUX
+#if HAVE_FEATURE_AVAHI
   #include AvahiNetworkService.hxx
 #endif
 
@@ -60,7 +61,7 @@ DiscoveryService::DiscoveryService()
 zService = new OSXNetworkService();
 #endif
 
-#ifdef ENABLE_AVAHI
+#if HAVE_FEATURE_AVAHI
 // Avahi for Linux
 char hostname[1024];
 hostname[1023] = '\0';
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/tokenarray.hxx   |2 
 sc/qa/unit/ucalc_formula.cxx|   50 
 sc/source/core/data/formulacell.cxx |   34 +---
 sc/source/core/tool/token.cxx   |   73 
 4 files changed, 136 insertions(+), 23 deletions(-)

New commits:
commit 60e9f263676c3c10cc0fcfbfc6f80c895f289e9c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 21:19:51 2013 -0400

Re-implement sheet reference adjustment on sheet move.

Change-Id: I24e93e0bbc51c7f9a1f1ea0c126a1399ace84a9e

diff --git a/sc/inc/tokenarray.hxx b/sc/inc/tokenarray.hxx
index 1e8ced1..b3fb5ef 100644
--- a/sc/inc/tokenarray.hxx
+++ b/sc/inc/tokenarray.hxx
@@ -145,6 +145,8 @@ public:
 
 bool AdjustReferenceOnInsertedTab( SCTAB nInsPos, SCTAB nSheets, const 
ScAddress rOldPos );
 
+void AdjustReferenceOnMovedTab( SCTAB nOldPos, SCTAB nNewPos, const 
ScAddress rOldPos );
+
 #if DEBUG_FORMULA_COMPILER
 void Dump() const;
 #endif
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 531d1d3..a8a54d3 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -813,6 +813,36 @@ void Test::testFormulaRefUpdateSheets()
 if (!checkFormula(*m_pDoc, ScAddress(1,2,2), SUM($Sheet1.$B$2:$C$3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
 
+// Move the last sheet (Sheet2) to the first position.
+m_pDoc-MoveTab(2, 0);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,1,0), SUM(Sheet1.B2:C3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,2,0), SUM($Sheet1.$B$2:$C$3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
+
+// Move back.
+m_pDoc-MoveTab(0, 2);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,1,2), SUM(Sheet1.B2:C3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,2,2), SUM($Sheet1.$B$2:$C$3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
+
+// Move the Temp sheet to the last position.
+m_pDoc-MoveTab(1, 2);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,1,1), SUM(Sheet1.B2:C3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM($Sheet1.$B$2:$C$3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
+
+// Move back.
+m_pDoc-MoveTab(2, 1);
+
 // Delete the temporary sheet.
 m_pDoc-DeleteTab(1);
 
@@ -848,6 +878,26 @@ void Test::testFormulaRefUpdateSheets()
 if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM($Sheet1.$B$2:$C$3)))
 CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
 
+// Append a bunch of sheets.
+m_pDoc-InsertTab(2, Temp1);
+m_pDoc-InsertTab(3, Temp2);
+m_pDoc-InsertTab(4, Temp3);
+
+// Move these tabs around. This shouldn't affects the first 2 sheets.
+m_pDoc-MoveTab(2, 4);
+m_pDoc-MoveTab(3, 2);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,1,1), SUM(Sheet1.B2:C3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B2.);
+
+if (!checkFormula(*m_pDoc, ScAddress(1,2,1), SUM($Sheet1.$B$2:$C$3)))
+CPPUNIT_FAIL(Wrong formula in Sheet2.B3.);
+
+// Delete the temp sheets.
+m_pDoc-DeleteTab(4);
+m_pDoc-DeleteTab(3);
+m_pDoc-DeleteTab(2);
+
 // Delete Sheet1.
 m_pDoc-DeleteTab(0);
 m_pDoc-GetName(0, aName);
diff --git a/sc/source/core/data/formulacell.cxx 
b/sc/source/core/data/formulacell.cxx
index c6fb301..b20fa0c 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2598,31 +2598,19 @@ bool ScFormulaCell::UpdateDeleteTab(SCTAB nTable, bool 
/*bIsMove*/, SCTAB nSheet
 void ScFormulaCell::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo )
 {
 pCode-Reset();
-if( pCode-GetNextReferenceRPN()  !pDocument-IsClipOrUndo() )
+if (!pCode-GetNextReferenceRPN() || pDocument-IsClipOrUndo())
 {
-EndListeningTo( pDocument );
-// SetTab _after_ EndListeningTo und _before_ Compiler UpdateMoveTab !
-aPos.SetTab( nTabNo );
-ScRangeData* pRangeData;
-ScCompiler aComp(pDocument, aPos, *pCode);
-aComp.SetGrammar(pDocument-GetGrammar());
-pRangeData = aComp.UpdateMoveTab( nOldPos, nNewPos, false );
-if (pRangeData) // Exchange Shared Formula with real Formula
-{
-pDocument-RemoveFromFormulaTree( this );   // update formula count
-delete pCode;
-pCode = pRangeData-GetCode()-Clone();
-ScCompiler aComp2(pDocument, aPos, *pCode);
-aComp2.SetGrammar(pDocument-GetGrammar());
-aComp2.CompileTokenArray();
-aComp2.MoveRelWrap(pRangeData-GetMaxCol(), 
pRangeData-GetMaxRow());
-aComp2.UpdateMoveTab( nOldPos, nNewPos, true );
-bCompile = true;
-}
-// no StartListeningTo because pTab[nTab] not yet correct!
+aPos.SetTab(nTabNo);
+return;
 }
-else
-

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/column.hxx   |2 +-
 sc/inc/document.hxx |4 ++--
 sc/inc/formulacell.hxx  |2 +-
 sc/inc/table.hxx|2 +-
 sc/source/core/data/column.cxx  |   10 --
 sc/source/core/data/document.cxx|   10 --
 sc/source/core/data/formulacell.cxx |2 +-
 sc/source/core/data/table1.cxx  |9 +++--
 sc/source/ui/docshell/docfunc.cxx   |2 +-
 sc/source/ui/view/viewfun2.cxx  |4 ++--
 10 files changed, 20 insertions(+), 27 deletions(-)

New commits:
commit 1af0c0be7cb58bbdbaa0984c7d22498ea8039edb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 21:47:39 2013 -0400

Remove unused parameters to clean it up a bit.

Change-Id: Ief629aea8b0df0b5a340871e13bc1a6e7c244816

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 5ef6cce..9850840 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -324,7 +324,7 @@ public:
 
 void UpdateInsertTab(SCTAB nInsPos, SCTAB nNewSheets = 1);
 void UpdateInsertTabOnlyCells(SCTAB nInsPos, SCTAB nNewSheets = 1);
-void UpdateDeleteTab(SCTAB nDelPos, bool bIsMove, ScColumn* pRefUndo = 
NULL, SCTAB nSheets = 1);
+void UpdateDeleteTab(SCTAB nDelPos, SCTAB nSheets = 1);
 voidUpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
 voidUpdateCompile( bool bForceIfNameInUse = false );
 voidUpdateTranspose( const ScRange rSource, const ScAddress 
rDest,
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index d730a6f..09f0874 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -589,8 +589,8 @@ public:
 bool bExternalDocument = false );
 SC_DLLPUBLIC bool   InsertTabs( SCTAB nPos, const 
std::vectorOUString rNames,
 bool bExternalDocument = false, bool 
bNamesValid = false );
-SC_DLLPUBLIC bool   DeleteTabs( SCTAB nTab, SCTAB nSheets, 
ScDocument* pRefUndoDoc = NULL );
-SC_DLLPUBLIC bool   DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc 
= NULL );
+SC_DLLPUBLIC bool DeleteTabs( SCTAB nTab, SCTAB nSheets );
+SC_DLLPUBLIC bool DeleteTab( SCTAB nTab );
 SC_DLLPUBLIC bool   RenameTab( SCTAB nTab, const OUString rName,
 bool bUpdateRef = true,
 bool bExternalDocument = false );
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index 7260ea0..d19c01c 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -211,7 +211,7 @@ public:
 
 voidUpdateInsertTab(SCTAB nTable, SCTAB nNewSheets = 1);
 voidUpdateInsertTabAbs(SCTAB nTable);
-boolUpdateDeleteTab(SCTAB nTable, bool bIsMove = false, SCTAB 
nSheets = 1);
+bool UpdateDeleteTab(SCTAB nTable, SCTAB nSheets = 1);
 voidUpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo);
 voidUpdateRenameTab(SCTAB nTable, const OUString rName);
 boolTestTabRefAbs(SCTAB nTable);
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 00cc7e5..2ce8cac 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -515,7 +515,7 @@ public:
 voidUpdateGrow( const ScRange rArea, SCCOL nGrowX, SCROW nGrowY );
 
 voidUpdateInsertTab(SCTAB nTable, SCTAB nNewSheets = 1);
-voidUpdateDeleteTab( SCTAB nTable, bool bIsMove, ScTable* pRefUndo 
= NULL, SCTAB nSheets = 1 );
+void UpdateDeleteTab( SCTAB nTable, SCTAB nSheets = 1 );
 voidUpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo, 
ScProgress* pProgress );
 voidUpdateCompile( bool bForceIfNameInUse = false );
 voidSetTabNo(SCTAB nNewTab);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index da3cb49..2e63c90 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -2443,21 +2443,19 @@ class DeleteTabUpdater
 SCTAB mnDelPos;
 SCTAB mnSheets;
 SCTAB mnTab;
-bool mbIsMove;
 bool mbModified;
 public:
-DeleteTabUpdater(sc::CellTextAttrStoreType rTextAttrs, SCTAB nDelPos, 
SCTAB nSheets, SCTAB nTab, bool bIsMove) :
+DeleteTabUpdater(sc::CellTextAttrStoreType rTextAttrs, SCTAB nDelPos, 
SCTAB nSheets, SCTAB nTab) :
 mrTextAttrs(rTextAttrs),
 miAttrPos(rTextAttrs.begin()),
 mnDelPos(nDelPos),
 mnSheets(nSheets),
 mnTab(nTab),
-mbIsMove(bIsMove),
 mbModified(false) {}
 
 void operator() (size_t, ScFormulaCell* pCell)
 {
-pCell-UpdateDeleteTab(mnDelPos, mbIsMove, mnSheets);
+pCell-UpdateDeleteTab(mnDelPos, mnSheets);
 mbModified = true;
 }
 
@@ -2892,7 +2890,7 @@ void ScColumn::UpdateInsertTabOnlyCells(SCTAB nInsPos, 
SCTAB nNewSheets)
 CellStorageModified();
 }
 
-void ScColumn::UpdateDeleteTab(SCTAB nDelPos, bool bIsMove, ScColumn* 
/*pRefUndo*/, SCTAB 

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/rangenam.hxx  |   18 --
 sc/source/core/data/documen2.cxx |4 +--
 sc/source/core/data/document.cxx |8 +++---
 sc/source/core/data/table1.cxx   |   19 +-
 sc/source/core/tool/rangenam.cxx |   50 ++-
 5 files changed, 37 insertions(+), 62 deletions(-)

New commits:
commit df1e34997beb78fcd2622678209571469dc6bdc1
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 22:17:28 2013 -0400

Let's not use numerical magic numbers. Prefer enum.

Change-Id: I84d14dd06a2b28d7a8a1544f26eae180b6ea86b5

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 436f82a..4a5944f 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -30,13 +30,8 @@
 #include boost/ptr_container/ptr_set.hpp
 #include boost/ptr_container/ptr_map.hpp
 
-//
-
 class ScDocument;
-
-
-
-//
+class ScTokenArray;
 
 typedef sal_uInt16 RangeType;
 
@@ -52,10 +47,6 @@ typedef sal_uInt16 RangeType;
 #define RT_SHARED   ((RangeType)0x0100)
 #define RT_SHAREDMOD((RangeType)0x0200)
 
-//
-
-class ScTokenArray;
-
 class ScRangeData
 {
 private:
@@ -77,6 +68,9 @@ private:
 void CompileRangeData( const String rSymbol, bool bSetError );
 void InitCode();
 public:
+
+enum TabRefUpdateMode { Insert = 1, Delete = 2, Move = 3 };
+
 typedef ::std::mapsal_uInt16, sal_uInt16 IndexMap;
 
 SC_DLLPUBLICScRangeData( ScDocument* pDoc,
@@ -139,7 +133,7 @@ public:
 SC_DLLPUBLIC bool   IsValidReference( ScRange rRef ) const;
 boolIsRangeAtBlock( const ScRange ) const;
 
-voidUpdateTabRef(SCTAB nOldTable, sal_uInt16 nFlag, SCTAB 
nNewTable, SCTAB nNewSheets);
+void UpdateTabRef(SCTAB nOldTable, TabRefUpdateMode eMode, SCTAB 
nNewTable, SCTAB nNewSheets);
 
 voidValidateTabRefs();
 
@@ -189,7 +183,7 @@ public:
 SC_DLLPUBLIC ScRangeData* findByIndex(sal_uInt16 i) const;
 void UpdateReference(UpdateRefMode eUpdateRefMode, const ScRange rRange,
  SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bLocal = 
false);
-void UpdateTabRef(SCTAB nTable, sal_uInt16 nFlag, SCTAB nNewTable = 0, 
SCTAB nNewSheets = 1);
+void UpdateTabRef(SCTAB nTable, ScRangeData::TabRefUpdateMode eMode, SCTAB 
nNewTable = 0, SCTAB nNewSheets = 1);
 void UpdateTranspose(const ScRange rSource, const ScAddress rDest);
 void UpdateGrow(const ScRange rArea, SCCOL nGrowX, SCROW nGrowY);
 
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index d5ddbd4..72f912f 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -712,7 +712,7 @@ bool ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos, 
ScProgress* pProgress )
 SCsTAB nDz = ((SCsTAB)nNewPos) - (SCsTAB)nOldPos;
 ScRange aSourceRange( 0,0,nOldPos, MAXCOL,MAXROW,nOldPos );
 if (pRangeName)
-pRangeName-UpdateTabRef(nOldPos, 3, nNewPos);
+pRangeName-UpdateTabRef(nOldPos, ScRangeData::Move, nNewPos);
 pDBCollection-UpdateMoveTab( nOldPos, nNewPos );
 xColNameRanges-UpdateReference( URM_REORDER, this, aSourceRange, 
0,0,nDz );
 xRowNameRanges-UpdateReference( URM_REORDER, this, aSourceRange, 
0,0,nDz );
@@ -799,7 +799,7 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 xColNameRanges-UpdateReference( URM_INSDEL, this, aRange, 
0,0,1 );
 xRowNameRanges-UpdateReference( URM_INSDEL, this, aRange, 
0,0,1 );
 if (pRangeName)
-pRangeName-UpdateTabRef(nNewPos, 1);
+pRangeName-UpdateTabRef(nNewPos, ScRangeData::Insert);
 pDBCollection-UpdateReference(
 URM_INSDEL, 0,0,nNewPos, 
MAXCOL,MAXROW,MAXTAB, 0,0,1 );
 if (pDPCollection)
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 1a4d379..8cbb01f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -461,7 +461,7 @@ bool ScDocument::InsertTab( SCTAB nPos, const OUString 
rName,
 xColNameRanges-UpdateReference( URM_INSDEL, this, aRange, 
0,0,1 );
 xRowNameRanges-UpdateReference( URM_INSDEL, this, aRange, 
0,0,1 );
 if (pRangeName)
-pRangeName-UpdateTabRef( nPos, 1 );
+pRangeName-UpdateTabRef(nPos, ScRangeData::Insert);
 pDBCollection-UpdateReference(
 URM_INSDEL, 0,0,nPos, 
MAXCOL,MAXROW,MAXTAB, 0,0,1 );
 if (pDPCollection)
@@ -546,7 +546,7 @@ bool 

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/compiler.hxx  |1 
 sc/source/core/tool/compiler.cxx |  109 ---
 2 files changed, 110 deletions(-)

New commits:
commit 76936cc9045e8d663d43edb670cd0369b61400d2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 22:24:47 2013 -0400

Nobody uses this method now. Chuck it.

Change-Id: I2d55b2e43cf87895f29fd69226ec96c5d75e3696

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 5cc2498..adaa339 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -457,7 +457,6 @@ public:
   const ScAddress rOldPos, const ScRange,
   SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
 
-ScRangeData* UpdateInsertTab(SCTAB nTable, bool bIsName, SCTAB nNewSheets 
= 1 );
 ScRangeData* UpdateDeleteTab(SCTAB nTable, bool bIsMove, bool bIsName, 
bool bCompile, SCTAB nSheets = 1);
 ScRangeData* UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, bool bIsName );
 
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 77793da..a2cc262 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4424,115 +4424,6 @@ void ScCompiler::UpdateSharedFormulaReference( 
UpdateRefMode eUpdateRefMode,
 }
 }
 
-
-ScRangeData* ScCompiler::UpdateInsertTab( SCTAB nTable, bool bIsName , SCTAB 
nNewSheets)
-{
-ScRangeData* pRangeData = NULL;
-SCTAB nPosTab = aPos.Tab(); // _after_ incremented!
-SCTAB nOldPosTab = ((nPosTab  nTable) ? (nPosTab - nNewSheets) : nPosTab);
-bool bIsRel = false;
-ScToken* t;
-pArr-Reset();
-if (bIsName)
-t = static_castScToken*(pArr-GetNextReference());
-else
-t = static_castScToken*(pArr-GetNextReferenceOrName());
-while( t )
-{
-if( t-GetOpCode() == ocName )
-{
-if (!bIsName)
-{
-ScRangeData* pName = GetRangeData( *t);
-if (pName  pName-HasType(RT_SHAREDMOD))
-pRangeData = pName;
-}
-}
-else if( t-GetType() != svIndex )  // it may be a DB area!!!
-{
-if ( !(bIsName  t-GetSingleRef().IsTabRel()) )
-{   // of names only adjust absolute references
-ScSingleRefData rRef = t-GetSingleRef();
-if ( rRef.IsTabRel() )
-{
-rRef.nTab = rRef.nRelTab + nOldPosTab;
-if ( rRef.nTab  0 )
-rRef.nTab = sal::static_int_castSCsTAB( rRef.nTab + 
pDoc-GetTableCount() );  // was a wrap
-}
-if (nTable = rRef.nTab)
-rRef.nTab += nNewSheets;
-rRef.nRelTab = rRef.nTab - nPosTab;
-}
-else
-bIsRel = true;
-if ( t-GetType() == svDoubleRef )
-{
-if ( !(bIsName  t-GetDoubleRef().Ref2.IsTabRel()) )
-{   // of names only adjust absolute references
-ScSingleRefData rRef = t-GetDoubleRef().Ref2;
-if ( rRef.IsTabRel() )
-{
-rRef.nTab = rRef.nRelTab + nOldPosTab;
-if ( rRef.nTab  0 )
-rRef.nTab = sal::static_int_castSCsTAB( 
rRef.nTab + pDoc-GetTableCount() );  // was a wrap
-}
-if (nTable = rRef.nTab)
-rRef.nTab += nNewSheets;
-rRef.nRelTab = rRef.nTab - nPosTab;
-}
-else
-bIsRel = true;
-}
-if ( bIsName  bIsRel )
-pRangeData = (ScRangeData*) this;   // not dereferenced in 
rangenam
-}
-if (bIsName)
-t = static_castScToken*(pArr-GetNextReference());
-else
-t = static_castScToken*(pArr-GetNextReferenceOrName());
-}
-if ( !bIsName )
-{
-pArr-Reset();
-while ( (t = static_castScToken*(pArr-GetNextReferenceRPN())) != 
NULL )
-{
-if ( t-GetRef() == 1 )
-{
-ScSingleRefData rRef1 = t-GetSingleRef();
-if ( !(rRef1.IsRelName()  rRef1.IsTabRel()) )
-{   // of names only adjust absolute references
-if ( rRef1.IsTabRel() )
-{
-rRef1.nTab = rRef1.nRelTab + nOldPosTab;
-if ( rRef1.nTab  0 )
-rRef1.nTab = sal::static_int_castSCsTAB( 
rRef1.nTab + pDoc-GetTableCount() );  // was a wrap
-}
-if (nTable = rRef1.nTab)
-rRef1.nTab += nNewSheets;
-rRef1.nRelTab = rRef1.nTab - nPosTab;
-}
-if ( t-GetType() == svDoubleRef )
-{
-ScSingleRefData rRef2 = 

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/compiler.hxx  |1 
 sc/source/core/data/conditio.cxx |   12 +-
 sc/source/core/tool/compiler.cxx |  188 ---
 3 files changed, 6 insertions(+), 195 deletions(-)

New commits:
commit 27aed32209a71d86c32ee352538f9c9731f89cb2
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 22:35:47 2013 -0400

Make this guy unused, and remove it.

Change-Id: Ib4a2f195b3ff1d291b0ffe99c27b1d3e807252d5

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index adaa339..687d544 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -457,7 +457,6 @@ public:
   const ScAddress rOldPos, const ScRange,
   SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
 
-ScRangeData* UpdateDeleteTab(SCTAB nTable, bool bIsMove, bool bIsName, 
bool bCompile, SCTAB nSheets = 1);
 ScRangeData* UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, bool bIsName );
 
 bool HasModifiedRange();
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 9f1db33..0d7cf36 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -544,12 +544,12 @@ void ScConditionEntry::UpdateReference( UpdateRefMode 
eUpdateRefMode,
 lcl_CondUpdateInsertTab( *pFormula1, rRange.aStart.Tab(), 
bChanged1, nDz );
 else
 {
-ScCompiler aComp( mpDoc, aSrcPos, *pFormula1 );
-aComp.SetGrammar(mpDoc-GetGrammar());
 if ( bDeleteTab )
-aComp.UpdateDeleteTab( rRange.aStart.Tab(), false, true, 
bChanged1, static_castSCTAB(-1 * nDz) );
+pFormula1-AdjustReferenceOnDeletedTab(rRange.aStart.Tab(), 
static_castSCTAB(-1*nDz), aSrcPos);
 else
 {
+ScCompiler aComp( mpDoc, aSrcPos, *pFormula1 );
+aComp.SetGrammar(mpDoc-GetGrammar());
 bool bSizeChanged;
 aComp.UpdateReference( eUpdateRefMode, aOldSrcPos, rRange, nDx,
 nDy, nDz, bChanged1, bSizeChanged );
@@ -566,12 +566,12 @@ void ScConditionEntry::UpdateReference( UpdateRefMode 
eUpdateRefMode,
 lcl_CondUpdateInsertTab( *pFormula2, rRange.aStart.Tab(), 
bChanged2, nDz );
 else
 {
-ScCompiler aComp( mpDoc, aSrcPos, *pFormula2);
-aComp.SetGrammar(mpDoc-GetGrammar());
 if ( bDeleteTab )
-aComp.UpdateDeleteTab( rRange.aStart.Tab(), false, true, 
bChanged2, static_castSCTAB(-1*nDz) );
+pFormula2-AdjustReferenceOnDeletedTab(rRange.aStart.Tab(), 
static_castSCTAB(-1*nDz), aSrcPos);
 else
 {
+ScCompiler aComp( mpDoc, aSrcPos, *pFormula2);
+aComp.SetGrammar(mpDoc-GetGrammar());
 bool bSizeChanged;
 aComp.UpdateReference( eUpdateRefMode, aOldSrcPos, rRange, nDx,
 nDy, nDz, bChanged2, bSizeChanged );
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index a2cc262..6c5107b 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4424,194 +4424,6 @@ void ScCompiler::UpdateSharedFormulaReference( 
UpdateRefMode eUpdateRefMode,
 }
 }
 
-ScRangeData* ScCompiler::UpdateDeleteTab(SCTAB nTable, bool /* bIsMove */, 
bool bIsName,
- bool rChanged, SCTAB nSheets)
-{
-ScRangeData* pRangeData = NULL;
-SCTAB nTab, nTab2;
-SCTAB nPosTab = aPos.Tab();  // _after_ decremented!
-SCTAB nOldPosTab = ((nPosTab = nTable) ? (nPosTab + nSheets) : nPosTab);
-rChanged = false;
-bool bIsRel = false;
-ScToken* t;
-pArr-Reset();
-if (bIsName)
-t = static_castScToken*(pArr-GetNextReference());
-else
-t = static_castScToken*(pArr-GetNextReferenceOrName());
-while( t )
-{
-if( t-GetOpCode() == ocName )
-{
-if (!bIsName)
-{
-ScRangeData* pName = GetRangeData( *t);
-if (pName  pName-HasType(RT_SHAREDMOD))
-pRangeData = pName;
-}
-rChanged = true;
-}
-else if( t-GetType() != svIndex )  // it may be a DB area!!!
-{
-if ( !(bIsName  t-GetSingleRef().IsTabRel()) )
-{   // of names only adjust absolute references
-ScSingleRefData rRef = t-GetSingleRef();
-if ( rRef.IsTabRel() )
-nTab = rRef.nTab = rRef.nRelTab + nOldPosTab;
-else
-nTab = rRef.nTab;
-if ( nTable  nTab )
-{
-rRef.nTab = nTab - nSheets;
-rChanged = true;
-}
-else if ( nTable == nTab )
-{
-if ( t-GetType() == svDoubleRef )
-{
- 

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/compiler.hxx  |8 -
 sc/source/core/data/conditio.cxx |9 -
 sc/source/core/tool/compiler.cxx |  250 ---
 3 files changed, 3 insertions(+), 264 deletions(-)

New commits:
commit 4ba6b270c25f373f5c21b4b3302d83219654ee3c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Thu Jul 25 22:45:15 2013 -0400

More on removing unused methods after some adjustments.

Change-Id: Ib838f25094c7c90a6623293e61f56b66b659

diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx
index 687d544..4792f79 100644
--- a/sc/inc/compiler.hxx
+++ b/sc/inc/compiler.hxx
@@ -451,14 +451,6 @@ public:
   SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
   bool rChanged, bool rRefSizeChanged );
 
-/// Only once for converted shared formulas,
-/// token array has to be compiled afterwards.
-void UpdateSharedFormulaReference( UpdateRefMode eUpdateRefMode,
-  const ScAddress rOldPos, const ScRange,
-  SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
-
-ScRangeData* UpdateMoveTab(SCTAB nOldPos, SCTAB nNewPos, bool bIsName );
-
 bool HasModifiedRange();
 
 /** If the character is allowed as first character in sheet names or
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 0d7cf36..3fb8a5f 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -587,16 +587,13 @@ void ScConditionEntry::UpdateMoveTab( SCTAB nOldPos, 
SCTAB nNewPos )
 {
 if (pFormula1)
 {
-ScCompiler aComp( mpDoc, aSrcPos, *pFormula1);
-aComp.SetGrammar(mpDoc-GetGrammar());
-aComp.UpdateMoveTab(nOldPos, nNewPos, true );
+pFormula1-AdjustReferenceOnMovedTab(nOldPos, nNewPos, aSrcPos);
 DELETEZ(pFCell1);
 }
+
 if (pFormula2)
 {
-ScCompiler aComp( mpDoc, aSrcPos, *pFormula2);
-aComp.SetGrammar(mpDoc-GetGrammar());
-aComp.UpdateMoveTab(nOldPos, nNewPos, true );
+pFormula2-AdjustReferenceOnMovedTab(nOldPos, nNewPos, aSrcPos);
 DELETEZ(pFCell2);
 }
 }
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 6c5107b..4c17edf 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4359,256 +4359,6 @@ bool ScCompiler::UpdateNameReference(UpdateRefMode 
eUpdateRefMode,
 return bRelRef;
 }
 
-
-void ScCompiler::UpdateSharedFormulaReference( UpdateRefMode eUpdateRefMode,
-  const ScAddress rOldPos, const ScRange r,
-  SCsCOL nDx, SCsROW nDy, SCsTAB nDz )
-{
-if ( eUpdateRefMode == URM_COPY )
-return ;
-else
-{
-ScToken* t;
-pArr-Reset();
-while ( (t = static_castScToken*(pArr-GetNextReference())) != NULL )
-{
-if( t-GetType() != svIndex )   // it may be a DB area!!!
-{
-// Absolute references have been already adjusted in the named
-// shared formula itself prior to breaking the shared formula
-// and calling this function. Don't readjust them again.
-SingleDoubleRefModifier aMod( *t );
-ScComplexRefData rRef = aMod.Ref();
-ScComplexRefData aBkp = rRef;
-ScRange aRefRange = rRef.toAbs(rOldPos);
-ScRange aBkpRange = aRefRange;
-ScRefUpdate::Update(pDoc, eUpdateRefMode, aPos, r, nDx, nDy, 
nDz, rRef, aRefRange);
-rRef.SetRange(aRefRange, rOldPos);
-
-// restore absolute parts
-if ( !aBkp.Ref1.IsColRel() )
-{
-rRef.Ref1.nCol = aBkpRange.aStart.Col();
-rRef.Ref1.SetColDeleted( aBkp.Ref1.IsColDeleted() );
-}
-if ( !aBkp.Ref1.IsRowRel() )
-{
-rRef.Ref1.nRow = aBkpRange.aStart.Row();
-rRef.Ref1.SetRowDeleted( aBkp.Ref1.IsRowDeleted() );
-}
-if ( !aBkp.Ref1.IsTabRel() )
-{
-rRef.Ref1.nTab = aBkpRange.aStart.Tab();
-rRef.Ref1.SetTabDeleted( aBkp.Ref1.IsTabDeleted() );
-}
-if ( t-GetType() == svDoubleRef )
-{
-if ( !aBkp.Ref2.IsColRel() )
-{
-rRef.Ref2.nCol = aBkpRange.aEnd.Col();
-rRef.Ref2.SetColDeleted( aBkp.Ref2.IsColDeleted() );
-}
-if ( !aBkp.Ref2.IsRowRel() )
-{
-rRef.Ref2.nRow = aBkpRange.aEnd.Row();
-rRef.Ref2.SetRowDeleted( aBkp.Ref2.IsRowDeleted() );
-}
-if ( !aBkp.Ref2.IsTabRel() )
-{
- 

[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/refdata.hxx |3 
 sc/source/core/data/column3.cxx|7 -
 sc/source/core/data/conditio.cxx   |4 
 sc/source/core/data/documen4.cxx   |   12 +-
 sc/source/core/tool/chgtrack.cxx   |6 -
 sc/source/core/tool/compiler.cxx   |6 -
 sc/source/core/tool/refdata.cxx|   24 
 sc/source/filter/excel/excform.cxx |   14 +-
 sc/source/ui/unoobj/chart2uno.cxx  |  197 ++---
 9 files changed, 144 insertions(+), 129 deletions(-)

New commits:
commit 73724a9b99346f4e6f55c76b2f1e52acfb4f6774
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Jul 26 00:41:07 2013 -0400

More on avoiding direct access to data members.

Change-Id: I5fdc0d248fe9c36418fd02a1e652e4e35a638c8a

diff --git a/sc/inc/refdata.hxx b/sc/inc/refdata.hxx
index 629e8ae..337b66c 100644
--- a/sc/inc/refdata.hxx
+++ b/sc/inc/refdata.hxx
@@ -67,10 +67,13 @@ struct SC_DLLPUBLIC ScSingleRefData
 
 void SetAbsCol( SCCOL nVal );
 void SetRelCol( SCCOL nVal );
+void IncCol( SCCOL nInc );
 void SetAbsRow( SCROW nVal );
 void SetRelRow( SCROW nVal );
+void IncRow( SCROW nInc );
 void SetAbsTab( SCTAB nVal );
 void SetRelTab( SCTAB nVal );
+void IncTab( SCTAB nInc );
 
 void SetColDeleted( bool bVal );
 bool IsColDeleted() const;
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 1e0ec16..f7cc15e 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -909,15 +909,14 @@ void ScColumn::CopyFromClip(
 
 //  Create reference (Source Position)
 ScSingleRefData aRef;
-aRef.nCol = rColumn.nCol;
-//  Adapt nRow
-aRef.nTab = rColumn.nTab;
 aRef.InitFlags(); // - All absolute
+aRef.SetAbsCol(rColumn.nCol);
+aRef.SetAbsTab(rColumn.nTab);
 aRef.SetFlag3D(true);
 
 for (SCROW nDestRow = nRow1; nDestRow = nRow2; nDestRow++)
 {
-aRef.nRow = nDestRow - nDy; // Source row
+aRef.SetAbsRow(nDestRow - nDy); // Source row
 aDestPos.SetRow( nDestRow );
 
 ScTokenArray aArr;
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 3fb8a5f..e56f75b 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1389,7 +1389,7 @@ void ScConditionEntry::SourceChanged( const ScAddress 
rChanged )
 nCol2 = rChanged.Col() - aProv.Ref1.Col();
 else
 {
-bHit = ( rChanged.Col() = aProv.Ref1.nCol );
+bHit = (rChanged.Col() = aProv.Ref1.Col());
 nCol2 = MAXCOL;
 }
 if ( aProv.Ref1.IsRowRel() )
@@ -1411,7 +1411,7 @@ void ScConditionEntry::SourceChanged( const ScAddress 
rChanged )
 nCol1 = rChanged.Col() - aProv.Ref2.Col();
 else
 {
-bHit = ( rChanged.Col() = aProv.Ref2.nCol );
+bHit = ( rChanged.Col() = aProv.Ref2.Col() );
 nCol1 = 0;
 }
 if ( aProv.Ref2.IsRowRel() )
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 9499fa0..38f012a 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -74,9 +74,9 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab,
 {
 ScSingleRefData aRefData;
 aRefData.InitFlags();
-aRefData.nCol = nVCol;
-aRefData.nRow = nVRow;
-aRefData.nTab = nVTab;
+aRefData.SetAbsCol(nVCol);
+aRefData.SetAbsRow(nVRow);
+aRefData.SetAbsTab(nVTab);
 
 ScTokenArray aArr;
 aArr.AddOpCode( ocBackSolver );
@@ -84,9 +84,9 @@ bool ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab,
 aArr.AddSingleReference( aRefData );
 aArr.AddOpCode( ocSep );
 
-aRefData.nCol = nFCol;
-aRefData.nRow = nFRow;
-aRefData.nTab = nFTab;
+aRefData.SetAbsCol(nFCol);
+aRefData.SetAbsRow(nFRow);
+aRefData.SetAbsTab(nFTab);
 
 aArr.AddSingleReference( aRefData );
 aArr.AddOpCode( ocSep );
diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx
index 5265722..e4bb249 100644
--- a/sc/source/core/tool/chgtrack.cxx
+++ b/sc/source/core/tool/chgtrack.cxx
@@ -1976,17 +1976,14 @@ static void lcl_InvalidateReference( ScToken rTok, 
const ScBigAddress rPos )
 ScSingleRefData rRef1 = rTok.GetSingleRef();
 if ( rPos.Col()  0 || MAXCOL  rPos.Col() )
 {
-rRef1.nCol = SCCOL_MAX;
 rRef1.SetColDeleted( true );
 }
 if ( rPos.Row()  0 || MAXROW  rPos.Row() )
 {
-rRef1.nRow = SCROW_MAX;
 

[Libreoffice-commits] mso-dumper.git: src/formula.py src/xlsrecord.py

[Kohei Yoshida]

 src/formula.py   |   33 -
 src/xlsrecord.py |   10 +++---
 2 files changed, 31 insertions(+), 12 deletions(-)

New commits:
commit e8ddec72f52cccaca4a1700607105f52915d7a11
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Fri Jul 26 01:44:08 2013 -0400

Some improvements on formula token bytes parsing.

diff --git a/src/formula.py b/src/formula.py
index 8736485..963fb96 100644
--- a/src/formula.py
+++ b/src/formula.py
@@ -1,6 +1,6 @@
 
 #
-#  Copyright (c) 2010 Kohei Yoshida
+#  Copyright (c) 2010-2013 Kohei Yoshida
 #  
 #  Permission is hereby granted, free of charge, to any person
 #  obtaining a copy of this software and associated documentation
@@ -31,6 +31,13 @@ import globals
 class InvalidCellAddress(Exception): pass
 class FormulaParserError(Exception): pass
 
+class ColRelU(object):
+def __init__ (self, strm):
+bits = strm.readUnsignedInt(2)
+self.col = (bits  0x3FFF)
+self.colRelative = (bits  0x4000) != 0
+self.rowRelative = (bits  0x8000) != 0
+
 def toColName (colID):
 if colID  255:
 globals.error(Column ID greater than 255)
@@ -174,14 +181,6 @@ class PtgMissArg(PtgBase):
 def getText (self):
 return '(arg missing)'
 
-class PtgRef(PtgBase):
-def parseBytes (self):
-self.row = self.strm.readUnsignedInt(2)
-self.col = self.strm.readUnsignedInt(2)
-
-def getText (self):
-return (ref: row=%d, col=%d)%(self.row, self.col)
-
 class PtgMemFunc(PtgBase):
 def parseBytes(self):
 self.dataType = getPtgDataType(self.opcode1)
@@ -211,6 +210,13 @@ class PtgAtt(PtgBase):
 def getText (self):
 return (att: %s)%self.attName
 
+class PtgArray(PtgBase):
+def parseBytes (self):
+self.strm.readBytes(7)
+
+def getText (self):
+return (array)
+
 class PtgName(PtgBase):
 def parseBytes (self):
 self.nameIdx = self.strm.readUnsignedInt(4)
@@ -218,6 +224,13 @@ class PtgName(PtgBase):
 def getText (self):
 return (name: %d)%self.nameIdx
 
+class PtgRef(PtgBase):
+def parseBytes (self):
+self.row = self.strm.readUnsignedInt(2)
+self.col = ColRelU(self.strm)
+
+def getText (self):
+return (ref: row=%d,col=%d,rowRelative=%d,colRelative=%d)%(self.row, 
self.col.col, self.col.rowRelative, self.col.colRelative)
 
 class PtgNameX(PtgBase):
 def parseBytes (self):
@@ -670,7 +683,9 @@ _tokenMap = {
 0x24: PtgRef,
 0x29: PtgMemFunc,
 0x3B: _Area3d,
+0x40: PtgArray,
 0x43: PtgName,
+0x44: PtgRef,
 0x59: PtgNameX,
 0x5B: _Area3d,
 0x7B: _Area3d,
diff --git a/src/xlsrecord.py b/src/xlsrecord.py
index 90cb699..ecc4029 100644
--- a/src/xlsrecord.py
+++ b/src/xlsrecord.py
@@ -1185,10 +1185,14 @@ class Array(BaseRecordHandler):
 self.__parseBytes()
 self.appendLine(range: %s%self.ref.toString())
 self.appendLineBoolean(always calc, self.alwaysCalc)
-fparser = formula.FormulaParser(self.header, self.tokens)
-fparser.parse()
 self.appendLine(formula bytes: %s%globals.getRawBytes(self.tokens, 
True, False))
-self.appendLine(formula string: %s%fparser.getText())
+try:
+fparser = formula.FormulaParser(self.header, self.tokens)
+fparser.parse()
+self.appendLine(formula string: %s%fparser.getText())
+except formula.FormulaParserError:
+self.appendLine(formula string: error parsing token bytes)
+
 
 class Label(BaseRecordHandler):
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-qa] FDO Version Management

[Cor Nouws]

Bjoern Michaelsen wrote (23-07-13 15:52)


I have some older installations. Unless I am mistaken, most of the
list below
 [...]
So if really needed, I can do some tests there.


That would be awesome!

Currently there are only some 23 unresolved bibisect*older bugs:

  
https://bugs.freedesktop.org/report.cgi?x_axis_field=componenty_axis_field=versionz_axis_field=query_format=report-tableshort_desc_type=allwordssubstrshort_desc=product=LibreOfficebug_status=UNCONFIRMEDbug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDbug_status=RESOLVEDbug_status=VERIFIEDbug_status=CLOSEDbug_status=NEEDINFObug_status=PLEASETESTresolution=---longdesc_type=allwordssubstrlongdesc=bug_file_loc_type=allwordssubstrbug_file_loc=status_whiteboard_type=allwordssubstrstatus_whiteboard=bibisect+olderkeywords_type=allwordskeywords=bug_id=bug_id_type=anyexactemailtype1=substringemail1=emailtype2=substringemail2=emailtype3=substringemail3=chfieldvalue=chfieldfrom=chfieldto=Nowj_top=ANDf1=noopo1=noopv1=format=tableaction=wrap

it would probably be helpful to triage those down to an exact version --
although my fear is most will end up being introduced with the big merge
between 3.3 and 3.4.


OK, can put that on my list. But be aware that I can't give it a high 
priority as such.
So if there is anything among those (or another) that is urgent, pls 
ping me separately.


Thanks,
Cor

--
 - Cor Nouws
 - http://nl.libreoffice.org
 - The Document Foundation Membership Committee Member
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/