Re: Updates about Enhanced Database Ranges.

[Akash Shetye]

Here is what I have done and what I will be doing.

Last week:
-Wrote the calculation part for rendering.
-Wrote a failing stub fro using this calculation and setting the style
sheet.
-Looked at the rendering of statically formatted cells (by applying style
sheets).

This week:
-Get done with the rendering for once.
-Optimise calculation code.
-Why are some tests failing..investigate the sw_subsequentexport test.


On Fri, Aug 16, 2013 at 3:29 AM, Akash Shetye shetyeak...@gmail.com wrote:



 -- Forwarded message --
 From: Akash Shetye shetyeak...@gmail.com
 Date: Thu, Aug 15, 2013 at 8:16 PM
 Subject: Re: Updates about Enhanced Database Ranges.
 To: Akash Shetye shetyeak...@gmail.com


 Hello all,

 Updating everyone about the branch's progress after a long long time. I
 have managed to get done the import and export of table styles and tables
 from .xlsx back to .xlsx from LO. LO now supports the import of table
 styles but there is nothing in place about the export to Open Document
 Format of these table styles. Currently I am swimming around the rendering
 codeand should be getting on with something to show pretty soon like in a 3
 days.
 What follows after that is the making of rendering code that actually
 works when when you reposition tables etc but that is something to worry
 about after the initial rendering is done. Also dialog and much UI stuff is
 way pending. See you next week.


 On Thu, Jul 25, 2013 at 1:39 AM, Akash Shetye shetyeak...@gmail.comwrote:

 Hello
 I have completed the table style export to OOXML just yesterday however
 the code needs a lot of ironing out.

 About exporting the tables to open document format. The tables created in
 excel are available in the xlsx zip at /tables/table#.xml where # is the
 number of the table defined in excel so if you define 4 tables., you will
 have 4 xml files in there one each.

 This data is parsed and successfully imported into calc. I spoke with
 markus some time ago about exporting table styles to open document. He
 mentioned writing a rfc or something later on for that so that is on hold.

 The export to excel of these db ranges will be done only for those db
 ranges that use any table formatting. This should not be that difficult, I
 realised that this only involves searching through the ScDBData collection
 and identifying the ranges that have formatting and writing the xml for
 them in /tables/..

 Even if db ranges are stored as expressions or anything in calc, they
 will be easily exportable to excel. I think we will not have to worry about
 that. Once thats done full excel support for table styles will be achieved.

 I will push that soon.




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

[Libreoffice-commits] core.git: offapi/com

[Julien Nabet]

 offapi/com/sun/star/view/PrinterDescriptor.idl |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2d95a1bfd6e0adff791d9e381f0ec37470312522
Author: Julien Nabet serval2...@yahoo.fr
Date:   Tue Aug 20 08:07:07 2013 +0200

Fix idl

Change-Id: I10a67d3087205e81633a35e30b7648c4a14ac2f9

diff --git a/offapi/com/sun/star/view/PrinterDescriptor.idl 
b/offapi/com/sun/star/view/PrinterDescriptor.idl
index 0d184df..f9fa733 100644
--- a/offapi/com/sun/star/view/PrinterDescriptor.idl
+++ b/offapi/com/sun/star/view/PrinterDescriptor.idl
@@ -54,14 +54,14 @@ published service PrinterDescriptor
 is a user-defined size.
 
 pSetting this property may change the value of
-#PrinterDescriptorPaperSize./p
+#PrinterDescriptor::PaperSize./p
  */
 [property] com::sun::star::view::PaperFormat PaperFormat;
 
 /** specifies the size of the paper in 100th mm.
 
 pSetting this property may change the value of
-#PrinterDescriptorPaperFormat./p
+#PrinterDescriptor::PaperFormat./p
  */
 [property] com::sun::star::awt::Size PaperSize;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Power]

 basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb |   18 +++
 basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb   |   18 +++
 basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb   |   18 +++
 basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb  |   18 +++
 basic/source/comp/scanner.cxx|4 ++-
 5 files changed, 75 insertions(+), 1 deletion(-)

New commits:
commit 4c9a08e78b6e2c5d19628281bd4141c268299bea
Author: Noel Power noel.po...@suse.com
Date:   Mon Aug 19 16:58:07 2013 +0100

fix for fdo#62323 bad conversion of Hex strings for certain values

Basic hex literals are basic Integer ( e.g. 4 byte ) types with
-2,147,483,648 through 2,147,483,647 range. Interally the scanner
was using a long to form/scan the literal, this led to bad behaviour
on 64bit linux ( where normally long - 8 bytes )

Change-Id: I1d0fcc55ed0eda636da1445329737d1684e69f33

diff --git a/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb 
b/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
new file mode 100644
index 000..f33d74c
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H)
+  If lngDecimal = -1 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb
new file mode 100644
index 000..f33d74c
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H)
+  If lngDecimal = -1 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
new file mode 100644
index 000..c660486
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H8000)
+  If lngDecimal = -2147483648 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb
new file mode 100644
index 000..1a02bde
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H0)
+  If lngDecimal = 0 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 728187c..b59e22a 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -413,7 +413,9 @@ bool SbiScanner::NextSym()
 return true;
 }
 bNumber = true;
-long l = 0;
+// Hex literals are signed Integers ( as defined by basic
+// e.g. -2,147,483,648 through 2,147,483,647 (signed)
+sal_Int32 l = 0;
 int i;
 bool bBufOverflow = false;
 while(nCol  aLine.getLength()   
theBasicCharClass::get().isAlphaNumeric(aLine[nCol]  0xFF, bCompatible))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Oliver-Rainer Wittmann]

 sw/source/filter/ww8/ww8par.cxx |   57 +---
 1 file changed, 30 insertions(+), 27 deletions(-)

New commits:
commit b16eb2a11359d6dfd330a46dd70a0142d6b722a2
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Aug 20 08:00:27 2013 +

123021: import of graphic bullets - consider empty graphic frames in 
graphic bullet area

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 70dbea9..ebf14756 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4680,42 +4680,43 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary 
*pGloss, const SwPosition rPos)
 delete mpRedlineStack;
 DeleteAnchorStk();
 DeleteRefStks();
+
 //For i120928,achieve the graphics from the special bookmark with is for 
graphic bullet
 {
 std::vectorconst SwGrfNode* vecBulletGrf;
 std::vectorSwFrmFmt* vecFrmFmt;
 
 IDocumentMarkAccess* const pMarkAccess =
-rDoc.getIDocumentMarkAccess();
+rDoc.getIDocumentMarkAccess();
 if ( pMarkAccess )
 {
-  IDocumentMarkAccess::const_iterator_t ppBkmk =
-pMarkAccess-findBookmark( 
C2U(_PictureBullets) );
-//for(IDocumentMarkAccess::const_iterator_t ppBookmark = 
ppBkmk-begin();
-  //ppBookmark != ppBkmk-end(); ppBookmark++)
-  if ( ppBkmk != pMarkAccess-getBookmarksEnd() 
- IDocumentMarkAccess::GetType( *(ppBkmk-get()) )
-== IDocumentMarkAccess::BOOKMARK )
-{
+IDocumentMarkAccess::const_iterator_t ppBkmk =
+pMarkAccess-findBookmark( C2U(_PictureBullets) );
+if ( ppBkmk != pMarkAccess-getBookmarksEnd()
+  IDocumentMarkAccess::GetType( *(ppBkmk-get()) ) == 
IDocumentMarkAccess::BOOKMARK )
+{
 SwTxtNode* pTxtNode = 
ppBkmk-get()-GetMarkStart().nNode.GetNode().GetTxtNode();
- if ( pTxtNode )
+if ( pTxtNode )
 {
-const SwpHints *pHints = pTxtNode-GetpSwpHints();
-for(int nHintPos = 0; pHints  nHintPos  
pHints-Count(); ++nHintPos)
+const SwpHints* pHints = pTxtNode-GetpSwpHints();
+for( sal_uInt16 nHintPos = 0; pHints  nHintPos  
pHints-Count(); ++nHintPos)
 {
 const SwTxtAttr *pHt = (*pHints)[nHintPos];
-xub_StrLen st = *(pHt-GetStart());
-if(pHt  pHt-Which() == RES_TXTATR_FLYCNT  (st = 
ppBkmk-get()-GetMarkStart().nContent.GetIndex()))
+const xub_StrLen st = *(pHt-GetStart());
+if( pHt
+ pHt-Which() == RES_TXTATR_FLYCNT
+ (st = 
ppBkmk-get()-GetMarkStart().nContent.GetIndex()) )
 {
-SwFrmFmt *pFrmFmt = pHt-GetFlyCnt().GetFrmFmt();
-const SwNodeIndex *pNdIdx = 
pFrmFmt-GetCntnt().GetCntntIdx();
-const SwNodes nos = pNdIdx-GetNodes();
-const SwGrfNode *pGrf = dynamic_castconst 
SwGrfNode*(nos[pNdIdx-GetIndex() + 1]);
-if (pGrf)
-{
-vecBulletGrf.push_back(pGrf);
-vecFrmFmt.push_back(pFrmFmt);
-}
+SwFrmFmt* pFrmFmt = pHt-GetFlyCnt().GetFrmFmt();
+vecFrmFmt.push_back(pFrmFmt);
+const SwNodeIndex* pNdIdx = 
pFrmFmt-GetCntnt().GetCntntIdx();
+const SwNodes* pNodesArray = (pNdIdx != NULL)
+ ? 
(pNdIdx-GetNodes())
+ : NULL;
+const SwGrfNode *pGrf = (pNodesArray != NULL)
+? dynamic_castconst 
SwGrfNode*((*pNodesArray)[pNdIdx-GetIndex() + 1])
+: NULL;
+vecBulletGrf.push_back(pGrf);
 }
 }
 // update graphic bullet information
@@ -4726,14 +4727,16 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary 
*pGloss, const SwPosition rPos)
 for (sal_uInt16 j = 0; j  MAXLEVEL; ++j)
 {
 SwNumFmt aNumFmt(pRule-Get(j));
-sal_Int16 nType = aNumFmt.GetNumberingType();
-sal_uInt16 nGrfBulletCP = aNumFmt.GetGrfBulletCP();
-if (nType == 

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

[Noel Power]

 basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb |4 ++--
 basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb   |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit fbf8ae82411d56189f844f9f00ccc6cf6b0827bf
Author: Noel Power noel.po...@suse.com
Date:   Tue Aug 20 09:12:59 2013 +0100

fix for fdo#62323 fix duplicated and wrong tests

Change-Id: I73dc238f7de59367a0a9d00e5421ea6675b4f556

diff --git a/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb 
b/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
index f33d74c..c660486 100644
--- a/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
+++ b/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
@@ -9,8 +9,8 @@
 
 Function doUnitTest as Integer
   Dim lngDecimal as Long
-  lngDecimal = Clng(H)
-  If lngDecimal = -1 Then
+  lngDecimal = Clng(H8000)
+  If lngDecimal = -2147483648 Then
  doUnitTest = 1
   Else
  doUnitTest = 0
diff --git a/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
index c660486..a03dadc 100644
--- a/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
+++ b/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
@@ -9,8 +9,8 @@
 
 Function doUnitTest as Integer
   Dim lngDecimal as Long
-  lngDecimal = Clng(H8000)
-  If lngDecimal = -2147483648 Then
+  lngDecimal = Clng(H7FFF)
+  If lngDecimal = 2147483647 Then
  doUnitTest = 1
   Else
  doUnitTest = 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jesús Corrius]

 scp2/inc/macros.inc |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c4d5b148340932df9ac0360e6831169e945566fe
Author: Jesús Corrius jcorr...@gmail.com
Date:   Tue Aug 20 11:23:02 2013 +0200

Registy item fix for AppUserModelID and use STRING macro for strings

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

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 4d588a4..75d2778 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -269,10 +269,10 @@ End
 End
 
 #define REGISTRY_ENTRY_APPUSERMODELID(name,modid,doc_type) \
-RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,AppUserModelID) \
+RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-ComponentCondition = VersionNT = 601; \
+ComponentCondition = STRING(VersionNT = 601); \
 Subkey = STRING(AppUserModelID); \
 Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \
 End
@@ -355,10 +355,10 @@ End
 RegistryItem 
CONCAT2(gid_Regitem_Software_Manufacturer_Productname_Productversion_Explorer_KindMap_,name)
 \
 ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
 ModuleID = modid; \
-ComponentCondition = VersionNT = 600; \
+ComponentCondition = STRING(VersionNT = 600); \
 Subkey = 
STRING(SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap); \
 Name = STRING(CONCAT2(.,key)); \
-Value = document; \
+Value = STRING(document); \
 End
 
 #define 
CONDITIONAL_REGISTER_DOC_EXTENSION(name,modid,key,cond,disp_name,icon_id,app,default,doc_type)
 \
___
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' - ucb/source

[Stephan Bergmann]

 ucb/source/ucp/gio/gio_content.cxx |   42 ++---
 1 file changed, 26 insertions(+), 16 deletions(-)

New commits:
commit 08ab6d26e082c1646de73b347058fd9063570e13
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 14 11:22:51 2013 +0200

Always try to mount in gio::Content::getGFileInfo

...and not only if the caller happens to pass in non-null ppError.  
Otherwise,
calling soffice with a document URL handled by the gio UCP that is not yet
gio-mounted would silently do nothing and exit with EXIT_SUCCESS, as the 
first
thing the type detection code does on the URL is execute 
getPropertyValues for
IsDocument, which calls getGFileInfo with null ppError, so a void instead 
of a
boolean value is returned, which then derails the type detection code to
silently fail (which is another problem that needs fixing).

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

diff --git a/ucb/source/ucp/gio/gio_content.cxx 
b/ucb/source/ucp/gio/gio_content.cxx
index 34857d2..4fe7e83 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -337,25 +337,35 @@ MountOperation::~MountOperation()
 
 GFileInfo* Content::getGFileInfo(const uno::Reference 
ucb::XCommandEnvironment  xEnv, GError **ppError)
 {
-/*If we don't have it already, and we're not a pre-creation content then 
query for the info*/
-if (!mpInfo  !mbTransient)
-{
-if (!(mpInfo = g_file_query_info(getGFile(), *, 
G_FILE_QUERY_INFO_NONE, NULL, ppError)))
-{
-//Try and mount if unmounted
-if (ppError  (*ppError)-code == G_IO_ERROR_NOT_MOUNTED)
-{
-g_error_free(*ppError);
-
-MountOperation aMounter(xEnv);
-*ppError = aMounter.Mount(getGFile());
-
-//No Mount error, reattempt query
-if (!*ppError)
-mpInfo = g_file_query_info(getGFile(), *, 
G_FILE_QUERY_INFO_NONE, NULL, ppError);
+GError * err = 0;
+if (mpInfo == 0  !mbTransient) {
+for (bool retried = false;; retried = true) {
+mpInfo = g_file_query_info(
+getGFile(), *, G_FILE_QUERY_INFO_NONE, 0, err);
+if (mpInfo != 0) {
+break;
+}
+assert(err != 0);
+if (err-code != G_IO_ERROR_NOT_MOUNTED || retried) {
+break;
+}
+SAL_INFO(
+ucb.ucp.gio,
+G_IO_ERROR_NOT_MOUNTED \  err-message
+ \, trying to mount);
+g_error_free(err);
+err = MountOperation(xEnv).Mount(getGFile());
+if (err != 0) {
+break;
 }
 }
 }
+if (ppError != 0) {
+*ppError = err;
+} else if (err != 0) {
+SAL_WARN(ucb.ucp.gio, ignoring GError \  err-message  \);
+g_error_free(err);
+}
 return mpInfo;
 }
 
___
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/source

[Kohei Yoshida]

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

New commits:
commit 6215ebbe96c2e827b4e607986372ed8ebaab903e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Mon Aug 19 16:47:42 2013 -0400

Return on NULL right away, to avoid null dereferencing below.

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

diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index de4959e..ffdb7ea 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -637,7 +637,7 @@ OUString SAL_CALL ScFilterDetect::detect( 
uno::Sequencebeans::PropertyValue l
 }
 
 if (!pFilter)
-aTypeName.Erase();
+return OUString();
 
 if (nIndexOfFilterName == -1)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Fridrich Štrba]

 configure.ac |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 90a2c73f903b8d07b52dc7774fd7296b2bf0c125
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Aug 20 11:46:02 2013 +0200

Don't unnecessarily require too new harfbuzz

Change-Id: I1fc9b29255c9822406dfc6ddb05b3a7f63fcd216

diff --git a/configure.ac b/configure.ac
index d593de8..c9eaaa1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8910,7 +8910,11 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
 if test $_os != WINNT -a $_os != Darwin -a $_os != iOS; then
 AC_MSG_RESULT([yes])
 ENABLE_HARFBUZZ=TRUE
-libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu = 0.9.18])
+if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu = 
0.9.18])
+else
+libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz = 0.9.10])
+fi
 else
 AC_MSG_RESULT([no])
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Oliver-Rainer Wittmann]

 sw/inc/unotxdoc.hxx   |4 -
 sw/source/ui/app/docsh.cxx|   50 --
 sw/source/ui/uno/unotxdoc.cxx |  113 +-
 3 files changed, 73 insertions(+), 94 deletions(-)

New commits:
commit 259d4118949dc89b6a6cbdcb51cafa809fd71594
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Aug 20 09:02:15 2013 +

122868: PDF export - assure that rendering data are cleaned up by calling 
corresponding method in SwDocShell::SaveCompleted(..)

This changes the fix for issue 121125 which triggers 122868

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index f62f035..7a453e3 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -440,8 +440,8 @@ public:
 SwXDrawPage*GetDrawPage();
 SwDocShell* GetDocShell() {return pDocShell;}
 
-// #121125# react on ViewShell change
-void ReactOnViewShellChange();
+// #121125#, #122868# - clean up rendering data
+void CleanUpRenderingData();
 
 void * SAL_CALL operator new( size_t ) throw();
 void SAL_CALL operator delete( void * ) throw();
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index 1e04d9d..5b39dda 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -77,6 +77,7 @@
 #include shellio.hxx  // I/O
 #include docstyle.hxx
 #include doc.hxx
+#include unotxdoc.hxx
 #include IDocumentUndoRedo.hxx
 #include docstat.hxx
 #include pagedesc.hxx
@@ -820,6 +821,18 @@ sal_Bool SwDocShell::SaveCompleted( const uno::Reference  
embed::XStorage  xS
 if( bResetModified )
 EnableSetModified( sal_True );
 }
+
+// #121125#, #122868#
+// Clean up rendering data created by the usage of XRenderable interface
+// of SwXDocument (e.g. export to PDF) and which is not cleaned up by
+// rendering the last page.
+// This is needed to restore former ViewOptions. This is performed via
+// a ViewShell reference hold by the rendering data. The rendering data
+// also needs to loose the hold ViewShell reference. Otherwise, the 
application
+// will crash on closing the document.
+uno::Reference text::XTextDocument   xDoc(GetBaseModel(), 
uno::UNO_QUERY);
+((SwXTextDocument*)xDoc.get())-CleanUpRenderingData();
+
 return bRet;
 }
 
@@ -1125,31 +1138,15 @@ SfxStyleSheetBasePool*  SwDocShell::GetStyleSheetPool()
 }
 
 
-#include unotxdoc.hxx
-
 void SwDocShell::SetView(SwView* pVw)
 {
-bool bChanged(false);
-
 if(0 != (pView = pVw))
 {
 pWrtShell = pView-GetWrtShell();
-bChanged = true;
 }
 else
 {
 pWrtShell = 0;
-bChanged = true;
-}
-
-if(bChanged)
-{
-// #121125# SwXTextDocument may hold references to the ViewShell, so 
inform
-// it about changes to allow to react on it. This happens e.g. when 
printing
-// and/or PDF export (SwViewOptionAdjust_Impl holds a reference to the 
view
-// and needs to be destroyed)
-uno::Reference text::XTextDocument   xDoc(GetBaseModel(), 
uno::UNO_QUERY);
-((SwXTextDocument*)xDoc.get())-ReactOnViewShellChange();
 }
 }
 
@@ -1159,37 +1156,18 @@ void SwDocShell::PrepareReload()
 ::DelAllGrfCacheEntries( pDoc );
 }
 
-// -- OD 2006-11-07 #i59688#
 // linked graphics are now loaded on demand.
 // Thus, loading of linked graphics no longer needed and necessary for
 // the load of document being finished.
 void SwDocShell::LoadingFinished()
 {
-// -- OD 2007-10-08 #i38810#
-// Original fix fails after integration of cws xmlsec11:
 // interface SfxObjectShell::EnableSetModified(..) no longer works, 
because
 // SfxObjectShell::FinishedLoading(..) doesn't care about its status and
 // enables the document modification again.
 // Thus, manuell modify the document, if its modified and its links are 
updated
 // before FinishedLoading(..) is called.
 const bool bHasDocToStayModified( pDoc-IsModified()  
pDoc-LinksUpdated() );
-//// -- OD 2005-02-11 #i38810# - disable method SetModified(..), if 
document
-//// has stay in modified state, due to the update of its links during 
load.
-//bool bResetEnableSetModified(false);
-//if ( IsEnableSetModified() 
-// pDoc-IsModified()  pDoc-LinksUpdated() )
-//{
-//EnableSetModified( sal_False );
-//bResetEnableSetModified = true;
-//}
-// --
 FinishedLoading( SFX_LOADED_ALL );
-//// -- OD 2005-02-11 #i38810#
-//if ( bResetEnableSetModified )
-//{
-//EnableSetModified( sal_True );
-//}
-//// --
 SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this);
 if(pVFrame)
 {
@@ -1198,12 +1176,10 @@ void SwDocShell::LoadingFinished()
 ((SwSrcView*)pShell)-Load(this);
 }
 
-// -- OD 2007-10-08 #i38810#
 if ( bHasDocToStayModified  !pDoc-IsModified() )
 {
 pDoc-SetModified();
 }
-// --
 }
 
 // eine 

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

[Michael Stahl]

 sw/source/core/doc/docdesc.cxx |   31 ++-
 sw/source/core/layout/pagedesc.cxx |4 ++--
 2 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit e1a9a348a519a69f898c9c1e6d87a5837b8267f9
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 20 11:50:34 2013 +0200

fdo#66145: fix copying of header/footer when un-sharing

SwDoc::CopyMasterHeader/Footer(): this could result in sharing the
first-page header/footer with the left-page (!) when un-sharing
via the dialog; the reason is that what actually happens here is that
the left-page header/footer was never changed but the master one
was copied in SwDocStyleSheet::SetItemSet(), so it sort of worked
by accident before the first-page header/footer was added...

Change-Id: Ia24df6ad59cda484559f2ca48ecaa7563878120b

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 6e04bb8..9571e0e 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -194,7 +194,11 @@ void SwDoc::CopyMasterHeader(const SwPageDesc rChged, 
const SwFmtHeader rHead,
 const SwFrmFmt rChgedFrmFmt = (bLeft ? rChged.GetLeft() : 
rChged.GetFirst());
 rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetHeader() );
 }
-else if( (*aRCnt.GetCntntIdx()) == (*aCnt.GetCntntIdx()) )
+else if ((*aRCnt.GetCntntIdx() == *aCnt.GetCntntIdx()) ||
+// The CntntIdx is _always_ different when called from
+// SwDocStyleSheet::SetItemSet, because it deep-copies the
+// PageDesc.  So check if it was previously shared.
+ ((bLeft) ? pDesc-IsHeaderShared() : pDesc-IsFirstShared()))
 {
 SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? Left 
header : First header),
 GetDfltFrmFmt() );
@@ -250,7 +254,11 @@ void SwDoc::CopyMasterFooter(const SwPageDesc rChged, 
const SwFmtFooter rFoot,
 const SwFrmFmt rChgedFrmFmt = (bLeft ? rChged.GetLeft() : 
rChged.GetFirst());
 rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetFooter() );
 }
-else if( (*aRCnt.GetCntntIdx()) == (*aLCnt.GetCntntIdx()) )
+else if ((*aRCnt.GetCntntIdx() == *aLCnt.GetCntntIdx()) ||
+// The CntntIdx is _always_ different when called from
+// SwDocStyleSheet::SetItemSet, because it deep-copies the
+// PageDesc.  So check if it was previously shared.
+ ((bLeft) ? pDesc-IsHeaderShared() : pDesc-IsFirstShared()))
 {
 SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? Left 
footer : First footer),
 GetDfltFrmFmt() );
@@ -344,8 +352,6 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 CopyMasterHeader(rChged, rHead, pDesc, true); // Copy left header
 CopyMasterHeader(rChged, rHead, pDesc, false); // Copy first header
 pDesc-ChgHeaderShare( rChged.IsHeaderShared() );
-// there is just one first shared flag for both header and footer?
-pDesc-ChgFirstShare( rChged.IsFirstShared() );
 
 // Synch Footer.
 const SwFmtFooter rFoot = rChged.GetMaster().GetFooter();
@@ -362,6 +368,8 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 CopyMasterFooter(rChged, rFoot, pDesc, true); // Copy left footer
 CopyMasterFooter(rChged, rFoot, pDesc, false); // Copy first footer
 pDesc-ChgFooterShare( rChged.IsFooterShared() );
+// there is just one first shared flag for both header and footer?
+pDesc-ChgFirstShare( rChged.IsFirstShared() );
 
 if ( pDesc-GetName() != rChged.GetName() )
 pDesc-SetName( rChged.GetName() );
commit 0b7a823bb6df79384939dda4de3b7f28e5e52758
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 20 11:51:27 2013 +0200

fdo#66145: fix Undo invalidation in SwDoc::ChgPageDesc()

SwDoc::ChgPageDesc(): make the invalidation of the Undo stack on
change of IsFirstShared work by delaying ChgFirstShare() until after
the check.

Change-Id: Ifbefe446df8b6d785ed1bb6394ec5beb803fb1fe

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index f5df1d0..6e04bb8 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -324,7 +324,6 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 
 // Take over orientation
 pDesc-SetLandscape( rChged.GetLandscape() );
-pDesc-ChgFirstShare( rChged.IsFirstShared() );
 
 // #i46909# no undo if header or footer changed
 bool bHeaderFooterChanged = false;
@@ -345,6 +344,8 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 CopyMasterHeader(rChged, rHead, pDesc, true); // Copy left header
 CopyMasterHeader(rChged, rHead, pDesc, false); // Copy first header
 

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

[Michael Meeks]

 scripts/esc-bug-stats.pl |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7b44464d459c826fbb93beab1573111a4c489209
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Aug 20 11:25:50 2013 +0100

Use the current date.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index ea8c65d..c17d960 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -3,6 +3,12 @@
 # use me for testing XML pretty printing etc.
 my $fast_debug = 0;
 
+my @time = localtime;
+$time[5] += 1900;
+$time[4]++;
+
+my $date_value = sprintf %04d-%02d-%02d, @time[5,4,3];
+
 sub get_url($)
 {
 my $url = shift;
@@ -127,8 +133,6 @@ for my $component (sort { $component_count{$b} = 
$component_count{$a} } keys %
 printf STDERR \t  %12s - %2d (+?)\n, $component, 
$component_count{$component};
 }
 
-my $date_value = 2001-01-01;
-
 print  EOF
 ?xml version=1.0 encoding=UTF-8?
 office:document 
xmlns:office=urn:oasis:names:tc:opendocument:xmlns:office:1.0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News 2013-08-20

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

+ Convert position and size dialog to widget UI
  in https://gerrit.libreoffice.org/5524 from Olivier Hallot
+ unopkg: use default umask when installing shared extensions
  in https://gerrit.libreoffice.org/5521 from Björgvin Ragnarsson
+ Translate some words in Math Elements Dock
  in https://gerrit.libreoffice.org/5519 from Marcos Souza
+ matrix: add functions to lookup a double or string in columns
  in https://gerrit.libreoffice.org/5454 from Pierre-Eric Pelloux-Prayer
+ startcenter: Add new document buttons to All tab
  in https://gerrit.libreoffice.org/5456 from Krisztian Pinter
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn


* Merged changes on master for project core changed in the last 25 hours:

+ sc/externalrefmgr: reduce individual cell queries
  in https://gerrit.libreoffice.org/5453 from Pierre-Eric Pelloux-Prayer
+ sc/externalrefmgr: batch same-type cells copy
  in https://gerrit.libreoffice.org/5452 from Pierre-Eric Pelloux-Prayer
+ Remove com.sun.star.comp.stoc.RegistryTypeDescriptionProvider
  in https://gerrit.libreoffice.org/5514 from Stephan Bergmann
+ fdo#68219: Parent style text attributes missing in accessibility
  in https://gerrit.libreoffice.org/5480 from Boris Dušek
+ fdo#57950: Remove some chained appends in xmloff
  in https://gerrit.libreoffice.org/5327 from Jelle van der Waa
+ Introduce rtl::compareIgnoreCase and deprecate rtl/character.hxx equivale
  in https://gerrit.libreoffice.org/5412 from Arnaud Versini
+ Refactor TemplateAbstractView to define file exts. in one place
  in https://gerrit.libreoffice.org/5365 from Krisztian Pinter
+ String to OUString
  in https://gerrit.libreoffice.org/5475 from Matteo Casalin
+ String to OUString + whitespaces, log messages
  in https://gerrit.libreoffice.org/5474 from Matteo Casalin
+ String to OUString, some small cleanup
  in https://gerrit.libreoffice.org/5473 from Matteo Casalin
+ fdo#67653: Revert go back to 8 colorvalueset columns
  in https://gerrit.libreoffice.org/5503 from Ivan Timofeev
+ Convert similarity search dialog to .ui
  in https://gerrit.libreoffice.org/5510 from Faisal al-otaibi
+ erroralerttabpage.ui widgets
  in https://gerrit.libreoffice.org/5507 from Manal Alhassoun
+ Convert rotation tap page to widget UI
  in https://gerrit.libreoffice.org/5506 from Olivier Hallot
+ Convert slant  Corner radius tabpage to Widget UI
  in https://gerrit.libreoffice.org/5505 from Olivier Hallot
+ Convert position  size tab page to widget UI
  in https://gerrit.libreoffice.org/5504 from Olivier Hallot
+ Update internal HarfBuzz to 0.9.19
  in https://gerrit.libreoffice.org/5478 from Khaled Hosny
+ Split type-description out of createStandardColumnPart.
  in https://gerrit.libreoffice.org/5432 from Andrzej J.R. Hunt
+ fdo#57950: Remove some chained appends in dbaccess
  in https://gerrit.libreoffice.org/5481 from Jelle van der Waa


* Abandoned changes on master for project core changed in the last 25 hours:

+ fake commit. will be abandoned
  in https://gerrit.libreoffice.org/5511 from Adam CloudOn


* Open changes needing tweaks, but being untouched for more than a week:

+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+ fdo#67104: Default value of 'Show cell grid lines' checkbox on sidebar
  in https://gerrit.libreoffice.org/5260 from Prashant Pandey
+ fdo#66401: fix for combined characters
  in https://gerrit.libreoffice.org/5018 from Adam CloudOn
+ fdo#67737 : fix for flip not being imported and rendered correctly
  in https://gerrit.libreoffice.org/5272 from Adam CloudOn
+ Icons  Texts per toolbar in 'Customize' Toolbars
  in https://gerrit.libreoffice.org/5125 from Prashant Pandey
+ Math Embedded Fonts: Added Font tab to document...
  in https://gerrit.libreoffice.org/4931 from Marcos Souza
+  fdo#66279 - MathML export: use the operator dictionary
  in https://gerrit.libreoffice.org/4671 from Frédéric Wang
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ Remove old outdated gallery images and sounds
  in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt
+ fdo#44216 Prompt if objects from dropped slide should be fixed in aspect 
  in https://gerrit.libreoffice.org/1348 from Rodolfo Ribeiro Gomes


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 include/xmloff/XMLFontAutoStylePool.hxx |1 
 sw/inc/SwRewriter.hxx   |   10 +++--
 sw/source/core/undo/SwRewriter.cxx  |   52 +++-
 sw/source/core/undo/undel.cxx   |   36 +--
 xmloff/source/text/txtexppr.cxx |   59 ++--
 5 files changed, 101 insertions(+), 57 deletions(-)

New commits:
commit 26dc5f2ee67342bd474640e1cc39b96d3220721b
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 11:37:04 2013 +0100

Resolves: fdo#67665 font names filtered out on odp/odg export

Change-Id: Ia529992d15152db981379a1e0a4dec63b2dad40c

diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 7c978f8..12a72a5 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -217,25 +217,48 @@ void XMLTextExportPropertySetMapper::ContextFontFilter(
 if( pFontCharsetState  (pFontCharsetState-maValue = nTmp ) )
 eEnc = (rtl_TextEncoding)nTmp;
 
-OUString sName( ((SvXMLExport)GetExport()).GetFontAutoStylePool()-Find(
-sFamilyName, sStyleName, nFamily, nPitch, eEnc ) );
-if( !sName.isEmpty() )
+//Resolves: fdo#67665 The purpose here appears to be to replace
+//FontFamilyName and FontStyleName etc with a single FontName property. The
+//problem is that repeated calls to here will first set
+//pFontFamilyNameState-mnIndex to -1 to indicate it is disabled, so the
+//next time pFontFamilyNameState is not passed here at all, which gives an
+//empty sFamilyName resulting in disabling pFontNameState-mnIndex to -1.
+//That doesn't seem right to me.
+//
+//So assuming that the main purpose is just to convert the properties in
+//the main when we can, and to leave them alone when we can't. And with a
+//secondary purpose to filter out empty font properties, then is would
+//appear to make sense to base attempting the conversion if we have
+//both of the major facts of the font description
+//
+//An alternative solution is to *not* fill the FontAutoStylePool with
+//every font in the document, but to partition the fonts into the
+//hard-attribute fonts which go into that pool and the style-attribute
+//fonts which go into some additional pool which get merged just for
+//the purposes of writing the embedded fonts but are not queried by
+//Find which restores the original logic.
+if (pFontFamilyNameState || pFontStyleNameState)
 {
-pFontNameState-maValue = sName;
-if( pFontFamilyNameState )
-pFontFamilyNameState-mnIndex = -1;
-if( pFontStyleNameState )
-pFontStyleNameState-mnIndex = -1;
-if( pFontFamilyState )
-pFontFamilyState-mnIndex = -1;
-if( pFontPitchState )
-pFontPitchState-mnIndex = -1;
-if( pFontCharsetState )
-pFontCharsetState-mnIndex = -1;
-}
-else
-{
-pFontNameState-mnIndex = -1;
+OUString sName( 
((SvXMLExport)GetExport()).GetFontAutoStylePool()-Find(
+sFamilyName, sStyleName, nFamily, nPitch, eEnc ) );
+if( !sName.isEmpty() )
+{
+pFontNameState-maValue = sName;
+if( pFontFamilyNameState )
+pFontFamilyNameState-mnIndex = -1;
+if( pFontStyleNameState )
+pFontStyleNameState-mnIndex = -1;
+if( pFontFamilyState )
+pFontFamilyState-mnIndex = -1;
+if( pFontPitchState )
+pFontPitchState-mnIndex = -1;
+if( pFontCharsetState )
+pFontCharsetState-mnIndex = -1;
+}
+else
+{
+pFontNameState-mnIndex = -1;
+}
 }
 
 if( pFontFamilyNameState  sFamilyName.isEmpty() )
commit dfee01afdff0223284d17a4ea2134bece2ef440a
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 11:24:47 2013 +0100

this Find is not actually implemented

Change-Id: I0d8e8903bdc5943079c6ed9f123e2fca2f72467f

diff --git a/include/xmloff/XMLFontAutoStylePool.hxx 
b/include/xmloff/XMLFontAutoStylePool.hxx
index 8ee84d8..096eb3f 100644
--- a/include/xmloff/XMLFontAutoStylePool.hxx
+++ b/include/xmloff/XMLFontAutoStylePool.hxx
@@ -63,7 +63,6 @@ public:
 FontFamily nFamily,
 FontPitch nPitch,
 rtl_TextEncoding eEnc )const;
-OUString Find( const OUString rInternalName ) const;
 
 void exportXML();
 };
commit e47d90690c8fab3ec8b7fd7c1b79372251770f9d
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sun Aug 18 12:03:34 2013 +0200

String to OUString, better location for class method

Change-Id: Ifde0d45e35fed94d4ef6cb93b2feda172fd6608b

diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index bb53508..ecf28ce 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -21,7 +21,7 @@
 #define 

openSuse fbembed/fbclient linking issues due to incorrect fbembed.pc

[Andrzej Hunt]

Hi all,

Based on Michael's/Fridrich's inputs I've debugged the fbclient/fbembed
linking issues on openSuse (tested fully on 12.3, but 12.2 exhibits the
same characteristics), and confirmed that it is indeed just a
copy-and-paste or similar error.

I've submitted this as a bug to openSuse. In the meantime should you
need embedded firebird on openSuse I'd recommend not using system
firebird, or alternatively  manually fixing fbembed.pc
(/usr/lib[64]/pkgconfig/fbembed.pc) as below.

Full details:
- fbembed.pc (in fbembed-devel) mentions -lfbclient instead of
-lfbembed i.e. links against the wrong library (both have the same
interface, but only fbembed has the embedded firebird code within).
(- Due to the above, any builds --with-system-firebird but without
fbclient installed will therefore fail, but this is only a symptom.)
- A successful build (i.e. with fbclient) installed will run but cannot
create or open embedded firebird dbs (remote connections should however
still be usable).
- Manually editing fbembed.pc to mention -lfbembed insted fixes things
-- everything builds without fbclient installed, embedded firebird works
as expected.



Additionally, I'm considering whether it's worthwhile specifically
detecting the error that occurs when trying to open/create an embedded
db with fbclient in order to show a more obvious dialog -- this should
be fairly simple (I still need to make the error reporting a bit more
user friendly anyway for fb).

Also, I could maybe adapt the Driver class to not supply
sdbc:embedded:firebird as a supported url scheme when we are running
fbclient, I still need to look at how this could be verified. This might
not be such a good idea though since then trying to open a .odb with
embedded firebird will probably result in a cryptic driver not found
or similar error, whereas the above solution will result in a specific
error message.


Cheers,

Andrzej

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

Re: dbaccess::ODatabaseContext cleaning its cache too late?

[Stephan Bergmann]

On 08/16/2013 03:46 PM, Lionel Elie Mamane wrote:

On Fri, Aug 16, 2013 at 02:55:35PM +0200, Stephan Bergmann wrote:

No real insight into any of this, but would it make sense to rely on
some explicit commit stimulus to do that committing, instead of
doing it upon dispose


I don't understand what commit stimulus is.


I was thinking of some close function (analogous to how, say, a Java 
class representing a file should have an explicit close() method rather 
than relying on a finalizer).



(or at least take into account m_bModified and not try to commit if
not necessary?).


This seems to make sense; embedded hsqldb are a bit weird because they
save some files (the ones in database/) automatically even without
user save action. I *hope* that this does not clobber m_bModified if
*other* changes are pending (e.g. creation / modification of a report
/ form / ...). I wouldn't be *too* surprised if the save even when
m_bModified == false was to work around a putative m_bModified is
clobbered wrongly issue.


(Just to make it clear: I don't plan to follow up on this with any 
patches; just wanted to bring it up.)


Stephan

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

RE: a lot of warnings when running calc

[Winfried Donkers]

Hi,

 The count may be wrong now because recompilation/recalcutation is deferred 
 due to the display of cached values after load and formulas are (re)compiled 
 later.

The warnings occur when opening a document with formulas (one warning for each 
formulacell, =sum(..) as well as =A1+A2) and e.g. when recalculating.
Shall I leave it as it is now (and continue my quest with fdo#50118), or can I 
easily remedy this?

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

Re: openSuse fbembed/fbclient linking issues due to incorrect fbembed.pc

[Michael Stahl]

On 20/08/13 08:18, Andrzej Hunt wrote:

 Additionally, I'm considering whether it's worthwhile specifically
 detecting the error that occurs when trying to open/create an embedded
 db with fbclient in order to show a more obvious dialog -- this should
 be fairly simple (I still need to make the error reporting a bit more
 user friendly anyway for fb).
 
 Also, I could maybe adapt the Driver class to not supply
 sdbc:embedded:firebird as a supported url scheme when we are running
 fbclient, I still need to look at how this could be verified. This might
 not be such a good idea though since then trying to open a .odb with
 embedded firebird will probably result in a cryptic driver not found
 or similar error, whereas the above solution will result in a specific
 error message.

why not simply a build-time check, e.g. check (grep) in configure that
the link flags for firebird don't contain fbclient which is surely wrong.


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

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

[Oliver-Rainer Wittmann]

 sw/source/filter/ww8/ww8par.cxx |   43 +---
 1 file changed, 23 insertions(+), 20 deletions(-)

New commits:
commit 0659c0c8b558f295f43e0be25bc2c82f81da5f2a
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Aug 20 08:00:27 2013 +

Related: #i123021# import of graphic bullets

consider empty graphic frames in graphic bullet area

(cherry picked from commit b16eb2a11359d6dfd330a46dd70a0142d6b722a2)

Conflicts:
sw/source/filter/ww8/ww8par.cxx

Change-Id: I242762556805b80787bc6c4305c2f735fef711d3

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index fda24ba9..65fe6c4 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -4807,6 +4807,7 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary *pGloss, 
const SwPosition rPos)
 delete mpRedlineStack;
 DeleteAnchorStk();
 DeleteRefStks();
+
 // For i120928,achieve the graphics from the special bookmark with is for 
graphic bullet
 {
 std::vectorconst SwGrfNode* vecBulletGrf;
@@ -4823,25 +4824,25 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary 
*pGloss, const SwPosition rPos)
 
 if ( pTxtNode )
 {
-const SwpHints *pHints = pTxtNode-GetpSwpHints();
-for(int nHintPos = 0; pHints  nHintPos  
pHints-Count(); ++nHintPos)
+const SwpHints* pHints = pTxtNode-GetpSwpHints();
+for( sal_uInt16 nHintPos = 0; pHints  nHintPos  
pHints-Count(); ++nHintPos)
 {
 const SwTxtAttr *pHt = (*pHints)[nHintPos];
-xub_StrLen st = *(pHt-GetStart());
-if(pHt  pHt-Which() == RES_TXTATR_FLYCNT  (st = 
ppBkmk-get()-GetMarkStart().nContent.GetIndex()))
+const xub_StrLen st = *(pHt-GetStart());
+if( pHt
+ pHt-Which() == RES_TXTATR_FLYCNT
+ (st = 
ppBkmk-get()-GetMarkStart().nContent.GetIndex()) )
 {
-SwFrmFmt *pFrmFmt = pHt-GetFlyCnt().GetFrmFmt();
-const SwNodeIndex *pNdIdx = 
pFrmFmt-GetCntnt().GetCntntIdx();
-if (pNdIdx)
-{
-const SwNodes nos = pNdIdx-GetNodes();
-const SwGrfNode *pGrf = dynamic_castconst 
SwGrfNode*(nos[pNdIdx-GetIndex() + 1]);
-if (pGrf)
-{
-vecBulletGrf.push_back(pGrf);
-vecFrmFmt.push_back(pFrmFmt);
-}
-}
+SwFrmFmt* pFrmFmt = pHt-GetFlyCnt().GetFrmFmt();
+vecFrmFmt.push_back(pFrmFmt);
+const SwNodeIndex* pNdIdx = 
pFrmFmt-GetCntnt().GetCntntIdx();
+const SwNodes* pNodesArray = (pNdIdx != NULL)
+ ? 
(pNdIdx-GetNodes())
+ : NULL;
+const SwGrfNode *pGrf = (pNodesArray != NULL)
+? dynamic_castconst 
SwGrfNode*((*pNodesArray)[pNdIdx-GetIndex() + 1])
+: NULL;
+vecBulletGrf.push_back(pGrf);
 }
 }
 // update graphic bullet information
@@ -4852,14 +4853,16 @@ sal_uLong SwWW8ImplReader::CoreLoad(WW8Glossary 
*pGloss, const SwPosition rPos)
 for (int j = 0; j  MAXLEVEL; ++j)
 {
 SwNumFmt aNumFmt(pRule-Get(j));
-sal_Int16 nType = aNumFmt.GetNumberingType();
-sal_uInt16 nGrfBulletCP = aNumFmt.GetGrfBulletCP();
-if (nType == SVX_NUM_BITMAP  vecBulletGrf.size() 
 nGrfBulletCP)
+const sal_Int16 nType = aNumFmt.GetNumberingType();
+const sal_uInt16 nGrfBulletCP = 
aNumFmt.GetGrfBulletCP();
+if ( nType == SVX_NUM_BITMAP
+  vecBulletGrf.size()  nGrfBulletCP
+  vecBulletGrf[nGrfBulletCP] != NULL )
 {
 Graphic aGraphic = 
vecBulletGrf[nGrfBulletCP]-GetGrf();
 SvxBrushItem aBrush(aGraphic, GPOS_AREA, 
SID_ATTR_BRUSH);
 Font aFont = numfunc::GetDefBulletFont();
-int nHeight = aFont.GetHeight() * 12;//20;
+ 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b1/6eb2a11359d6dfd330a46dd70a0142d6b722a2

[Caolán McNamara]

 b1/6eb2a11359d6dfd330a46dd70a0142d6b722a2 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 289b6696815d5f64a705f354001c9b80312c4331
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 12:14:04 2013 +0100

Notes added by 'git notes add'

diff --git a/b1/6eb2a11359d6dfd330a46dd70a0142d6b722a2 
b/b1/6eb2a11359d6dfd330a46dd70a0142d6b722a2
new file mode 100644
index 000..efff9bb
--- /dev/null
+++ b/b1/6eb2a11359d6dfd330a46dd70a0142d6b722a2
@@ -0,0 +1 @@
+merged as: 0659c0c8b558f295f43e0be25bc2c82f81da5f2a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 25/9d4118949dc89b6a6cbdcb51cafa809fd71594

[Caolán McNamara]

 25/9d4118949dc89b6a6cbdcb51cafa809fd71594 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 17ebe7a77c8f2608c92c25c7130b64902e0c4d1e
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 12:15:20 2013 +0100

Notes added by 'git notes add'

diff --git a/25/9d4118949dc89b6a6cbdcb51cafa809fd71594 
b/25/9d4118949dc89b6a6cbdcb51cafa809fd71594
new file mode 100644
index 000..c1df25b
--- /dev/null
+++ b/25/9d4118949dc89b6a6cbdcb51cafa809fd71594
@@ -0,0 +1 @@
+prefer: 89d2733e16ae6233deea6bef3193bd45c89b854c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - bf/1b5979d2ce88265e73ee8fd11599a4374c4136

[Caolán McNamara]

 bf/1b5979d2ce88265e73ee8fd11599a4374c4136 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7ba3f12ad1cd1ca7b291209f85eaf4501e4091cf
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 12:16:57 2013 +0100

Notes added by 'git notes add'

diff --git a/bf/1b5979d2ce88265e73ee8fd11599a4374c4136 
b/bf/1b5979d2ce88265e73ee8fd11599a4374c4136
new file mode 100644
index 000..80886ef
--- /dev/null
+++ b/bf/1b5979d2ce88265e73ee8fd11599a4374c4136
@@ -0,0 +1 @@
+prefer: cf9c0947f5ebc49f945881a520fddb15defb515f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Marcos Paulo de Souza]

 starmath/inc/ElementsDockingWindow.hrc|   22 +++
 starmath/inc/ElementsDockingWindow.hxx|   42 ++
 starmath/source/ElementsDockingWindow.cxx |   32 +++---
 starmath/source/smres.src |   42 ++
 4 files changed, 128 insertions(+), 10 deletions(-)

New commits:
commit 4450b1b93f7f7b5f97c631fe767b1156350a9227
Author: Marcos Paulo de Souza marcos.souza@gmail.com
Date:   Mon Aug 19 17:31:14 2013 -0300

Translate some words in Math Elements Dock

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

diff --git a/starmath/inc/ElementsDockingWindow.hrc 
b/starmath/inc/ElementsDockingWindow.hrc
new file mode 100644
index 000..6eb65b8
--- /dev/null
+++ b/starmath/inc/ElementsDockingWindow.hrc
@@ -0,0 +1,22 @@
+/* -*- 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/.
+ *
+ */
+
+#include starmath.hrc
+
+#define STR_BLACK 1
+#define STR_BLUE 2
+#define STR_GREEN 3
+#define STR_RED 4
+#define STR_CYAN 5
+#define STR_MAGENTA 6
+#define STR_YELLOW 7
+#define STR_HIDE 8
+#define STR_SIZE 9
+#define STR_FONT 10
diff --git a/starmath/inc/ElementsDockingWindow.hxx 
b/starmath/inc/ElementsDockingWindow.hxx
index 9b58be7..ab739bb 100644
--- a/starmath/inc/ElementsDockingWindow.hxx
+++ b/starmath/inc/ElementsDockingWindow.hxx
@@ -107,6 +107,48 @@ public:
 void setVerticalMode(bool bVertical);
 
 void SetSelectHdl(const Link rLink)   { aSelectHdlLink = rLink; }
+
+void setColorBlack(const OUString color) { maColorBlack = color; }
+OUString colorBlack() { return maColorBlack; }
+
+void setColorBlue(const OUString color) { maColorBlue = color; }
+OUString colorBlue() { return maColorBlue; }
+
+void setColorGreen(const OUString color) { maColorGreen = color; }
+OUString colorGreen() { return maColorGreen; }
+
+void setColorRed(const OUString color) { maColorRed = color; }
+OUString colorRed() { return maColorRed; }
+
+void setColorCyan(const OUString color) { maColorCyan = color; }
+OUString colorCyan() { return maColorCyan; }
+
+void setColorMagenta(const OUString color) { maColorMagenta = color; }
+OUString colorMagenta() { return maColorGreen; }
+
+void setColorYellow(const OUString color) { maColorYellow = color; }
+OUString colorYellow() { return maColorYellow; }
+
+void setStringHide(const OUString string) { maStringHide = string; }
+OUString stringHide() { return maStringHide; }
+
+void setStringSize(const OUString string) { maStringSize = string; }
+OUString stringSize() { return maStringSize; }
+
+void setStringFont(const OUString string) { maStringFont = string; }
+OUString stringFont() { return maStringFont; }
+
+private:
+OUStringmaColorBlack;
+OUStringmaColorBlue;
+OUStringmaColorGreen;
+OUStringmaColorRed;
+OUStringmaColorCyan;
+OUStringmaColorMagenta;
+OUStringmaColorYellow;
+OUStringmaStringHide;
+OUStringmaStringSize;
+OUStringmaStringFont;
 };
 
 class SmElementsDockingWindow : public SfxDockingWindow
diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 111a818..2d01c2d 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -18,6 +18,7 @@
  */
 
 #include ElementsDockingWindow.hxx
+#include ElementsDockingWindow.hrc
 
 #include starmath.hrc
 #include smmod.hxx
@@ -393,29 +394,29 @@ void SmElementsControl::addElements(const sal_uInt16 
aElementsArray[], sal_uInt1
 else if (aElementId == RID_BLANK)
 addElement(OUString(\~\), SmResId(aElementId));
 else if (aElementId == RID_PHANTOMX)
-addElement(OUString(\hide\), SmResId(aElementId));
+addElement(OUString(\ + stringHide() +\), 
SmResId(aElementId));
 else if (aElementId == RID_BOLDX)
 addElement(OUString(bold B), SmResId(aElementId));
 else if (aElementId == RID_ITALX)
 addElement(OUString(ital I), SmResId(aElementId));
 else if (aElementId == RID_SIZEXY)
-addElement(OUString(\size\), SmResId(aElementId));
+addElement(OUString(\ + stringSize() + \), 
SmResId(aElementId));
 else if (aElementId == RID_FONTXY)
-addElement(OUString(\font\), SmResId(aElementId));
+ 

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

[Noel Power]

 basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb |   18 +++
 basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb   |   18 +++
 basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb   |   18 +++
 basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb  |   18 +++
 basic/source/comp/scanner.cxx|4 ++-
 5 files changed, 75 insertions(+), 1 deletion(-)

New commits:
commit 3c3c0c589a5b51797c1b751c712e9fa053ad921f
Author: Noel Power noel.po...@suse.com
Date:   Mon Aug 19 16:58:07 2013 +0100

fix for fdo#62323 bad conversion of Hex strings for certain values

Basic hex literals are basic Integer ( e.g. 4 byte ) types with
-2,147,483,648 through 2,147,483,647 range. Interally the scanner
was using a long to form/scan the literal, this led to bad behaviour
on 64bit linux ( where normally long - 8 bytes )

(cherry picked from commit 4c9a08e78b6e2c5d19628281bd4141c268299bea)

and squash of
fix for fdo#62323 fix duplicated and wrong tests

Change-Id: I73dc238f7de59367a0a9d00e5421ea6675b4f556
(cherry picked from commit fbf8ae82411d56189f844f9f00ccc6cf6b0827bf)
Reviewed-on: https://gerrit.libreoffice.org/5526
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb 
b/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
new file mode 100644
index 000..c660486
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H8000)
+  If lngDecimal = -2147483648 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb
new file mode 100644
index 000..f33d74c
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H)
+  If lngDecimal = -1 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
new file mode 100644
index 000..a03dadc
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H7FFF)
+  If lngDecimal = 2147483647 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb
new file mode 100644
index 000..1a02bde
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H0)
+  If lngDecimal = 0 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 728187c..b59e22a 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -413,7 +413,9 @@ bool SbiScanner::NextSym()
 return true;
 }
 bNumber = true;
-long l = 0;
+// Hex literals are signed Integers ( as defined by basic
+// e.g. -2,147,483,648 through 2,147,483,647 (signed)
+sal_Int32 l = 0;
 int i;
 bool bBufOverflow = false;
 while(nCol  aLine.getLength()   
theBasicCharClass::get().isAlphaNumeric(aLine[nCol]  0xFF, bCompatible))
___
Libreoffice-commits mailing list

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

[Xiaoli]

 sw/PythonTest_sw_python.mk  |1 
 sw/qa/python/check_table.py |  260 
 2 files changed, 261 insertions(+)

New commits:
commit d89e02e4a7100bff3e7d81c389cdbc6d43adf480
Author: Xiaoli duan19002...@gmail.com
Date:   Sun Jul 7 22:41:52 2013 +0200

Translate writer test 'Checktable.java' to Python

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

diff --git a/sw/PythonTest_sw_python.mk b/sw/PythonTest_sw_python.mk
index 9421249..52907c1 100644
--- a/sw/PythonTest_sw_python.mk
+++ b/sw/PythonTest_sw_python.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_PythonTest_set_defs,sw_python,\
 $(eval $(call gb_PythonTest_add_modules,sw_python,$(SRCDIR)/sw/qa/python,\
check_index \
check_fields \
+   check_table \
get_expression \
set_expression \
var_fields \
diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
new file mode 100644
index 000..2760e7c
--- /dev/null
+++ b/sw/qa/python/check_table.py
@@ -0,0 +1,260 @@
+import unittest
+from org.libreoffice.unotest import UnoInProcess
+from com.sun.star.uno import RuntimeException
+from com.sun.star.table import BorderLine
+from com.sun.star.table import BorderLine2
+from com.sun.star.table.BorderLineStyle import (DOUBLE, SOLID, EMBOSSED,\
+THICKTHIN_LARGEGAP, DASHED, DOTTED)
+
+class CheckTable(unittest.TestCase):
+_uno = None
+_xDoc = None
+_xDocF = None
+@classmethod
+def setUpClass(cls):
+cls._uno = UnoInProcess()
+cls._uno.setUp()
+cls._xDoc = cls._uno.openEmptyWriterDoc()
+cls._xDocF = cls._uno.openEmptyWriterDoc()
+@classmethod
+def tearDownClass(cls):
+cls._uno.tearDown()
+
+def test_tableborder(self):
+xDoc = self.__class__._xDoc
+# insert table
+xTable = xDoc.createInstance(com.sun.star.text.TextTable)
+xTable.initialize(3, 3)
+xText = xDoc.getText()
+xCursor = xText.createTextCursor()
+xText.insertTextContent(xCursor, xTable, False)
+
+border = xTable.getPropertyValue(TableBorder)
+
+self.assertTrue(border.IsTopLineValid)
+self.assertEquals(0, border.TopLine.InnerLineWidth)
+self.assertEquals(2, border.TopLine.OuterLineWidth)
+self.assertEquals(0, border.TopLine.LineDistance)
+self.assertEquals(0, border.TopLine.Color)
+
+self.assertTrue(border.IsBottomLineValid)
+self.assertEquals(0, border.BottomLine.InnerLineWidth)
+self.assertEquals(2, border.BottomLine.OuterLineWidth)
+self.assertEquals(0, border.BottomLine.LineDistance)
+self.assertEquals(0, border.BottomLine.Color)
+
+self.assertTrue(border.IsLeftLineValid)
+self.assertEquals(0, border.LeftLine.InnerLineWidth)
+self.assertEquals(2, border.LeftLine.OuterLineWidth)
+self.assertEquals(0, border.LeftLine.LineDistance)
+self.assertEquals(0, border.LeftLine.Color)
+
+self.assertTrue(border.IsRightLineValid)
+self.assertEquals(0, border.RightLine.InnerLineWidth)
+self.assertEquals(2, border.RightLine.OuterLineWidth)
+self.assertEquals(0, border.RightLine.LineDistance)
+self.assertEquals(0, border.RightLine.Color)
+
+self.assertTrue(border.IsHorizontalLineValid)
+self.assertEquals(0, border.HorizontalLine.InnerLineWidth)
+self.assertEquals(2, border.HorizontalLine.OuterLineWidth)
+self.assertEquals(0, border.HorizontalLine.LineDistance)
+self.assertEquals(0, border.HorizontalLine.Color)
+
+self.assertTrue(border.IsVerticalLineValid)
+self.assertEquals(0, border.VerticalLine.InnerLineWidth)
+self.assertEquals(2, border.VerticalLine.OuterLineWidth)
+self.assertEquals(0, border.VerticalLine.LineDistance)
+self.assertEquals(0, border.VerticalLine.Color)
+
+self.assertTrue(border.IsDistanceValid)
+self.assertEquals(97, border.Distance)
+# set border
+border.TopLine= BorderLine(0,  11, 19, 19)
+border.BottomLine = BorderLine(0xFF,   00, 11, 00)
+border.HorizontalLine = BorderLine(0xFF00, 00, 90, 00)
+xTable.setPropertyValue(TableBorder, border)
+# read set border
+border = xTable.getPropertyValue(TableBorder)
+
+self.assertTrue(border.IsTopLineValid)
+self.assertEquals(11, border.TopLine.InnerLineWidth)
+self.assertEquals(19, border.TopLine.OuterLineWidth)
+self.assertEquals(19, border.TopLine.LineDistance)
+self.assertEquals(0, border.TopLine.Color)
+
+self.assertTrue(border.IsBottomLineValid)
+self.assertEquals(0, border.BottomLine.InnerLineWidth)
+self.assertEquals(11, border.BottomLine.OuterLineWidth)
+self.assertEquals(0, 

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

[Gergo Mocsi]

 basctl/source/basicide/baside2b.cxx|4 ++--
 basic/source/classes/codecompletecache.cxx |1 +
 basic/source/comp/dim.cxx  |6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 0c681742db11bc18e3d3a5284e4a56128b1f5531
Author: Gergo Mocsi gmocs...@gmail.com
Date:   Tue Aug 20 13:29:18 2013 +0200

GSOC work, multiple fixes

Code completion: parser recognizes extended types ony when the checkbox is 
checked.
Fixed a crash caused by a misspelled uno type.
Fixed function CodeCompleteDataCache::Clear() to clear both internal 
variables.

Change-Id: I82fdd2e1cf749237e2e2de4a9a2fc7d07fb7eb4a

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 7d67327..8c09ada 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2899,7 +2899,7 @@ UnoTypeCodeCompletetor::UnoTypeCodeCompletetor( const 
std::vector OUString  a
 std::vector OUString  UnoTypeCodeCompletetor::GetXIdlClassMethods() const
 {
 std::vector OUString  aRetVect;
-if( bCanComplete )
+if( bCanComplete  ( xClass != NULL ) )
 {
 Sequence Reference reflection::XIdlMethod   aMethods = 
xClass-getMethods();
 if( aMethods.getLength() != 0 )
@@ -2916,7 +2916,7 @@ std::vector OUString  
UnoTypeCodeCompletetor::GetXIdlClassMethods() const
 std::vector OUString  UnoTypeCodeCompletetor::GetXIdlClassFields() const
 {
 std::vector OUString  aRetVect;
-if( bCanComplete )
+if( bCanComplete  ( xClass != NULL ) )
 {
 Sequence Reference reflection::XIdlField   aFields = 
xClass-getFields();
 if( aFields.getLength() != 0 )
diff --git a/basic/source/classes/codecompletecache.cxx 
b/basic/source/classes/codecompletecache.cxx
index a5b9ce6..aad0e4f 100644
--- a/basic/source/classes/codecompletecache.cxx
+++ b/basic/source/classes/codecompletecache.cxx
@@ -136,6 +136,7 @@ void CodeCompleteDataCache::print() const
 void CodeCompleteDataCache::Clear()
 {
 aVarScopes.clear();
+aGlobalVars.clear();
 }
 
 void CodeCompleteDataCache::InsertGlobalVar( const OUString sVarName, const 
OUString sVarType )
diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 2b94c39..64d0565 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -407,13 +407,13 @@ void SbiParser::DefVar( SbiOpcode eOp, bool bStatic )
 OUString aTypeName( aGblStrings.Find( pDef-GetTypeId() ) );
 if( rTypeArray-Find( aTypeName, SbxCLASS_OBJECT ) == NULL )
 {
-if(!CodeCompleteOptions::IsCodeCompleteOn())
-Error( SbERR_UNDEF_TYPE, aTypeName );
-else
+if( CodeCompleteOptions::IsExtendedTypeDeclaration() )
 {
 if(!IsUnoInterface(aTypeName))
 Error( SbERR_UNDEF_TYPE, aTypeName );
 }
+else
+Error( SbERR_UNDEF_TYPE, aTypeName );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Meeks]

 sc/source/ui/view/viewfun4.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit ab55228f6c524ddefde2d7e1d6688b8a407da3ad
Author: Michael Meeks michael.me...@suse.com
Date:   Tue Aug 20 12:45:34 2013 +0100

fdo#53032 - Use the right mark area to undo paste of RTF.

Change-Id: Iee0521e4f7851f5b51cf6ab7a973bf8b46fb09f5

diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index d4ec28f..821937e 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -142,12 +142,12 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW 
nStartRow,
 pRedoDoc-InitUndo( pDoc, nTab, nTab );
 pDoc-CopyToDocument( nStartCol,nStartRow,nTab, 
nStartCol,nEndRow,nTab, IDF_ALL|IDF_NOCAPTIONS, false, pRedoDoc );
 
+ScRange aMarkRange(nStartCol, nStartRow, nTab, nStartCol, 
nEndRow, nTab);
 ScMarkData aDestMark;
-aDestMark.SelectOneTable( nTab );
+aDestMark.SetMarkArea( aMarkRange );
 pDocSh-GetUndoManager()-AddUndoAction(
-new ScUndoPaste(
-pDocSh, ScRange(nStartCol, nStartRow, nTab, nStartCol, 
nEndRow, nTab),
-aDestMark, pUndoDoc, pRedoDoc, IDF_ALL, NULL));
+new ScUndoPaste( pDocSh, aMarkRange, aDestMark,
+ pUndoDoc, pRedoDoc, IDF_ALL, NULL));
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: a lot of warnings when running calc

[Eike Rathke]

Hi Winfried,

On Tuesday, 2013-08-20 09:37:39 +0200, Winfried Donkers wrote:

 The warnings occur when opening a document with formulas (one warning for 
 each formulacell, =sum(..) as well as =A1+A2) and e.g. when recalculating.
 Shall I leave it as it is now (and continue my quest with fdo#50118), or can 
 I easily remedy this?

Just leave it as is for now, to fix it we need to investigate where
formula cells that are already in the recalculation chain have their
token arrays changed.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
For key transition see http://erack.de/key-transition-2013-01-10.txt.asc
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpdqMGUIH_Tl.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: openSuse fbembed/fbclient linking issues due to incorrect fbembed.pc

[Andrzej Hunt]

On Tue, 2013-08-20 at 12:52 +0200, Michael Stahl wrote:
 On 20/08/13 08:18, Andrzej Hunt wrote:
 
  Additionally, I'm considering whether it's worthwhile specifically
  detecting the error that occurs when trying to open/create an embedded
  db with fbclient in order to show a more obvious dialog -- this should
  be fairly simple (I still need to make the error reporting a bit more
  user friendly anyway for fb).
  
  Also, I could maybe adapt the Driver class to not supply
  sdbc:embedded:firebird as a supported url scheme when we are running
  fbclient, I still need to look at how this could be verified. This might
  not be such a good idea though since then trying to open a .odb with
  embedded firebird will probably result in a cryptic driver not found
  or similar error, whereas the above solution will result in a specific
  error message.
 
 why not simply a build-time check, e.g. check (grep) in configure that
 the link flags for firebird don't contain fbclient which is surely wrong.
 
 
There is the (very remote) possibility that someone might want to
specifically build against fbclient -- however that's probably very rare
and most of the time fbclient would only be used accidentally, so the
above possibility does seem best -- I'll try and add that.

(Should anyone decide they really need this they could probably add an
extra configure flag e.g. --with-fbclient or similar to disable the
check?)

I'll probably still add the error detection at opening/creation just in
case a user still ends up with a build that uses fbclient for whatever
reason -- this would still be needed in any case to show prettier errors
if a local file / remote server / etc. doesn't exist or isn't reachable
etc., so detecting and showing a you should be using fbembed error
wouldn't be much more work.


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

generate core dumps for failed unit tests on tinderboxes

[Stephan Bergmann]

Hi all tinderbox owners,

since the recipes for both CppunitTest and JunitTest on at least all 
(non-Apple) Unix platforms produce nice gdb-processed backtraces now 
when a test crashes and creates a core file, it would probably be 
beneficial to enable generation of core files on relevant tinderboxes.


The way I did that for (currently defunct) 
Linux-RHEL6-x86_64_14-with-check is with a 
~/.tinbuild/phases/profile_name.sh containing


  ulimit -c unlimited

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

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

[Oliver-Rainer Wittmann]

 sw/source/ui/uno/unotxdoc.cxx |   52 +-
 1 file changed, 22 insertions(+), 30 deletions(-)

New commits:
commit f29c386d1cfdd84512f09476a8a0a2b074af790f
Author: Oliver-Rainer Wittmann o...@apache.org
Date:   Tue Aug 20 10:30:23 2013 +

122868: PDF export - assure clean up of further data needed for PDF export 
in Page Preview

diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 70c2b0a..f45c64c 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -618,8 +618,16 @@ void SwXTextDocument::dispose(void) throw( 
RuntimeException )
   ---*/
 void SwXTextDocument::close( sal_Bool bDeliverOwnership ) throw( 
util::CloseVetoException, RuntimeException )
 {
-if(IsValid()  m_pHiddenViewFrame)
+if ( IsValid()  m_pHiddenViewFrame )
+{
+ASSERT( false, SwXTextDocument::close(..) - rendering data not 
cleaned up??? );
 lcl_DisposeView( m_pHiddenViewFrame, pDocShell);
+m_pHiddenViewFrame = 0;
+// prevent crash described in #i108805
+SfxItemSet *pSet = pDocShell-GetMedium()-GetItemSet();
+pSet-Put( SfxBoolItem( SID_HIDDEN, sal_False ) );
+}
+
 SfxBaseModel::close(bDeliverOwnership);
 }
 /*-- 18.12.98 13:12:25---
@@ -3201,8 +3209,6 @@ void SAL_CALL SwXTextDocument::render(
 else// normal printing and PDF export
 pVwSh-PrintOrPDFExport( pOut, rSwPrtOptions, 
nRenderer );
 
-// -- FME 2004-10-08 #i35176#
-//
 // After printing the last page, we take care for the 
links coming
 // from the EditEngine. The links are generated during the 
painting
 // process, but the destinations are still missing.
@@ -3211,40 +3217,17 @@ void SAL_CALL SwXTextDocument::render(
 {
 SwEnhancedPDFExportHelper aHelper( *pWrtShell, *pOut, 
aPageRange, bIsSkipEmptyPages,  sal_True );
 }
-// --
 
 pVwSh-SetPDFExportOption( sal_False );
-
-// last page to be rendered? (not necessarily the last 
page of the document)
-// - do clean-up of data
-if (bLastPage)
-{
-// #i96167# haggai: delete ViewOptionsAdjust here 
because it makes use
-// of the shell, which might get destroyed in 
lcl_DisposeView!
-if (m_pRenderData  
m_pRenderData-IsViewOptionAdjust())
-m_pRenderData-ViewOptionAdjustStop();
-
-if (m_pRenderData  m_pRenderData-HasPostItData())
-m_pRenderData-DeletePostItData();
-if (m_pHiddenViewFrame)
-{
-lcl_DisposeView( m_pHiddenViewFrame, pDocShell );
-m_pHiddenViewFrame = 0;
-
-// prevent crash described in #i108805
-SwDocShell *pRenderDocShell = pDoc-GetDocShell();
-SfxItemSet *pSet = 
pRenderDocShell-GetMedium()-GetItemSet();
-pSet-Put( SfxBoolItem( SID_HIDDEN, sal_False ) );
-}
-}
 }
 }
 }
 }
-if( bLastPage )
+// last page to be rendered? (not necessarily the last page of the 
document)
+// - do clean-up of data
+if ( bLastPage )
 {
-delete m_pRenderData;   m_pRenderData = NULL;
-delete m_pPrintUIOptions;   m_pPrintUIOptions = NULL;
+CleanUpRenderingData();
 }
 }
 /* -03.10.04 -
@@ -3505,6 +3488,7 @@ uno::Sequence lang::Locale  SAL_CALL 
SwXTextDocument::getDocumentLanguages(
 // #121125#, #122868#
 // method to assure clean up of the rendering data to restore view options
 // and to loose hold reference to the ViewShell in SwViewOptionAdjust_Impl.
+// also perform clean up for the still existing hidden frame for PDF export 
from Page Preview
 void SwXTextDocument::CleanUpRenderingData()
 {
 if( m_pRenderData != NULL )
@@ -3522,6 +3506,14 @@ void SwXTextDocument::CleanUpRenderingData()
 delete m_pPrintUIOptions;
 m_pPrintUIOptions = NULL;
 }
+
+if ( IsValid()  m_pHiddenViewFrame )
+{
+lcl_DisposeView( m_pHiddenViewFrame, pDocShell);
+m_pHiddenViewFrame = 0;
+SfxItemSet *pSet = pDocShell-GetMedium()-GetItemSet();
+pSet-Put( SfxBoolItem( SID_HIDDEN, sal_False ) );
+}
 }
 
 /* -25.10.99 11:06---
___
Libreoffice-commits mailing list

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

[Michael Stahl]

 sw/source/core/doc/docdesc.cxx |   14 --
 1 file changed, 12 insertions(+), 2 deletions(-)

New commits:
commit f7433971d901f8f66538ef8df3e7729b0047ca2c
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 20 11:50:34 2013 +0200

fdo#66145: fix copying of header/footer when un-sharing

SwDoc::CopyMasterHeader/Footer(): this could result in sharing the
first-page header/footer with the left-page (!) when un-sharing
via the dialog; the reason is that what actually happens here is that
the left-page header/footer was never changed but the master one
was copied in SwDocStyleSheet::SetItemSet(), so it sort of worked
by accident before the first-page header/footer was added...

Change-Id: Ia24df6ad59cda484559f2ca48ecaa7563878120b
(cherry picked from commit e1a9a348a519a69f898c9c1e6d87a5837b8267f9)
Reviewed-on: https://gerrit.libreoffice.org/5536
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 1852b4c..6c31cbf 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -197,7 +197,11 @@ void SwDoc::CopyMasterHeader(const SwPageDesc rChged, 
const SwFmtHeader rHead,
 const SwFrmFmt rChgedFrmFmt = (bLeft ? rChged.GetLeft() : 
rChged.GetFirst());
 rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetHeader() );
 }
-else if( (*aRCnt.GetCntntIdx()) == (*aCnt.GetCntntIdx()) )
+else if ((*aRCnt.GetCntntIdx() == *aCnt.GetCntntIdx()) ||
+// The CntntIdx is _always_ different when called from
+// SwDocStyleSheet::SetItemSet, because it deep-copies the
+// PageDesc.  So check if it was previously shared.
+ ((bLeft) ? pDesc-IsHeaderShared() : pDesc-IsFirstShared()))
 {
 SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? Left 
header : First header),
 GetDfltFrmFmt() );
@@ -252,7 +256,11 @@ void SwDoc::CopyMasterFooter(const SwPageDesc rChged, 
const SwFmtFooter rFoot,
 const SwFrmFmt rChgedFrmFmt = (bLeft ? rChged.GetLeft() : 
rChged.GetFirst());
 rDescFrmFmt.SetFmtAttr( rChgedFrmFmt.GetFooter() );
 }
-else if( (*aRCnt.GetCntntIdx()) == (*aLCnt.GetCntntIdx()) )
+else if ((*aRCnt.GetCntntIdx() == *aLCnt.GetCntntIdx()) ||
+// The CntntIdx is _always_ different when called from
+// SwDocStyleSheet::SetItemSet, because it deep-copies the
+// PageDesc.  So check if it was previously shared.
+ ((bLeft) ? pDesc-IsHeaderShared() : pDesc-IsFirstShared()))
 {
 SwFrmFmt *pFmt = new SwFrmFmt( GetAttrPool(), (bLeft ? Left 
footer : First footer),
 GetDfltFrmFmt() );
@@ -362,6 +370,8 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 CopyMasterFooter(rChged, rFoot, pDesc, true); // Copy left footer
 CopyMasterFooter(rChged, rFoot, pDesc, false); // Copy first footer
 pDesc-ChgFooterShare( rChged.IsFooterShared() );
+// there is just one first shared flag for both header and footer?
+pDesc-ChgFirstShare( rChged.IsFirstShared() );
 
 if ( pDesc-GetName() != rChged.GetName() )
 pDesc-SetName( rChged.GetName() );
___
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' - sw/source

[Michael Stahl]

 sw/source/core/layout/pagedesc.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a0342b16c6a837f8fcecd3c7983df119e459b67f
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 20 11:41:37 2013 +0200

fdo#66145: do not check IsFirstShared() in SwPageDesc::GetLeftFmt()

... and GetRightFmt().  If the first format is requested it must be
returned; the sharing works by copying the SwFmtHeader/Footer from
aMaster to the other members.

(regression from 4dc78aee9bcdb6ea5e9dc47ebb4a4b9e590c725a)

Change-Id: I1708f01c18b155ae75c14fc407e52ccd2bd798d7
(cherry picked from commit 4df438c9a9d5e698c47c1e85903eb81880a5e6fa)
Reviewed-on: https://gerrit.libreoffice.org/5534
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/core/layout/pagedesc.cxx 
b/sw/source/core/layout/pagedesc.cxx
index 7e8586b..aa966df 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -348,14 +348,14 @@ sal_Bool SwPageDesc::IsFollowNextPageOfNode( const 
SwNode rNd ) const
 SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst)
 {
 return (nsUseOnPage::PD_LEFT  eUse)
-? (bFirst  !IsFirstShared()) ? aFirst : aLeft
+? ((bFirst) ? aFirst : aLeft)
 : 0;
 }
 
 SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst)
 {
 return (nsUseOnPage::PD_RIGHT  eUse)
-? (bFirst  !IsFirstShared()) ? aFirst : aMaster
+? ((bFirst) ? aFirst : aMaster)
 : 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-0' - sw/source

[Michael Stahl]

 sw/source/core/doc/docdesc.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 49e308ce893e461a121ea7d90ec9514f05bf62aa
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 20 11:51:27 2013 +0200

fdo#66145: fix Undo invalidation in SwDoc::ChgPageDesc()

SwDoc::ChgPageDesc(): make the invalidation of the Undo stack on
change of IsFirstShared work by delaying ChgFirstShare() until after
the check.

Change-Id: Ifbefe446df8b6d785ed1bb6394ec5beb803fb1fe
(cherry picked from commit 0b7a823bb6df79384939dda4de3b7f28e5e52758)
Reviewed-on: https://gerrit.libreoffice.org/5535
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz

diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 6c31cbf..2e45e60 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -332,7 +332,6 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 
 // Take over orientation
 pDesc-SetLandscape( rChged.GetLandscape() );
-pDesc-ChgFirstShare( rChged.IsFirstShared() );
 
 // #i46909# no undo if header or footer changed
 bool bHeaderFooterChanged = false;
@@ -353,6 +352,8 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 CopyMasterHeader(rChged, rHead, pDesc, true); // Copy left header
 CopyMasterHeader(rChged, rHead, pDesc, false); // Copy first header
 pDesc-ChgHeaderShare( rChged.IsHeaderShared() );
+// there is just one first shared flag for both header and footer?
+pDesc-ChgFirstShare( rChged.IsFirstShared() );
 
 // Synch Footer.
 const SwFmtFooter rFoot = rChged.GetMaster().GetFooter();
@@ -363,8 +364,7 @@ void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc 
rChged )
 const SwFmtFooter rOldFoot = pDesc-GetMaster().GetFooter();
 bHeaderFooterChanged |=
 ( rFoot.IsActive() != rOldFoot.IsActive() ||
-  rChged.IsFooterShared() != pDesc-IsFooterShared() ||
-  rChged.IsFirstShared() != pDesc-IsFirstShared() );
+  rChged.IsFooterShared() != pDesc-IsFooterShared() );
 }
 pDesc-GetMaster().SetFmtAttr( rFoot );
 CopyMasterFooter(rChged, rFoot, pDesc, true); // Copy left footer
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: l10ntools/Executable_pocheck.mk l10ntools/Module_l10ntools.mk l10ntools/source Repository.mk

[Andras Timar]

 Repository.mk   |1 
 l10ntools/Executable_pocheck.mk |   34 +
 l10ntools/Module_l10ntools.mk   |1 
 l10ntools/source/pocheck.cxx|  267 
 4 files changed, 303 insertions(+)

New commits:
commit 72576f439ad3eebc6947a50070f1ffabe2964b32
Author: Andras Timar ati...@suse.com
Date:   Tue Aug 20 13:24:19 2013 +0200

fdo#67786 pocheck tool for checking translations

Pootle has many checks, but there are cases which are not covered.
Therefore I wrote a tool which checked three types of translation
errors:

1. Unique style names.
2. Unique spreadsheet function names.
3. Missing trailing '|' in Windows installer translation.

Usage: make cmd cmd=solver/*/bin/pocheck

It checks all languages and prints the report to stdout.

Change-Id: I89aad66ea41c0ebe4a6f45beaaf86afd1a6439cc

diff --git a/Repository.mk b/Repository.mk
index ba0f291..1433f1b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
osl_process_child \
pdf2xml \
pdfunzip \
+   pocheck \
propex \
reg2unoidl \
regsvrex \
diff --git a/l10ntools/Executable_pocheck.mk b/l10ntools/Executable_pocheck.mk
new file mode 100644
index 000..2619ac6
--- /dev/null
+++ b/l10ntools/Executable_pocheck.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Executable_Executable,pocheck))
+
+$(eval $(call gb_Executable_set_include,pocheck,\
+-I$(SRCDIR)/l10ntools/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_libraries,pocheck,\
+sal \
+))
+
+$(eval $(call gb_Executable_use_static_libraries,pocheck,\
+transex \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,pocheck,\
+l10ntools/source/pocheck \
+))
+
+$(eval $(call gb_Executable_use_externals,pocheck,\
+boost_headers \
+libxml2 \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index 6e637b2..771e717 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_targets_for_build,l10ntools,\
 Executable_xrmex \
 Executable_localize \
 Executable_transex3 \
+Executable_pocheck \
 Executable_propex \
 Executable_treex \
 Executable_stringex \
diff --git a/l10ntools/source/pocheck.cxx b/l10ntools/source/pocheck.cxx
new file mode 100644
index 000..b717c7d
--- /dev/null
+++ b/l10ntools/source/pocheck.cxx
@@ -0,0 +1,267 @@
+/* -*- 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/.
+ */
+
+#include iostream
+#include map
+#include rtl/string.hxx
+#include po.hxx
+
+// Translated style names must be unique
+static void checkStyleNames(OString aLanguage)
+{
+std::mapOString,sal_uInt16 aLocalizedStyleNames;
+std::mapOString,sal_uInt16 aLocalizedNumStyleNames;
+OString aPoPath = OString(getenv(SRC_ROOT)) +
+  /translations/source/
+  aLanguage + /sw/source/ui/utlui.po;
+PoIfstream aPoInput;
+aPoInput.open(aPoPath);
+if( !aPoInput.isOpen() )
+std::cerr  Warning: Cannot open   aPoPath  std::endl;
+
+for(;;)
+{
+PoEntry aPoEntry;
+aPoInput.readEntry(aPoEntry);
+if( aPoInput.eof() )
+break;
+if( !aPoEntry.isFuzzy()  aPoEntry.getSourceFile() == poolfmt.src 
+aPoEntry.getGroupId().startsWith(STR_POOLCOLL) )
+{
+OString aMsgStr = aPoEntry.getMsgStr();
+if( aMsgStr.isEmpty() )
+continue;
+if( aLocalizedStyleNames.find(aMsgStr) == 
aLocalizedStyleNames.end() )
+aLocalizedStyleNames[aMsgStr] = 1;
+else
+aLocalizedStyleNames[aMsgStr]++;
+}
+if( !aPoEntry.isFuzzy()  aPoEntry.getSourceFile() == poolfmt.src 
+aPoEntry.getGroupId().startsWith(STR_POOLNUMRULE) )
+{
+OString aMsgStr = aPoEntry.getMsgStr();
+if( aMsgStr.isEmpty() )
+continue;
+if( aLocalizedNumStyleNames.find(aMsgStr) == 
aLocalizedNumStyleNames.end() )
+aLocalizedNumStyleNames[aMsgStr] = 1;
+else
+aLocalizedNumStyleNames[aMsgStr]++;
+}
+}
+aPoInput.close();
+
+for( 

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

[Stephan Bergmann]

 ucb/source/ucp/gio/gio_content.cxx |   42 ++---
 1 file changed, 26 insertions(+), 16 deletions(-)

New commits:
commit 20b937fe53d6eebf1d2546f228f9209f75612ba6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Jun 14 11:22:51 2013 +0200

Always try to mount in gio::Content::getGFileInfo

...and not only if the caller happens to pass in non-null ppError.  
Otherwise,
calling soffice with a document URL handled by the gio UCP that is not yet
gio-mounted would silently do nothing and exit with EXIT_SUCCESS, as the 
first
thing the type detection code does on the URL is execute 
getPropertyValues for
IsDocument, which calls getGFileInfo with null ppError, so a void instead 
of a
boolean value is returned, which then derails the type detection code to
silently fail (which is another problem that needs fixing).

Change-Id: I48a84428cdee5caead02909abc2efd3ae3722052
(cherry picked from commit 4d8bf09305fc4e4bd652187aac0a02398413ba65)
Reviewed-on: https://gerrit.libreoffice.org/5537
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/ucb/source/ucp/gio/gio_content.cxx 
b/ucb/source/ucp/gio/gio_content.cxx
index 4833a48..2825870 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -340,25 +340,35 @@ MountOperation::~MountOperation()
 
 GFileInfo* Content::getGFileInfo(const uno::Reference 
ucb::XCommandEnvironment  xEnv, GError **ppError)
 {
-/*If we don't have it already, and we're not a pre-creation content then 
query for the info*/
-if (!mpInfo  !mbTransient)
-{
-if (!(mpInfo = g_file_query_info(getGFile(), *, 
G_FILE_QUERY_INFO_NONE, NULL, ppError)))
-{
-//Try and mount if unmounted
-if (ppError  (*ppError)-code == G_IO_ERROR_NOT_MOUNTED)
-{
-g_error_free(*ppError);
-
-MountOperation aMounter(xEnv);
-*ppError = aMounter.Mount(getGFile());
-
-//No Mount error, reattempt query
-if (!*ppError)
-mpInfo = g_file_query_info(getGFile(), *, 
G_FILE_QUERY_INFO_NONE, NULL, ppError);
+GError * err = 0;
+if (mpInfo == 0  !mbTransient) {
+for (bool retried = false;; retried = true) {
+mpInfo = g_file_query_info(
+getGFile(), *, G_FILE_QUERY_INFO_NONE, 0, err);
+if (mpInfo != 0) {
+break;
+}
+assert(err != 0);
+if (err-code != G_IO_ERROR_NOT_MOUNTED || retried) {
+break;
+}
+SAL_INFO(
+ucb.ucp.gio,
+G_IO_ERROR_NOT_MOUNTED \  err-message
+ \, trying to mount);
+g_error_free(err);
+err = MountOperation(xEnv).Mount(getGFile());
+if (err != 0) {
+break;
 }
 }
 }
+if (ppError != 0) {
+*ppError = err;
+} else if (err != 0) {
+SAL_WARN(ucb.ucp.gio, ignoring GError \  err-message  \);
+g_error_free(err);
+}
 return mpInfo;
 }
 
___
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' - basic/qa basic/source

[Noel Power]

 basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb |   18 +++
 basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb   |   18 +++
 basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb   |   18 +++
 basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb  |   18 +++
 basic/source/comp/scanner.cxx|4 ++-
 5 files changed, 75 insertions(+), 1 deletion(-)

New commits:
commit 230c28efb7773b89cf36312f722da835bfb90bff
Author: Noel Power noel.po...@suse.com
Date:   Mon Aug 19 16:58:07 2013 +0100

fix for fdo#62323 bad conversion of Hex strings for certain values

Basic hex literals are basic Integer ( e.g. 4 byte ) types with
-2,147,483,648 through 2,147,483,647 range. Interally the scanner
was using a long to form/scan the literal, this led to bad behaviour
on 64bit linux ( where normally long - 8 bytes )

(cherry picked from commit 4c9a08e78b6e2c5d19628281bd4141c268299bea)

and squash of
fix for fdo#62323 fix duplicated and wrong tests

Change-Id: I73dc238f7de59367a0a9d00e5421ea6675b4f556
(cherry picked from commit fbf8ae82411d56189f844f9f00ccc6cf6b0827bf)
Reviewed-on: https://gerrit.libreoffice.org/5527
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb 
b/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
new file mode 100644
index 000..c660486
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_negIntLimit-2.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H8000)
+  If lngDecimal = -2147483648 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb
new file mode 100644
index 000..f33d74c
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_negIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H)
+  If lngDecimal = -1 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
new file mode 100644
index 000..a03dadc
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_posIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H7FFF)
+  If lngDecimal = 2147483647 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb 
b/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb
new file mode 100644
index 000..1a02bde
--- /dev/null
+++ b/basic/qa/basic_coverage/test_hexliteral_zeroIntLimit.vb
@@ -0,0 +1,18 @@
+'
+' 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/.
+'
+
+
+Function doUnitTest as Integer
+  Dim lngDecimal as Long
+  lngDecimal = Clng(H0)
+  If lngDecimal = 0 Then
+ doUnitTest = 1
+  Else
+ doUnitTest = 0
+  End If
+End Function
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 87265e7..d2728ab 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -410,7 +410,9 @@ bool SbiScanner::NextSym()
 return true;
 }
 bNumber = true;
-long l = 0;
+// Hex literals are signed Integers ( as defined by basic
+// e.g. -2,147,483,648 through 2,147,483,647 (signed)
+sal_Int32 l = 0;
 int i;
 bool bBufOverflow = false;
 while(nCol  aLine.getLength()   
theBasicCharClass::get().isAlphaNumeric(aLine[nCol]  0xFF, bCompatible))
___
Libreoffice-commits mailing list

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

[Stephan Bergmann]

 l10ntools/source/pocheck.cxx |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 35eccc5e0151febf7c6c3ed2bf33945c534c9b0b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 20 14:34:13 2013 +0200

Missing + signs

Change-Id: I60cfb30c7caab308a0cbe415ba04e1245ed3dd9c

diff --git a/l10ntools/source/pocheck.cxx b/l10ntools/source/pocheck.cxx
index b717c7d..a868153 100644
--- a/l10ntools/source/pocheck.cxx
+++ b/l10ntools/source/pocheck.cxx
@@ -18,7 +18,7 @@ static void checkStyleNames(OString aLanguage)
 std::mapOString,sal_uInt16 aLocalizedStyleNames;
 std::mapOString,sal_uInt16 aLocalizedNumStyleNames;
 OString aPoPath = OString(getenv(SRC_ROOT)) +
-  /translations/source/
+  /translations/source/ +
   aLanguage + /sw/source/ui/utlui.po;
 PoIfstream aPoInput;
 aPoInput.open(aPoPath);
@@ -82,8 +82,8 @@ static void checkFunctionNames(OString aLanguage)
 std::mapOString,sal_uInt16 aLocalizedFunctionNames;
 std::mapOString,sal_uInt16 aLocalizedCoreFunctionNames;
 OString aPoPath = OString(getenv(SRC_ROOT)) +
-  /translations/source/
-  aLanguage
+  /translations/source/ +
+  aLanguage +
   /formula/source/core/resource.po;
 PoIfstream aPoInput;
 aPoInput.open(aPoPath);
@@ -112,8 +112,8 @@ static void checkFunctionNames(OString aLanguage)
 aPoInput.close();
 
 aPoPath = OString(getenv(SRC_ROOT)) +
-/translations/source/
-aLanguage
+/translations/source/ +
+aLanguage +
 /scaddins/source/analysis.po;
 aPoInput.open(aPoPath);
 if( !aPoInput.isOpen() )
@@ -141,8 +141,8 @@ static void checkFunctionNames(OString aLanguage)
 aPoInput.close();
 
 aPoPath = OString(getenv(SRC_ROOT)) +
-  /translations/source/
-   aLanguage
+  /translations/source/ +
+   aLanguage +
   /scaddins/source/datefunc.po;
 aPoInput.open(aPoPath);
 if( !aPoInput.isOpen() )
@@ -170,8 +170,8 @@ static void checkFunctionNames(OString aLanguage)
 aPoInput.close();
 
 aPoPath = OString(getenv(SRC_ROOT)) +
-  /translations/source/
-   aLanguage
+  /translations/source/ +
+   aLanguage +
   /scaddins/source/pricing.po;
 aPoInput.open(aPoPath);
 if( !aPoInput.isOpen() )
@@ -214,8 +214,8 @@ static void checkFunctionNames(OString aLanguage)
 static void checkVerticalBar(OString aLanguage)
 {
 OString aPoPath = OString(getenv(SRC_ROOT)) +
-  /translations/source/
-  aLanguage
+  /translations/source/ +
+  aLanguage +
   
/instsetoo_native/inc_openoffice/windows/msi_languages.po;
 PoIfstream aPoInput;
 aPoInput.open(aPoPath);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Matteo Casalin]

 sw/inc/AnnotationWin.hxx |2 +-
 sw/inc/SidebarWin.hxx|2 +-
 sw/source/ui/docvw/AnnotationWin.cxx |   17 -
 sw/source/ui/docvw/SidebarWin.cxx|   29 +++--
 4 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit b623669b4d8a6f20f8aa40c7afb4a59f1ad8b5c3
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sun Aug 18 12:59:11 2013 +0200

String to OUString, cleanup, typo

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

diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index 589f6d0..67cfe44 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -43,7 +43,7 @@ class SwAnnotationWin : public 
sw::sidebarwindows::SwSidebarWin
 virtual voidDelete();
 virtual voidGotoPos();
 
-virtual String  GetAuthor();
+virtual OUString GetAuthor();
 virtual DateGetDate();
 virtual TimeGetTime();
 
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index f2078c2..cbd728d 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -98,7 +98,7 @@ class SwSidebarWin : public Window
 virtual voidDelete();
 virtual voidGotoPos() = 0;
 
-virtual String  GetAuthor() = 0;
+virtual OUString GetAuthor() = 0;
 virtual DateGetDate() = 0;
 virtual TimeGetTime() = 0;
 
diff --git a/sw/source/ui/docvw/AnnotationWin.cxx 
b/sw/source/ui/docvw/AnnotationWin.cxx
index 2b0da09..0efc8fb 100644
--- a/sw/source/ui/docvw/AnnotationWin.cxx
+++ b/sw/source/ui/docvw/AnnotationWin.cxx
@@ -225,17 +225,16 @@ void SwAnnotationWin::InitAnswer(OutlinerParaObject* 
pText)
 SwSidebarWin* pWin = Mgr().GetNextPostIt(KEY_PAGEUP, this);
 const SvtSysLocale aSysLocale;
 const LocaleDataWrapper rLocalData = aSysLocale.GetLocaleData();
-String aText = String(SW_RES(STR_REPLY));
-SwRewriter aRewriter;
-aRewriter.AddRule(UndoArg1, pWin-GetAuthor());
-aText = aRewriter.Apply(aText);
-aText.Append(String(OUString( () +
-String(rLocalData.getDate( pWin-GetDate())) + OUString(, ) +
-String(rLocalData.getTime( pWin-GetTime(),false)) + OUString(): 
\)));
+SwRewriter aRewriter;
+aRewriter.AddRule(UndoArg1, pWin-GetAuthor());
+const OUString aText = aRewriter.Apply(SW_RESSTR(STR_REPLY))
++  ( + rLocalData.getDate( pWin-GetDate())
++ ,  + rLocalData.getTime( pWin-GetTime(), false)
++ ): \;
 GetOutlinerView()-InsertText(aText,false);
 
 // insert old, selected text or ...
-// TOOD: iterate over all paragraphs, not only first one to find out if it 
is empty
+// TODO: iterate over all paragraphs, not only first one to find out if it 
is empty
 if (pText-GetTextObject().GetText(0).Len())
 GetOutlinerView()-GetEditView().InsertText(pText-GetTextObject());
 else
@@ -299,7 +298,7 @@ bool SwAnnotationWin::IsProtected()
( mpFmtFld ? mpFmtFld-IsProtect() : false );
 }
 
-String SwAnnotationWin::GetAuthor()
+OUString SwAnnotationWin::GetAuthor()
 {
 return mpFld-GetPar1();
 }
diff --git a/sw/source/ui/docvw/SidebarWin.cxx 
b/sw/source/ui/docvw/SidebarWin.cxx
index fa0fed6..ab1471a 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -78,8 +78,6 @@ namespace sw { namespace sidebarwindows {
 #define POSTIT_META_HEIGHT  (sal_Int32) 30
 #define POSTIT_MINIMUMSIZE_WITHOUT_META 50
 
-#define EMPTYSTRING OUString()
-
 SwSidebarWin::SwSidebarWin( SwEditWin rEditWin,
 WinBits nBits,
 SwPostItMgr aMgr,
@@ -260,8 +258,12 @@ SfxItemSet SwSidebarWin::DefaultItem()
 {
 SfxItemSet aItem( mrView.GetDocShell()-GetPool() );
 aItem.Put(SvxFontHeightItem(200,100,EE_CHAR_FONTHEIGHT));
-
aItem.Put(SvxFontItem(FAMILY_SWISS,GetSettings().GetStyleSettings().GetFieldFont().GetName(),
-
EMPTYSTRING,PITCH_DONTKNOW,RTL_TEXTENCODING_DONTKNOW,EE_CHAR_FONTINFO));
+aItem.Put(SvxFontItem(FAMILY_SWISS,
+  
GetSettings().GetStyleSettings().GetFieldFont().GetName(),
+  OUString(),
+  PITCH_DONTKNOW,
+  RTL_TEXTENCODING_DONTKNOW,
+  EE_CHAR_FONTINFO));
 return aItem;
 }
 
@@ -378,11 +380,11 @@ void SwSidebarWin::CheckMetaText()
 OUString sMeta = GetAuthor();
 if (sMeta.isEmpty())
 {
-sMeta = OUString(SW_RES(STR_NOAUTHOR));
+sMeta = SW_RESSTR(STR_NOAUTHOR);
 }
 else if (sMeta.getLength()  22)
 {
-sMeta = sMeta.copy(0, 20) + OUString(...);
+sMeta = sMeta.copy(0, 20) + ...;
 }
 if ( mpMetadataAuthor-GetText() != 

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

[Matteo Casalin]

 sw/source/ui/docvw/SidebarWin.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 92440af9766f8d10adc4669fcd45642731626956
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Sun Aug 18 13:01:15 2013 +0200

Shortened string should really be shorter

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

diff --git a/sw/source/ui/docvw/SidebarWin.cxx 
b/sw/source/ui/docvw/SidebarWin.cxx
index ab1471a..4a0ae75 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -382,7 +382,7 @@ void SwSidebarWin::CheckMetaText()
 {
 sMeta = SW_RESSTR(STR_NOAUTHOR);
 }
-else if (sMeta.getLength()  22)
+else if (sMeta.getLength()  23)
 {
 sMeta = sMeta.copy(0, 20) + ...;
 }
___
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 68220, which changed state.

Bug 68220 Summary: EDITING: BUG:  calc crashes on spell check
https://bugs.freedesktop.org/show_bug.cgi?id=68220

   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

Re: a lot of warnings when running calc

[Kohei Yoshida]

On 08/20/2013 07:51 AM, Eike Rathke wrote:

Hi Winfried,

On Tuesday, 2013-08-20 09:37:39 +0200, Winfried Donkers wrote:


The warnings occur when opening a document with formulas (one warning for each 
formulacell, =sum(..) as well as =A1+A2) and e.g. when recalculating.
Shall I leave it as it is now (and continue my quest with fdo#50118), or can I 
easily remedy this?

Just leave it as is for now, to fix it we need to investigate where
formula cells that are already in the recalculation chain have their
token arrays changed.


Perhaps the recently-landed shared formula implementation changes things 
around in this area?  With the shared formula, multiple ScFormulaCell 
instances may share the same ScTokenArray instance.


Kohei

--
Kohei Yoshida, LibreOffice Calc hacker, SUSE.

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

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

[Andras Timar]

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

New commits:
commit eead9201da4bb0671a42b3ba54e798f4ff64b163
Author: Andras Timar ati...@suse.com
Date:   Tue Aug 20 14:06:35 2013 +0200

Updated core
Project: translations  2aeef1e101f95039d4927e362bc0d0a32a68b6ba

diff --git a/translations b/translations
index 7eff5d7..2aeef1e 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 7eff5d70cd428d75e17c6a180465bfdb1e7e310a
+Subproject commit 2aeef1e101f95039d4927e362bc0d0a32a68b6ba
___
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

[Andras Timar]

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

New commits:
commit eff6abde7639a9361ca5067b1d5a4696c506a014
Author: Andras Timar ati...@suse.com
Date:   Tue Aug 20 14:06:35 2013 +0200

Updated core
Project: translations  6d19b6dbcd66a36cfe3e61833d8d2499b1c27ce6

diff --git a/translations b/translations
index e9a63f8..6d19b6d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit e9a63f857448fc907308d52b10783acf9b91f641
+Subproject commit 6d19b6dbcd66a36cfe3e61833d8d2499b1c27ce6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 odk/examples/java/Inspector/InspectorPane.java |6 +++---
 sw/source/core/layout/paintfrm.cxx |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f1304feb4b343a9497c96bc256a8ade6d8e503f1
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 13:34:56 2013 +0100

[TOOD|TOODO]-TODO

Change-Id: I3444b1788e3246503e2460051e8ddbf38aa3de86

diff --git a/odk/examples/java/Inspector/InspectorPane.java 
b/odk/examples/java/Inspector/InspectorPane.java
index 79cddd7..2f0d2c5 100644
--- a/odk/examples/java/Inspector/InspectorPane.java
+++ b/odk/examples/java/Inspector/InspectorPane.java
@@ -475,9 +475,9 @@ import com.sun.star.uno.XComponentContext;
 addPropertySetInfoSubNodes(oUnoPropertyNode);
 }
 else{
-//TOOD this code is redundant!!!
+//TODO this code is redundant!!!
 if ( oUnoObject.getClass().isArray()){
-// TOODO probably we should provid a possibility to 
insert also non-primitive nodes
+// TODO probably we should provid a possibility to 
insert also non-primitive nodes
 addPrimitiveValuesToTreeNode(oUnoPropertyNode, 
oUnoObject);
 }
 else{
@@ -526,7 +526,7 @@ import com.sun.star.uno.XComponentContext;
 else if (_oUnoNode.getNodeType() == XUnoNode.nOTHERS){
 Object oUnoObject = _oUnoNode.getUnoObject();
 if ( oUnoObject.getClass().isArray()){
-// TOODO probably we should provid a possibility to insert 
also non-primitive nodes
+// TODO probably we should provid a possibility to insert 
also non-primitive nodes
  addPrimitiveValuesToTreeNode(_oUnoNode, oUnoObject);
 }
 else{
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 751ff7d..8b87220 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5898,7 +5898,7 @@ static void lcl_paintBitmapExToRect(OutputDevice *pOut, 
Point aPoint, BitmapEx
 //IMPORTANT: if you change the rects here, also change 
SwPostItMgr::ScrollbarHit
 /*static*/void SwPageFrm::PaintNotesSidebar(const SwRect _rPageRect, 
ViewShell* _pViewShell, sal_uInt16 nPageNum, bool bRight)
 {
-//TOOD: cut out scrollbar area and arrows out of sidepane rect, otherwise 
it could flicker when pressing arrow buttons
+//TODO: cut out scrollbar area and arrows out of sidepane rect, otherwise 
it could flicker when pressing arrow buttons
 if (!_pViewShell )
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk include/svx

[Olivier Hallot]

 cui/AllLangResTarget_cui.mk  |1 
 cui/UIConfig_cui.mk  |1 
 cui/source/factory/dlgfact.cxx   |6 -
 cui/source/inc/cuires.hrc|1 
 cui/source/inc/swpossizetabpage.hxx  |  147 
 cui/source/inc/transfrm.hxx  |6 -
 cui/source/tabpages/swpossizetabpage.cxx |4 
 cui/source/tabpages/swpossizetabpage.hrc |   53 --
 cui/source/tabpages/swpossizetabpage.hxx |  147 
 cui/source/tabpages/transfrm.cxx |   45 +++-
 cui/source/tabpages/transfrm.hrc |   24 
 cui/source/tabpages/transfrm.src |   74 --
 cui/uiconfig/ui/positionsizedialog.ui|  161 +++
 include/svx/dialogs.hrc  |2 
 14 files changed, 338 insertions(+), 334 deletions(-)

New commits:
commit 6abf5a706ff49c996dd3c608939481fa8eccd5f7
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Mon Aug 19 22:06:31 2013 -0300

Convert position and size dialog to widget UI

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

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 2ba3b3a..af8e41d 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -75,7 +75,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
 cui/source/tabpages/page.src \
 cui/source/tabpages/paragrph.src \
 cui/source/tabpages/strings.src \
-cui/source/tabpages/transfrm.src \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 9435977..a0d790c 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -89,6 +89,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/picknumberingpage \
cui/uiconfig/ui/pickoutlinepage \
cui/uiconfig/ui/positionpage \
+   cui/uiconfig/ui/positionsizedialog \
cui/uiconfig/ui/possizetabpage \
cui/uiconfig/ui/querychangelineenddialog \
cui/uiconfig/ui/querydeletechartcolordialog \
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index e3436c4..ab7a4ba 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1386,14 +1386,14 @@ SfxAbstractTabDialog* 
AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W
 case RID_SCH_TransformTabDLG_SVXPAGE_ANGLE :
 {
 pDlg = new SvxTransformTabDialog( pParent, pAttr,pSdrView, 
bSizeTabPage ? SVX_OBJ_NOPROTECT :  SVX_OBJ_NOPROTECT|SVX_OBJ_NORESIZE);
-pDlg-RemoveTabPage( RID_SVXPAGE_ANGLE );
-pDlg-RemoveTabPage( RID_SVXPAGE_SLANT );
+pDlg-RemoveTabPage( RID_SVXPAGE_ANGLE );
+pDlg-RemoveTabPage( RID_SVXPAGE_SLANT );
 }
 break;
 case RID_SCH_TransformTabDLG_SVXPAGE_SLANT:
 {
 pDlg = new  SvxTransformTabDialog( pParent, pAttr,pSdrView, 
bSizeTabPage ? SVX_OBJ_NOPROTECT :  SVX_OBJ_NOPROTECT|SVX_OBJ_NORESIZE);
-pDlg-RemoveTabPage( RID_SVXPAGE_SLANT );
+pDlg-RemoveTabPage( RID_SVXPAGE_SLANT );
 }
 break;
 default:
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 1a54c25..abf3728 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -44,7 +44,6 @@
 #define RID_SVX_FORMAT_CELLS_DLG( RID_SVX_START + 42 )
 
 // used in tabpages
-#define RID_SVXDLG_TRANSFORM(RID_SVX_START +  45)
 #define RID_SVXDLG_LINE (RID_SVX_START +  50)
 #define RID_SVXDLG_BBDLG(RID_SVX_START +  40)
 #define RID_SVXDLG_CAPTION  (RID_SVX_START + 151)
diff --git a/cui/source/tabpages/swpossizetabpage.hxx 
b/cui/source/inc/swpossizetabpage.hxx
similarity index 100%
rename from cui/source/tabpages/swpossizetabpage.hxx
rename to cui/source/inc/swpossizetabpage.hxx
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 5b3138a..ab5e9f2 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -46,10 +46,14 @@ const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
 
 class SvxTransformTabDialog : public SfxTabDialog
 {
+sal_uInt16 nPosSize;
+sal_uInt16 nSWPosSize;
+sal_uInt16 nRotation;
+sal_uInt16 nSlant;
 private:
 const SdrView*  pView;
 
-sal_uInt16  nAnchorCtrls;
+sal_uInt16  nAnchorCtrls;
 LinkaValidateLink;
 
 virtual voidPageCreated( sal_uInt16 nId, SfxTabPage rPage );
diff --git a/cui/source/tabpages/swpossizetabpage.cxx 
b/cui/source/tabpages/swpossizetabpage.cxx
index c7c1407..9fc7067 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ 

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

[Boris Dušek]

 vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80d0ddc474ff506ef90f74613982d1e87ebf51f2
Author: Boris Dušek m...@dusek.me
Date:   Fri Aug 2 00:04:35 2013 +0200

Fix accessibility of text attributes on OS X

The applyAttributesFrom:... method takes range parameter that specifies
a range in the 'string' parameter passed to that method, not in the whole
string of the UI element as retrievd in createAttributedStringForElement:...
(the former string is a substring of the latter).

In other words, the 'range' parameter in applyAttributesFrom: is relative
to the string passed to that method, not to the whole string of the UI
element.

This enables proper reading of text attributes in Writer - when moving
cursor through text, VoiceOver now announces e.g. bold or plain to
indicate changes in text formatting.

Change-Id: I21a633af0bf426759f639435581fcd3bfeafa598
Reviewed-on: https://gerrit.libreoffice.org/5236
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/5492
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm 
b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index d35a53f..2e4ab40 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -222,12 +222,12 @@ using namespace ::rtl;
 [ string beginEditing ];
 // add default attributes for whole string
 Sequence  PropertyValue  defaultAttributes = [ wrapper 
accessibleTextAttributes ] - getDefaultAttributes ( emptySequence );
-[ AquaA11yTextAttributesWrapper applyAttributesFrom: 
defaultAttributes toString: string forRange: [ origRange rangeValue ] 
storeDefaultsTo: wrapper getDefaultsFrom: nil ];
+[ AquaA11yTextAttributesWrapper applyAttributesFrom: 
defaultAttributes toString: string forRange: NSMakeRange ( 0, len ) 
storeDefaultsTo: wrapper getDefaultsFrom: nil ];
 // add attributes for attribute run(s)
 while ( currentIndex  endIndex ) {
 TextSegment textSegment = [ wrapper accessibleText ] - 
getTextAtIndex ( currentIndex, AccessibleTextType::ATTRIBUTE_RUN );
 int endOfRange = endIndex  textSegment.SegmentEnd ? 
textSegment.SegmentEnd : endIndex;
-NSRange rangeForAttributeRun = NSMakeRange ( currentIndex, 
endOfRange - currentIndex );
+NSRange rangeForAttributeRun = NSMakeRange ( currentIndex - 
loc , endOfRange - currentIndex );
 // add run attributes
 Sequence  PropertyValue  attributes = [ wrapper 
accessibleTextAttributes ] - getRunAttributes ( currentIndex, emptySequence );
 [ AquaA11yTextAttributesWrapper applyAttributesFrom: 
attributes toString: string forRange: rangeForAttributeRun storeDefaultsTo: nil 
getDefaultsFrom: wrapper ];
___
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

[Boris Dušek]

 vcl/aqua/source/a11y/aqua11ywrapper.mm |   23 +--
 1 file changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 30d96626c51282b172a3c3f48f8b01ee137dfd08
Author: Boris Dušek m...@dusek.me
Date:   Fri Aug 2 00:20:57 2013 +0200

Use NSAccessibilityActionDescription for action descriptions

Reviewed-on: https://gerrit.libreoffice.org/5238
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

Conflicts:
vcl/aqua/source/a11y/aqua11ywrapper.mm

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

diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm 
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 04c29ad..9a35cbc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -880,29 +880,8 @@ static BOOL isPopupMenuOpen = NO;
 return self;
 }
 
-// TODO: hard-coded like the role descriptions. is there a better way?
 -(NSString *)accessibilityActionDescription:(NSString *)action {
-if ( [ action isEqualToString: NSAccessibilityConfirmAction ] ) {
-return @confirm;
-} else if ( [ action isEqualToString: NSAccessibilityDecrementAction ] ) {
-return @decrement;
-} else if ( [ action isEqualToString: NSAccessibilityDeleteAction ] ) {
-return @delete;
-} else if ( [ action isEqualToString: NSAccessibilityIncrementAction ] ) {
-return @increment;
-} else if ( [ action isEqualToString: NSAccessibilityPickAction ] ) {
-return @pick;
-} else if ( [ action isEqualToString: NSAccessibilityPressAction ] ) {
-return @press;
-} else if ( [ action isEqualToString: NSAccessibilityCancelAction ] ) {
-return @cancel;
-} else if ( [ action isEqualToString: NSAccessibilityRaiseAction ] ) {
-return @raise;
-} else if ( [ action isEqualToString: NSAccessibilityShowMenuAction ] ) {
-return @show menu;
-} else {
-return [ NSString string ];
-}
+return NSAccessibilityActionDescription(action);
 }
 
 -(AquaA11yWrapper *)actionResponder {
___
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

[Boris Dušek]

 vcl/aqua/source/a11y/aqua11ytextwrapper.mm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 788d11aee3b59bb8428beae231d85f0c7d0235ce
Author: Boris Dušek m...@dusek.me
Date:   Fri Aug 9 08:41:42 2013 +0200

fdo#67680: Impossible to search for text attributes with VoiceOver

Change-Id: I02ae12233aa37830106eeffd16876670413f4627
Reviewed-on: https://gerrit.libreoffice.org/5334
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/5494
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm 
b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
index 4d4b75c..ab02eaf 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
@@ -108,13 +108,13 @@ using namespace ::rtl;
 +(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper
 {
 (void)wrapper;
-return [ [ NSArray alloc ] init ]; // unsupported
+return [NSArray arrayWithObject:wrapper];
 }
 
 +(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper
 {
 (void)wrapper;
-return [ NSValue valueWithRange: NSMakeRange ( 0, 0 ) ]; // unsupported
+return [ NSValue valueWithRange: NSMakeRange ( 0, [wrapper 
accessibleText]-getCharacterCount() ) ];
 }
 
 +(void)addAttributeNamesTo:(NSMutableArray *)attributeNames {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0aa3a73c9463f4d1e8918383b21131352635fe75
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 14:25:22 2013 +0100

Resolves: rhbz#998136 different index to gWidgetData vs NWEnsureGTKNotebook

Change-Id: Ib3ebbfda09cd05477b65c1d81ac77e977b2a11e5

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index c88bc6f..e3bff2a 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1607,8 +1607,8 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, 
Rectangle aAreaRect )
 w = aAreaRect.GetWidth();
 h = aAreaRect.GetHeight();
 
-gint xthickness = gWidgetData[0].gNotebookWidget-style-xthickness;
-gint ythickness = gWidgetData[0].gNotebookWidget-style-ythickness;
+gint xthickness = gWidgetData[nScreen].gNotebookWidget-style-xthickness;
+gint ythickness = gWidgetData[nScreen].gNotebookWidget-style-ythickness;
 
 x -= xthickness;
 y -= ythickness;
___
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 vcl/inc

[Boris Dušek]

 vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm |   20 +++
 vcl/aqua/source/a11y/aqua11ywrapper.mm   |9 
 vcl/inc/aqua/aqua11ywrapper.h|3 ++
 3 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit a6edddefab9f46defc0cee262c38bb8eae32916a
Author: Boris Dušek m...@dusek.me
Date:   Sun Aug 11 08:44:26 2013 +0200

fdo#67957: Font name reported in AXFont always Times New Roman

This is a partial fix. Now VoiceOver does report changes in font faces
but it works correctly only when the paragraph text style has font
Times New Roman. If it has not, then parts of the text with
Times New Roman have not change in font reported, but parts with
font different both from the paragraph style font and Times New Roman
do have font change reported.

In other words, the default font for paragraph is still Times New Roman
in accessibility even though sometimes it's not true.

This also fixes font size being reported only when bold or italic is set,
and has more robustness for handling mixed bold/italic when at least one
of them is set in the paragraph style as well.

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

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm 
b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 2e4ab40..e8a676e 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -50,7 +50,7 @@ using namespace ::rtl;
 }
 
 +(int)convertBoldStyle:(PropertyValue)property {
-int boldStyle = 0;
+int boldStyle = NSUnboldFontMask;
 float value = 0;
 property.Value = value;
 if ( value == ::css_awt::FontWeight::SEMIBOLD
@@ -63,7 +63,7 @@ using namespace ::rtl;
 }
 
 +(int)convertItalicStyle:(PropertyValue)property {
-int italicStyle = 0;
+int italicStyle = NSUnitalicFontMask;
 sal_Int16 value = property.Value.get ::css_awt::FontSlant();
 if ( value == ::css_awt::FontSlant_ITALIC ) {
 italicStyle = NSItalicFontMask;
@@ -198,10 +198,22 @@ using namespace ::rtl;
 if ( wrapperStore != nil ) { // default
 [ wrapperStore setDefaultFontname: CreateNSString ( fontname ) ];
 [ wrapperStore setDefaultFontsize: fontsize ];
+[ wrapperStore setDefaultFonttraits: fonttraits ];
 NSFont * font = [ [ NSFontManager sharedFontManager ] fontWithFamily: 
CreateNSString ( fontname ) traits: fonttraits weight: 0 size: fontsize ];
 [ AquaA11yTextAttributesWrapper addFont: font toString: string 
forRange: range ];
-} else if ( wrapper != nil  fonttraits != 0 ) { // attribute run and 
bold and/or italic was found
-NSFont * font = [ [ NSFontManager sharedFontManager ] fontWithFamily: 
[ wrapper defaultFontname ] traits: fonttraits weight: 0 size: [ wrapper 
defaultFontsize ] ];
+} else if ( wrapper != nil) { // attribute run and bold and/or italic was 
found
+NSString *fontName = nil;
+if (fontname.isEmpty())
+fontName = [wrapper defaultFontname];
+else
+fontName = CreateNSString(fontname);
+if (!(fonttraits  (NSBoldFontMask | NSUnboldFontMask)))
+fonttraits |= [wrapper defaultFonttraits]  (NSBoldFontMask | 
NSUnboldFontMask);
+if (!(fonttraits  (NSItalicFontMask | NSUnitalicFontMask)))
+fonttraits |= [wrapper defaultFonttraits]  (NSItalicFontMask | 
NSUnitalicFontMask);
+if (fontsize == 0.0)
+fontsize = [wrapper defaultFontsize];
+NSFont * font = [ [ NSFontManager sharedFontManager ] fontWithFamily: 
fontName traits: fonttraits weight: 0 size: fontsize ];
 [ AquaA11yTextAttributesWrapper addFont: font toString: string 
forRange: range ];
 }
 [ pool release ];
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm 
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 9a35cbc..fe1ba6d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -73,6 +73,7 @@ static BOOL isPopupMenuOpen = NO;
 
 -(void) setDefaults: (Reference  XAccessibleContext ) rxAccessibleContext {
 mDefaultFontsize = 0.0;
+mDefaultFonttraits = 0;
 mpDefaultFontname = nil;
 mpReferenceWrapper = new ReferenceWrapper;
 mActsAsRadioGroup = NO;
@@ -1123,6 +1124,14 @@ Reference  XAccessibleContext  hitTestRunner ( 
com::sun::star::awt::Point poin
 return mDefaultFontsize;
 }
 
+-(void)setDefaultFonttraits:(int)fonttraits {
+mDefaultFonttraits = fonttraits;
+}
+
+-(int)defaultFonttraits {
+return mDefaultFonttraits;
+}
+
 -(void)setActsAsRadioGroup:(BOOL)actsAsRadioGroup {
 mActsAsRadioGroup = actsAsRadioGroup;
 }
diff --git 

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

[Boris Dušek]

 vcl/aqua/source/a11y/aqua11ywrapper.mm |6 ++
 vcl/inc/aqua/aqua11ywrapper.h  |3 +++
 2 files changed, 9 insertions(+)

New commits:
commit 5e920d03b1cfdd8c7714fc9f5c1d484d4de656c8
Author: Boris Dušek m...@dusek.me
Date:   Sun Aug 11 16:34:07 2013 +0200

Add XAccessibleTextMarkup to AquaA11yWrapper

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

diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm 
b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index fe1ba6d..4cff69e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -101,6 +101,8 @@ static BOOL isPopupMenuOpen = NO;
 mpReferenceWrapper - rAccessibleTextAttributes = Reference  
XAccessibleTextAttributes  ( rxAccessibleContext, UNO_QUERY );
 // XAccessibleMultiLineText
 mpReferenceWrapper - rAccessibleMultiLineText = Reference  
XAccessibleMultiLineText  ( rxAccessibleContext, UNO_QUERY );
+// XAccessibleTextMarkup
+mpReferenceWrapper - rAccessibleTextMarkup = Reference  
XAccessibleTextMarkup  ( rxAccessibleContext, UNO_QUERY );
 // XAccessibleEventBroadcaster
 #if 0
 /* #i102033# NSAccessibility does not seemt to know an equivalent for 
transient children.
@@ -1097,6 +1099,10 @@ Reference  XAccessibleContext  hitTestRunner ( 
com::sun::star::awt::Point poin
 return mpReferenceWrapper - rAccessibleMultiLineText.get();
 }
 
+-(XAccessibleTextMarkup *)accessibleTextMarkup {
+return mpReferenceWrapper - rAccessibleTextMarkup.get();
+}
+
 -(NSView *)viewElementForParent {
 return self;
 }
diff --git a/vcl/inc/aqua/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h
index 185536a..a35aa84 100644
--- a/vcl/inc/aqua/aqua11ywrapper.h
+++ b/vcl/inc/aqua/aqua11ywrapper.h
@@ -32,6 +32,7 @@
 #include com/sun/star/accessibility/XAccessibleEditableText.hpp
 #include com/sun/star/accessibility/XAccessibleValue.hpp
 #include com/sun/star/accessibility/XAccessibleMultiLineText.hpp
+#include com/sun/star/accessibility/XAccessibleTextMarkup.hpp
 
 // rAccessibleXYZ as a field in an Objective-C-Class would not call 
Con-/Destructor, so use a struct instead
 struct ReferenceWrapper
@@ -47,6 +48,7 @@ struct ReferenceWrapper
 ::com::sun::star::uno::Reference  
::com::sun::star::accessibility::XAccessibleValue  rAccessibleValue;
 ::com::sun::star::uno::Reference  
::com::sun::star::accessibility::XAccessibleTextAttributes  
rAccessibleTextAttributes;
 ::com::sun::star::uno::Reference  
::com::sun::star::accessibility::XAccessibleMultiLineText  
rAccessibleMultiLineText;
+::com::sun::star::uno::Reference  
::com::sun::star::accessibility::XAccessibleTextMarkup  rAccessibleTextMarkup;
 };
 
 @interface AquaA11yWrapper : NSView
@@ -109,6 +111,7 @@ struct ReferenceWrapper
 -(::com::sun::star::accessibility::XAccessibleValue *)accessibleValue;
 -(::com::sun::star::accessibility::XAccessibleTextAttributes 
*)accessibleTextAttributes;
 -(::com::sun::star::accessibility::XAccessibleMultiLineText 
*)accessibleMultiLineText;
+-(::com::sun::star::accessibility::XAccessibleTextMarkup 
*)accessibleTextMarkup;
 @end
 
 #endif // _SV_AQUA11WRAPPER_H
___
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

[Boris Dušek]

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

New commits:
commit b822f3c09689d3e494df3499caac034838b3f5c6
Author: Boris Dušek m...@dusek.me
Date:   Sun Aug 11 16:37:48 2013 +0200

fdo#67980 - VoiceOver does not inform about misspelled text

Reviewed-on: https://gerrit.libreoffice.org/5351
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

Conflicts:
vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm

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

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm 
b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index e8a676e..6fb55f0 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -28,6 +28,7 @@
 #include com/sun/star/awt/FontUnderline.hpp
 #include com/sun/star/awt/FontWeight.hpp
 #include com/sun/star/awt/FontStrikeout.hpp
+#include com/sun/star/text/TextMarkupType.hpp
 
 namespace css_awt = ::com::sun::star::awt;
 using namespace ::com::sun::star::accessibility;
@@ -219,6 +220,28 @@ using namespace ::rtl;
 [ pool release ];
 }
 
++(void)addMarkup:(XAccessibleTextMarkup*)markup 
toString:(NSMutableAttributedString*)string inRange:(NSRange)range {
+[AquaA11yTextAttributesWrapper addMarkup:markup 
withType:(::com::sun::star::text::TextMarkupType::SPELLCHECK) toString:string 
inRange:range];
+}
+
++(void)addMarkup:(XAccessibleTextMarkup*)markup withType:(long)type 
toString:(NSMutableAttributedString*)string inRange:(NSRange)range {
+const long markupCount = markup-getTextMarkupCount(type);
+for (long markupIndex = 0; markupIndex  markupCount; ++markupIndex) {
+TextSegment markupSegment = markup-getTextMarkup(markupIndex, type);
+NSRange markupRange = NSMakeRange(markupSegment.SegmentStart, 
markupSegment.SegmentEnd - markupSegment.SegmentStart);
+markupRange = NSIntersectionRange(range, markupRange);
+if (markupRange.length  0) {
+markupRange.location -= range.location;
+switch(type) {
+case ::com::sun::star::text::TextMarkupType::SPELLCHECK: {
+[string 
addAttribute:NSAccessibilityMisspelledTextAttribute value:[NSNumber 
numberWithBool:YES] range:markupRange];
+break;
+}
+}
+}
+}
+}
+
 +(NSMutableAttributedString 
*)createAttributedStringForElement:(AquaA11yWrapper *)wrapper 
inOrigRange:(id)origRange {
 static const Sequence  OUString  emptySequence;
 // vars
@@ -245,6 +268,8 @@ using namespace ::rtl;
 [ AquaA11yTextAttributesWrapper applyAttributesFrom: 
attributes toString: string forRange: rangeForAttributeRun storeDefaultsTo: nil 
getDefaultsFrom: wrapper ];
 currentIndex = textSegment.SegmentEnd;
 }
+if ([wrapper accessibleTextMarkup])
+[AquaA11yTextAttributesWrapper addMarkup:[wrapper 
accessibleTextMarkup] toString:string inRange:[origRange rangeValue]];
 [ string endEditing ];
 }
 } catch ( IllegalArgumentException  e ) {
___
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' - xmloff/source

[Zolnai Tamás]

 xmloff/source/text/txtimp.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 93dc3cc8fca6c3873739da1388570e635ee87b90
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Wed Aug 14 16:28:09 2013 +0200

fdo#43807: Fix import of drop caps character style

Export works and import has just a little typo.

Change-Id: I570d70423b5a626f21117971fb7eff030eae20af
(cherry picked from commit 932901224ea8473bbcae6feced953340d489bcc5)
Reviewed-on: https://gerrit.libreoffice.org/5487
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 3abafb5..7795ce1 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1686,7 +1686,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
 XML_STYLE_FAMILY_TEXT_TEXT,
 pStyle-GetDropCapStyleName()) );
 if (m_pImpl-m_xTextStyles-hasByName(sDisplayName) 
-xPropSetInfo-hasPropertyByName( sDisplayName ) )
+xPropSetInfo-hasPropertyByName( pStyle-sDropCapCharStyleName 
) )
 {
 xPropSet-setPropertyValue( pStyle-sDropCapCharStyleName, 
makeAny(sDisplayName) );
 }
___
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' - 2 commits - vcl/aqua xmloff/source

[Zolnai Tamás]

 vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm |   15 +++
 xmloff/source/text/txtimp.cxx|2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 6fd191c80a8c4637a1757b9d5132a33c6602f13b
Author: Zolnai Tamás zolnaitamas2...@gmail.com
Date:   Wed Aug 14 16:28:09 2013 +0200

fdo#43807: Fix import of drop caps character style

Export works and import has just a little typo.

Change-Id: I570d70423b5a626f21117971fb7eff030eae20af
(cherry picked from commit 932901224ea8473bbcae6feced953340d489bcc5)
Reviewed-on: https://gerrit.libreoffice.org/5488
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index db06df8..b5028ae 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -1676,7 +1676,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
 XML_STYLE_FAMILY_TEXT_TEXT,
 pStyle-GetDropCapStyleName()) );
 if (m_pImpl-m_xTextStyles-hasByName(sDisplayName) 
-xPropSetInfo-hasPropertyByName( sDisplayName ) )
+xPropSetInfo-hasPropertyByName( pStyle-sDropCapCharStyleName 
) )
 {
 xPropSet-setPropertyValue( pStyle-sDropCapCharStyleName, 
makeAny(sDisplayName) );
 }
commit 00b9cff4c7bc619fad54d14eea27cd6f46334850
Author: Boris Dušek m...@dusek.me
Date:   Sun Aug 11 19:45:19 2013 +0200

Make VoiceOver announce paragraph alignment

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

diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm 
b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index 6fb55f0..3b86f79 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -29,6 +29,7 @@
 #include com/sun/star/awt/FontWeight.hpp
 #include com/sun/star/awt/FontStrikeout.hpp
 #include com/sun/star/text/TextMarkupType.hpp
+#include com/sun/star/style/ParagraphAdjust.hpp
 
 namespace css_awt = ::com::sun::star::awt;
 using namespace ::com::sun::star::accessibility;
@@ -139,6 +140,7 @@ using namespace ::rtl;
 static const OUString attrForegroundColor(CharColor);
 static const OUString attrBackgroundColor(CharBackColor);
 static const OUString attrSuperscript(CharEscapement);
+static const OUString attrTextAlignment(ParaAdjust);
 // vars
 OUString fontname;
 int fonttraits = 0;
@@ -188,6 +190,19 @@ using namespace ::rtl;
 if ( [ number shortValue ] != 0 ) {
 [ string addAttribute: 
NSAccessibilitySuperscriptTextAttribute value: number range: range ];
 }
+} else if ( property.Name.equals ( attrTextAlignment ) ) {
+sal_Int32 alignment;
+property.Value = alignment;
+NSNumber *textAlignment = nil;
+switch(alignment) {
+case ::com::sun::star::style::ParagraphAdjust_RIGHT : 
textAlignment = [NSNumber numberWithInteger:NSRightTextAlignment]; break;
+case ::com::sun::star::style::ParagraphAdjust_CENTER: 
textAlignment = [NSNumber numberWithInteger:NSCenterTextAlignment]   ; break;
+case ::com::sun::star::style::ParagraphAdjust_BLOCK : 
textAlignment = [NSNumber numberWithInteger:NSJustifiedTextAlignment]; break;
+case ::com::sun::star::style::ParagraphAdjust_LEFT  :
+default : 
textAlignment = [NSNumber numberWithInteger:NSLeftTextAlignment] ; break;
+}
+NSDictionary *paragraphStyle = [NSDictionary 
dictionaryWithObjectsAndKeys:textAlignment, @AXTextAlignment, textAlignment, 
@AXVisualTextAlignment, nil];
+[string addAttribute:@AXParagraphStyle value:paragraphStyle 
range:range];
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - f2/9c386d1cfdd84512f09476a8a0a2b074af790f

[Caolán McNamara]

 f2/9c386d1cfdd84512f09476a8a0a2b074af790f |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 9cdde3fb68f293007a34fe296dd1927f49859314
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 14:26:21 2013 +0100

Notes added by 'git notes add'

diff --git a/f2/9c386d1cfdd84512f09476a8a0a2b074af790f 
b/f2/9c386d1cfdd84512f09476a8a0a2b074af790f
new file mode 100644
index 000..c1df25b
--- /dev/null
+++ b/f2/9c386d1cfdd84512f09476a8a0a2b074af790f
@@ -0,0 +1 @@
+prefer: 89d2733e16ae6233deea6bef3193bd45c89b854c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Boris Dušek]

 sw/source/core/access/accpara.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit e5c7249382c12349e4e032c225c0153f6f41
Author: Boris Dušek m...@dusek.me
Date:   Sat Aug 17 17:23:40 2013 +0200

fdo#68219: Parent style text attributes missing in accessibility

Thanks to Niklas Johansson for testing.

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

diff --git a/sw/source/core/access/accpara.cxx 
b/sw/source/core/access/accpara.cxx
index 3b6ef33..34d9dbd 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -1197,6 +1197,14 @@ uno::SequencePropertyValue 
SwAccessibleParagraph::getCharacterAttributes(
 return aValues;
 }
 
+static void SetPutRecursive(SfxItemSet targetSet, const SfxItemSet sourceSet)
+{
+const SfxItemSet *const pParentSet = sourceSet.GetParent();
+if (pParentSet)
+SetPutRecursive(targetSet, *pParentSet);
+targetSet.Put(sourceSet);
+}
+
 // #i63870#
 void SwAccessibleParagraph::_getDefaultAttributesImpl(
 const uno::Sequence OUString  aRequestedAttributes,
@@ -1243,7 +1251,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
 SfxItemSet aCharSet( 
const_castSwAttrPool(pTxtNode-GetDoc()-GetAttrPool()),
  RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
  0 );
-aCharSet.Put( pTxtNode-GetTxtColl()-GetAttrSet() );
+SetPutRecursive( aCharSet, pTxtNode-GetTxtColl()-GetAttrSet() );
 pSet-Put( aCharSet );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Ivan Timofeev]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6ea3aa6aae980156529d007a107373bbd37dcee6
Author: Ivan Timofeev timofeev@gmail.com
Date:   Tue Aug 20 17:51:58 2013 +0400

gtk: use frame widget for frame rendering

otherwise I get ugly two-color frames with the Adwaita theme.

Change-Id: Ibac1df9759148f89954e13051e3d6e64db30a2af

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index e3bff2a..a80112d 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1187,7 +1187,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 }
 if( nType == CTRL_FRAME  nPart == PART_BORDER )
 {
-int frameWidth = getFrameWidth(m_pWindow);
+int frameWidth = getFrameWidth(gWidgetData[m_nXScreen].gFrame);
 rNativeBoundingRegion = rControlRegion;
 sal_uInt16 nStyle = aValue.getNumericVal();
 int x1=rControlRegion.Left();
@@ -1308,7 +1308,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKFrame(
 const OUString )
 {
 GdkRectangle clipRect;
-int frameWidth=getFrameWidth(m_pWindow);
+int frameWidth=getFrameWidth(gWidgetData[m_nXScreen].gFrame);
 GtkShadowType shadowType=GTK_SHADOW_IN;
 sal_uInt16 nStyle = aValue.getNumericVal();
 if( nStyle  FRAME_DRAW_IN )
@@ -1355,8 +1355,8 @@ sal_Bool GtkSalGraphics::NWPaintGTKFrame(
  rControlRectangle.GetHeight());
 
 // Now render the frame
-
gtk_paint_shadow(m_pWindow-style,gdkDrawable,GTK_STATE_NORMAL,shadowType,clipRect,
- m_pWindow,base,
+
gtk_paint_shadow(gWidgetData[m_nXScreen].gFrame-style,gdkDrawable,GTK_STATE_NORMAL,shadowType,clipRect,
+ gWidgetData[m_nXScreen].gFrame,base,
  rControlRectangle.Left(),
  rControlRectangle.Top(),
  rControlRectangle.GetWidth(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fridrich Štrba]

 sw/source/ui/uno/swdetect.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit c53d6326aaa2bb2721818671034f4df68923b11c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Aug 20 15:48:37 2013 +0200

Revert Ugly workaround for historic sxw files...

There is cleaner, scriptable and out-of-source-tree workaround available at:

http://fridrich.blogspot.ch/2013/08/service-announcement-openning-of-sxw.html

This reverts commit 36c64c875f5819bf5ada2bb657c490441bc24644.

Change-Id: I37362e996ff1c73bcc88d1037defd07d7bab90af

diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 6100721..21f954a 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -240,11 +240,7 @@ OUString SAL_CALL SwFilterDetect::detect( Sequence 
PropertyValue  lDescriptor
 }
 catch (const WrappedTargetException aWrap)
 {
-/* Cater for non-compliant sxw files created once upon 
a time by old libwpd/wpd2sxw combo
-   Don't bail-out early if the document is considered 
as corrupted. This allows us not to
-   reach the -- apparently -- catch-all 
SmFilterDetect::detect.
- */
-if (!bDeepDetection  aTypeName != 
writer_StarOffice_XML_Writer)
+if (!bDeepDetection)
 // Bail out early unless it's a deep detection.
 return OUString();
 
___
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/unx

[Caolán McNamara]

 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e59c8de22549b623a06216f4f5e8568aa8fd3312
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 14:25:22 2013 +0100

Resolves: rhbz#998136 different index to gWidgetData vs NWEnsureGTKNotebook

Change-Id: Ib3ebbfda09cd05477b65c1d81ac77e977b2a11e5
(cherry picked from commit 0aa3a73c9463f4d1e8918383b21131352635fe75)
Reviewed-on: https://gerrit.libreoffice.org/5545
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index d8c645a..53fce0a 100755
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1607,8 +1607,8 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, 
Rectangle aAreaRect )
 w = aAreaRect.GetWidth();
 h = aAreaRect.GetHeight();
 
-gint xthickness = gWidgetData[0].gNotebookWidget-style-xthickness;
-gint ythickness = gWidgetData[0].gNotebookWidget-style-ythickness;
+gint xthickness = gWidgetData[nScreen].gNotebookWidget-style-xthickness;
+gint ythickness = gWidgetData[nScreen].gNotebookWidget-style-ythickness;
 
 x -= xthickness;
 y -= ythickness;
___
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' - xmloff/source

[Caolán McNamara]

 xmloff/source/text/txtexppr.cxx |   59 +++-
 1 file changed, 41 insertions(+), 18 deletions(-)

New commits:
commit ba85d483d392f2fa37a92e5fda56c0c121c6d8bc
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 11:37:04 2013 +0100

Resolves: fdo#67665 font names filtered out on odp/odg export

Change-Id: Ia529992d15152db981379a1e0a4dec63b2dad40c
(cherry picked from commit 26dc5f2ee67342bd474640e1cc39b96d3220721b)
Reviewed-on: https://gerrit.libreoffice.org/5533
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index eb89488..a13c587 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -217,25 +217,48 @@ void XMLTextExportPropertySetMapper::ContextFontFilter(
 if( pFontCharsetState  (pFontCharsetState-maValue = nTmp ) )
 eEnc = (rtl_TextEncoding)nTmp;
 
-OUString sName( ((SvXMLExport)GetExport()).GetFontAutoStylePool()-Find(
-sFamilyName, sStyleName, nFamily, nPitch, eEnc ) );
-if( !sName.isEmpty() )
+//Resolves: fdo#67665 The purpose here appears to be to replace
+//FontFamilyName and FontStyleName etc with a single FontName property. The
+//problem is that repeated calls to here will first set
+//pFontFamilyNameState-mnIndex to -1 to indicate it is disabled, so the
+//next time pFontFamilyNameState is not passed here at all, which gives an
+//empty sFamilyName resulting in disabling pFontNameState-mnIndex to -1.
+//That doesn't seem right to me.
+//
+//So assuming that the main purpose is just to convert the properties in
+//the main when we can, and to leave them alone when we can't. And with a
+//secondary purpose to filter out empty font properties, then is would
+//appear to make sense to base attempting the conversion if we have
+//both of the major facts of the font description
+//
+//An alternative solution is to *not* fill the FontAutoStylePool with
+//every font in the document, but to partition the fonts into the
+//hard-attribute fonts which go into that pool and the style-attribute
+//fonts which go into some additional pool which get merged just for
+//the purposes of writing the embedded fonts but are not queried by
+//Find which restores the original logic.
+if (pFontFamilyNameState || pFontStyleNameState)
 {
-pFontNameState-maValue = sName;
-if( pFontFamilyNameState )
-pFontFamilyNameState-mnIndex = -1;
-if( pFontStyleNameState )
-pFontStyleNameState-mnIndex = -1;
-if( pFontFamilyState )
-pFontFamilyState-mnIndex = -1;
-if( pFontPitchState )
-pFontPitchState-mnIndex = -1;
-if( pFontCharsetState )
-pFontCharsetState-mnIndex = -1;
-}
-else
-{
-pFontNameState-mnIndex = -1;
+OUString sName( 
((SvXMLExport)GetExport()).GetFontAutoStylePool()-Find(
+sFamilyName, sStyleName, nFamily, nPitch, eEnc ) );
+if( !sName.isEmpty() )
+{
+pFontNameState-maValue = sName;
+if( pFontFamilyNameState )
+pFontFamilyNameState-mnIndex = -1;
+if( pFontStyleNameState )
+pFontStyleNameState-mnIndex = -1;
+if( pFontFamilyState )
+pFontFamilyState-mnIndex = -1;
+if( pFontPitchState )
+pFontPitchState-mnIndex = -1;
+if( pFontCharsetState )
+pFontCharsetState-mnIndex = -1;
+}
+else
+{
+pFontNameState-mnIndex = -1;
+}
 }
 
 if( pFontFamilyNameState  sFamilyName.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

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

Bug 6 depends on bug 47838, which changed state.

Bug 47838 Summary: FORMATTING: Writer causes extra page-crossing (text flow to 
next page) in some MS Office documents - related with header/footer and page 
formatting.
https://bugs.freedesktop.org/show_bug.cgi?id=47838

   What|Removed |Added

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

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

[Libreoffice-commits] core.git: desktop/scripts

[Björgvin Ragnarsson]

 desktop/scripts/unopkg.sh |4 
 1 file changed, 4 insertions(+)

New commits:
commit d2ed00f711d71cd2efe87e19dadfb0b413a7b5fe
Author: Björgvin Ragnarsson nifgr...@gmail.com
Date:   Tue Aug 20 00:33:37 2013 +

unopkg: use default umask when installing shared extensions

This makes sure shared extensions are readable by users when root's umask 
has been
set to a value such as 0027.

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

diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index d0bb430..295f874 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -61,9 +61,13 @@ do
-env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS $arg;;
-v) VERBOSE=true;;
--verbose) VERBOSE=true;;
+   --shared) SHARED=true;;
   esac
 done
 
+#make sure shared extensions will be readable by all users
+[ $SHARED = true ]  umask 0022
+
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x $sd_prog/../ure-link/bin/javaldx ] ; then
 my_path=`$sd_prog/../ure-link/bin/javaldx $BOOTSTRAPVARS \
___
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' - desktop/scripts

[Björgvin Ragnarsson]

 desktop/scripts/unopkg.sh |4 
 1 file changed, 4 insertions(+)

New commits:
commit 7da77a339c82d7a43b9054a7faf0f6e7bf7bd427
Author: Björgvin Ragnarsson nifgr...@gmail.com
Date:   Tue Aug 20 00:46:13 2013 +

unopkg: use default umask when installing shared extensions

This makes sure shared extensions are readable by users when root's umask 
has been
set to a value such as 0027.

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

diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index d0bb430..779a137 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -61,9 +61,13 @@ do
-env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS $arg;;
-v) VERBOSE=true;;
--verbose) VERBOSE=true;;
+   --shared) SHARED=true;;
   esac
 done
 
+#make sure shared extensions will be readable by users
+[ $SHARED = true ]  umask 0022
+
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x $sd_prog/../ure-link/bin/javaldx ] ; then
 my_path=`$sd_prog/../ure-link/bin/javaldx $BOOTSTRAPVARS \
___
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' - desktop/scripts

[Björgvin Ragnarsson]

 desktop/scripts/unopkg.sh |4 
 1 file changed, 4 insertions(+)

New commits:
commit 4e7a358909b31005054320fa2e57aa421c16bdc3
Author: Björgvin Ragnarsson nifgr...@gmail.com
Date:   Tue Aug 20 00:42:06 2013 +

unopkg: use default umask when installing shared extensions

This makes sure shared extensions are readable by users when root's umask 
has been
set to a value such as 0027.

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

diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index d0bb430..779a137 100644
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -61,9 +61,13 @@ do
-env:*) BOOTSTRAPVARS=$BOOTSTRAPVARS $arg;;
-v) VERBOSE=true;;
--verbose) VERBOSE=true;;
+   --shared) SHARED=true;;
   esac
 done
 
+#make sure shared extensions will be readable by users
+[ $SHARED = true ]  umask 0022
+
 # extend the ld_library_path for java: javaldx checks the sofficerc for us
 if [ -x $sd_prog/../ure-link/bin/javaldx ] ; then
 my_path=`$sd_prog/../ure-link/bin/javaldx $BOOTSTRAPVARS \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Bjoern Michaelsen]

 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx |2 +-
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0a74847e5d533ea2e5773387a171b96e5885c51e
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Tue Aug 20 17:14:50 2013 +0200

also adjust for poppler 0.24

Change-Id: I177cc28ec357ec5f88bb1efae1928eb120dcd9f2

diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
index 9d9b841..a840f03 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
@@ -492,7 +492,7 @@ PDFOutDev::~PDFOutDev()
 }
 
 void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
-#if POPPLER_CHECK_VERSION(0, 23, 0)
+#if POPPLER_CHECK_VERSION(0, 23, 0) ||  POPPLER_CHECK_VERSION(0, 24, 0)
   , XRef* /*xref*/
 #endif
 )
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 
b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
index 4fff4b9..6088387 100644
--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
@@ -171,7 +171,7 @@ namespace pdfi
 
 // Start a page.
 virtual void startPage(int pageNum, GfxState *state
-#if POPPLER_CHECK_VERSION(0, 23, 0)
+#if POPPLER_CHECK_VERSION(0, 23, 0) || POPPLER_CHECK_VERSION(0, 24, 0)
, XRef *xref
 #endif
 ) SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 scripting/source/pyprov/pythonscript.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5be1f5234b46a89a7660a9cfe3deaa00e2aa124b
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 20 17:16:16 2013 +0200

deb#719941: unbreak python script provider debug logging on Python 3

Don't mess with encoding in Logger.log, since sys.stdout.write()
accepts str (in python3) and both str/unicode (in python2) anyway.

Change-Id: Ib0339b7fd882a7654cc24c38efdaf67f519663ff

diff --git a/scripting/source/pyprov/pythonscript.py 
b/scripting/source/pyprov/pythonscript.py
index a405ca4..c9cafc9 100755
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -109,7 +109,7 @@ class Logger(LogLevel):
  [ +
 logLevel2String( level ) +
 ]  +
-encfile(msg) +
+msg +
 \n )
 self.target.flush()
 except:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Mark Base window titles for localisation

[Stephan Bergmann]

On 08/05/2013 12:07 PM, Gabor Kelemen wrote:

commit 8f44fb5ee0bd21d192820ffd359504f6d1c68a52
Author: Gabor Kelemen kelem...@ubuntu.com
Date:   Mon Aug 5 11:12:17 2013 +0200

 Mark Base window titles for localisation

 Change-Id: If876592729c695e5a0916df24873f17f2b1b0254
 Reviewed-on: https://gerrit.libreoffice.org/5283
 Reviewed-by: Miklos Vajna vmik...@suse.cz
 Tested-by: Miklos Vajna vmik...@suse.cz


But none of the properties below are marked as oor:loalized=true in 
officecfg/registry/schema/org/openoffice/Setup.xcs, so those 
xml:lang=en-US additions will effectively be just ignored.  (And 
changing Setup.xcs accordingly could be considered an incompatible 
change, so we need to be careful there, but it might well be the correct 
thing to do here, depending on what this commit actually wanted to achieve.)


Stephan


diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu 
b/officecfg/registry/data/org/openoffice/Setup.xcu
index 1d7961b..50bdb21 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -335,7 +335,7 @@
valueswform/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: Database Form/value
+  value xml:lang=en-USBase: Database Form/value
  /prop
  prop oor:name=ooSetupFactoryWindowStateConfigRef
valueWriterFormWindowState/value
@@ -370,7 +370,7 @@
valueswreport/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: Report Design/value
+  value xml:lang=en-USBase: Report Design/value
  /prop
  prop oor:name=ooSetupFactoryWindowStateConfigRef
valueWriterReportWindowState/value
@@ -481,7 +481,7 @@
valueGenericCategories/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: Relation Design/value
+  value xml:lang=en-USBase: Relation Design/value
  /prop
/node
node oor:name=com.sun.star.sdb.QueryDesign oor:op=replace 
install:module=base
@@ -506,7 +506,7 @@
valueGenericCategories/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: Query Design/value
+  value xml:lang=en-USBase: Query Design/value
  /prop
/node
node oor:name=com.sun.star.sdb.ViewDesign oor:op=replace 
install:module=base
@@ -531,7 +531,7 @@
valueGenericCategories/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: View Design/value
+  value xml:lang=en-USBase: View Design/value
  /prop
/node
node oor:name=com.sun.star.sdb.TableDesign oor:op=replace 
install:module=base
@@ -556,7 +556,7 @@
valueGenericCategories/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: Table Design/value
+  value xml:lang=en-USBase: Table Design/value
  /prop
/node
node oor:name=com.sun.star.sdb.DataSourceBrowser oor:op=replace 
install:module=base
@@ -581,7 +581,7 @@
valueGenericCategories/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: Data View/value
+  value xml:lang=en-USBase: Data View/value
  /prop
/node
node oor:name=com.sun.star.sdb.TableDataView oor:op=replace 
install:module=base
@@ -606,7 +606,7 @@
valueGenericCategories/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: Table Data View/value
+  value xml:lang=en-USBase: Table Data View/value
  /prop
/node
node oor:name=com.sun.star.frame.Bibliography oor:op=replace
@@ -773,7 +773,7 @@
valueGenericCategories/value
  /prop
  prop oor:name=ooSetupFactoryUIName
-  valueBase: Oracle Report Builder/value
+  value xml:lang=en-USBase: Oracle Report Builder/value
  /prop
/node
  /node


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

[Libreoffice-commits] core.git: comphelper/source filter/source framework/inc framework/source include/sal ucb/source

[Stephan Bergmann]

 comphelper/source/misc/mediadescriptor.cxx|   38 --
 filter/source/config/cache/typedetection.cxx  |   14 +++
 framework/inc/services.h  |1 
 framework/source/dispatch/loaddispatcher.cxx  |   16 +++-
 framework/source/inc/loadenv/loadenvexception.hxx |   78 +-
 framework/source/loadenv/loadenv.cxx  |   50 +++---
 framework/source/services/autorecovery.cxx|2 
 include/sal/log-areas.dox |4 -
 ucb/source/ucp/gvfs/gvfs_content.cxx  |7 +
 9 files changed, 101 insertions(+), 109 deletions(-)

New commits:
commit 2d2337eb74161f9aab9bc3cf50fa63975d9c1731
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 20 17:58:20 2013 +0200

Improve some debug output

Change-Id: I1008822ba8592ea43f87805bf00adbfdaf4f02fc

diff --git a/comphelper/source/misc/mediadescriptor.cxx 
b/comphelper/source/misc/mediadescriptor.cxx
index 82a1b29..8fefd7d 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.cxx
@@ -574,10 +574,22 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const 
OUString sURL, sal_Bool
 }
 catch(const css::uno::RuntimeException)
 { throw; }
-catch(const css::ucb::ContentCreationException)
-{ return sal_False; } // TODO error handling
-catch(const css::uno::Exception)
-{ return sal_False; } // TODO error handling
+catch(const css::ucb::ContentCreationException e)
+{
+SAL_WARN(
+comphelper,
+caught ContentCreationException \  e.Message
+ \ while opening   sURL  );
+return sal_False; // TODO error handling
+}
+catch(const css::uno::Exception e)
+{
+SAL_WARN(
+comphelper,
+caught Exception \  e.Message  \ while opening 
+ sURL  );
+return sal_False; // TODO error handling
+}
 
 // try to open the file in read/write mode
 // (if its allowed to do so).
@@ -606,7 +618,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const 
OUString sURL, sal_Bool
 }
 catch(const css::uno::RuntimeException)
 { throw; }
-catch(const css::uno::Exception)
+catch(const css::uno::Exception e)
 {
 // ignore exception, if reason was problem reasoned on
 // open it in WRITEABLE mode! Then we try it READONLY
@@ -614,7 +626,13 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const 
OUString sURL, sal_Bool
 // All other errors must be handled as real error an
 // break this method.
 if (!pInteraction-wasWriteError() || bModeRequestedExplicitly)
+{
+SAL_WARN(
+comphelper,
+caught Exception \  e.Message
+ \ while opening   sURL  );
 return sal_False;
+}
 xStream.clear();
 xInputStream.clear();
 }
@@ -667,8 +685,14 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const 
OUString sURL, sal_Bool
 }
 catch(const css::uno::RuntimeException)
 { throw; }
-catch(const css::uno::Exception)
-{ return sal_False; }
+catch(const css::uno::Exception e)
+{
+SAL_WARN(
+comphelper,
+caught Exception \  e.Message  \ while opening 
+ sURL  );
+return sal_False;
+}
 }
 
 // add streams to the descriptor
diff --git a/filter/source/config/cache/typedetection.cxx 
b/filter/source/config/cache/typedetection.cxx
index 5e3697c..fd0e64c 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -445,8 +445,14 @@ OUString SAL_CALL 
TypeDetection::queryTypeByDescriptor(css::uno::Sequence css::
 }
 catch(const css::uno::RuntimeException)
 { throw; }
-catch(const css::uno::Exception)
-{ sType = OUString(); }
+catch(const css::uno::Exception e)
+{
+SAL_WARN(
+filter.config,
+caught Exception \  e.Message
+ \ while querying type of   sURL  );
+sType = OUString();
+}
 
 //***
 // adapt media descriptor, so it contains the right values
@@ -1138,7 +1144,9 @@ void 
TypeDetection::impl_openStream(::comphelper::MediaDescriptor rDescriptor)
 bSuccess = rDescriptor.addInputStream();
 
 if ( !bSuccess )
-throw css::uno::Exception(_FILTER_CONFIG_FROM_ASCII_(Could not open 
stream.), static_cast css::document::XTypeDetection* (this));
+throw css::uno::Exception(
+

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

[Gergo Mocsi]

 basctl/source/basicide/baside2b.cxx |   65 ++--
 1 file changed, 40 insertions(+), 25 deletions(-)

New commits:
commit 4b6806ae41c4e04449de7e112c8fdce5e6fe01a1
Author: Gergo Mocsi gmocs...@gmail.com
Date:   Tue Aug 20 17:55:59 2013 +0200

GSOC work, fix strange TextPaM errors

Wrong TextPaM's caused the autocorrection to insert the string multiple 
times, this is now fixed. I use the values from the HighlightPortion struct.

Change-Id: I5ff5f01c06738088639186c35eb58ee9ff497d95

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 8c09ada..61fc774 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -581,10 +581,9 @@ void EditorWindow::KeyInput( const KeyEvent rKEvt )
 
 void EditorWindow::HandleAutoCorrect()
 {
-rModulWindow.UpdateModule();
-rModulWindow.GetSbModule()-GetCodeCompleteDataFromParse( 
aCodeCompleteCache );
 TextSelection aSel = GetEditView()-GetSelection();
 sal_uLong nLine =  aSel.GetStart().GetPara();
+sal_uLong nIndex =  aSel.GetStart().GetIndex();
 OUString aLine( pEditEngine-GetText( nLine ) ); // the line being modified
 const OUString sActSubName = GetActualSubName( nLine ); // the actual 
procedure
 
@@ -595,48 +594,63 @@ void EditorWindow::HandleAutoCorrect()
 return;
 
 HighlightPortion r = aPortions[aPortions.size()-1];
-OUString sStr = aLine.copy(r.nBegin, r.nEnd - r.nBegin);
-if( r.tokenType == TT_KEYWORDS  !sStr.isEmpty() ) // correct the last 
entered keyword
+if( nIndex != aPortions.size()-1 )
+{//cursor is not standing at the end of the line
+for( size_t i = 0; i  aPortions.size(); i++ )
+{
+if( aPortions[i].nEnd == nIndex )
+{
+r = aPortions[i];
+break;
+}
+}
+}
+
+OUString sStr = aLine.copy( r.nBegin, r.nEnd - r.nBegin );
+//if WS or empty string: stop, nothing to do
+if( ( r.tokenType == TT_WHITESPACE ) || sStr.isEmpty() )
+return;
+//create the appropriate TextSelection, and update the cache
+TextPaM aStart( nLine, r.nBegin );
+TextPaM aEnd( nLine, r.nBegin + sStr.getLength() );
+TextSelection sTextSelection(aStart, aEnd );
+rModulWindow.UpdateModule();
+rModulWindow.GetSbModule()-GetCodeCompleteDataFromParse( 
aCodeCompleteCache );
+// correct the last entered keyword
+if( r.tokenType == TT_KEYWORDS )
 {
 sStr = sStr.toAsciiLowerCase();
 if( !rModulWindow.GetSbModule()-GetKeywordCase(sStr).isEmpty() )
 // if it is a keyword, get its correct case
 sStr = rModulWindow.GetSbModule()-GetKeywordCase(sStr);
 else
-{// else capitalize first letter/select the correct one, and replace
+// else capitalize first letter/select the correct one, and replace
 sStr = sStr.replaceAt( 0, 1, OUString(sStr[0]).toAsciiUpperCase() 
);
-}
 
-TextPaM aStart(nLine, aSel.GetStart().GetIndex() - sStr.getLength() );
-TextSelection sTextSelection(aStart, TextPaM(nLine, 
aSel.GetStart().GetIndex()));
 pEditEngine-ReplaceText( sTextSelection, sStr );
 pEditView-SetSelection( aSel );
-return;
 }
 if( r.tokenType == TT_IDENTIFIER )
 {// correct variables
 if( !aCodeCompleteCache.GetCorrectCaseVarName( sStr, sActSubName 
).isEmpty() )
 {
 sStr = aCodeCompleteCache.GetCorrectCaseVarName( sStr, sActSubName 
);
-TextPaM aStart(nLine, aSel.GetStart().GetIndex() - 
sStr.getLength() );
-TextSelection sTextSelection(aStart, TextPaM(nLine, 
aSel.GetStart().GetIndex()));
 pEditEngine-ReplaceText( sTextSelection, sStr );
 pEditView-SetSelection( aSel );
-return;
 }
-
-//autocorrect procedures
-SbxArray* pArr = rModulWindow.GetSbModule()-GetMethods();
-for( sal_uInt32 i=0; i pArr-Count32(); ++i )
+else
 {
-if( pArr-Get32(i)-GetName().equalsIgnoreAsciiCase( sStr ) )
+//autocorrect procedures
+SbxArray* pArr = rModulWindow.GetSbModule()-GetMethods();
+for( sal_uInt32 i=0; i  pArr-Count32(); ++i )
 {
-sStr = pArr-Get32(i)-GetName(); //get the correct case
-TextPaM aStart(nLine, aSel.GetStart().GetIndex() - 
sStr.getLength() );
-TextSelection sTextSelection(aStart, TextPaM(nLine, 
aSel.GetStart().GetIndex()));
-pEditEngine-ReplaceText( sTextSelection, sStr );
-pEditView-SetSelection( aSel );
-return;
+if( pArr-Get32(i)-GetName().equalsIgnoreAsciiCase( sStr ) )
+{
+sStr = pArr-Get32(i)-GetName(); //if found, get the 
correct case
+pEditEngine-ReplaceText( sTextSelection, sStr );
+

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

[Caolán McNamara]

 xmloff/source/text/txtexppr.cxx |   59 +++-
 1 file changed, 41 insertions(+), 18 deletions(-)

New commits:
commit ea3863d2597d70719b2e590260c05fd8aecc7836
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 11:37:04 2013 +0100

Resolves: fdo#67665 font names filtered out on odp/odg export

Change-Id: Ia529992d15152db981379a1e0a4dec63b2dad40c
(cherry picked from commit 26dc5f2ee67342bd474640e1cc39b96d3220721b)
Reviewed-on: https://gerrit.libreoffice.org/5540
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Michael Stahl mst...@redhat.com

diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index eb89488..a13c587 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -217,25 +217,48 @@ void XMLTextExportPropertySetMapper::ContextFontFilter(
 if( pFontCharsetState  (pFontCharsetState-maValue = nTmp ) )
 eEnc = (rtl_TextEncoding)nTmp;
 
-OUString sName( ((SvXMLExport)GetExport()).GetFontAutoStylePool()-Find(
-sFamilyName, sStyleName, nFamily, nPitch, eEnc ) );
-if( !sName.isEmpty() )
+//Resolves: fdo#67665 The purpose here appears to be to replace
+//FontFamilyName and FontStyleName etc with a single FontName property. The
+//problem is that repeated calls to here will first set
+//pFontFamilyNameState-mnIndex to -1 to indicate it is disabled, so the
+//next time pFontFamilyNameState is not passed here at all, which gives an
+//empty sFamilyName resulting in disabling pFontNameState-mnIndex to -1.
+//That doesn't seem right to me.
+//
+//So assuming that the main purpose is just to convert the properties in
+//the main when we can, and to leave them alone when we can't. And with a
+//secondary purpose to filter out empty font properties, then is would
+//appear to make sense to base attempting the conversion if we have
+//both of the major facts of the font description
+//
+//An alternative solution is to *not* fill the FontAutoStylePool with
+//every font in the document, but to partition the fonts into the
+//hard-attribute fonts which go into that pool and the style-attribute
+//fonts which go into some additional pool which get merged just for
+//the purposes of writing the embedded fonts but are not queried by
+//Find which restores the original logic.
+if (pFontFamilyNameState || pFontStyleNameState)
 {
-pFontNameState-maValue = sName;
-if( pFontFamilyNameState )
-pFontFamilyNameState-mnIndex = -1;
-if( pFontStyleNameState )
-pFontStyleNameState-mnIndex = -1;
-if( pFontFamilyState )
-pFontFamilyState-mnIndex = -1;
-if( pFontPitchState )
-pFontPitchState-mnIndex = -1;
-if( pFontCharsetState )
-pFontCharsetState-mnIndex = -1;
-}
-else
-{
-pFontNameState-mnIndex = -1;
+OUString sName( 
((SvXMLExport)GetExport()).GetFontAutoStylePool()-Find(
+sFamilyName, sStyleName, nFamily, nPitch, eEnc ) );
+if( !sName.isEmpty() )
+{
+pFontNameState-maValue = sName;
+if( pFontFamilyNameState )
+pFontFamilyNameState-mnIndex = -1;
+if( pFontStyleNameState )
+pFontStyleNameState-mnIndex = -1;
+if( pFontFamilyState )
+pFontFamilyState-mnIndex = -1;
+if( pFontPitchState )
+pFontPitchState-mnIndex = -1;
+if( pFontCharsetState )
+pFontCharsetState-mnIndex = -1;
+}
+else
+{
+pFontNameState-mnIndex = -1;
+}
 }
 
 if( pFontFamilyNameState  sFamilyName.isEmpty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 dbaccess/source/core/dataaccess/documentdefinition.cxx |1 +
 dbaccess/source/ui/misc/databaseobjectview.cxx |6 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit c3164e42dcdf879ed53e235db13f498eb730bae9
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Aug 20 20:08:47 2013 +0100

Resolves: rhbz#998046 store last size/position of the table/query/form

Change-Id: I3623d5e133b8d7b2e7920824b05c46ade7b10d7c

diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 1e9b62c..55b7c4e 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1548,6 +1548,7 @@ Sequence PropertyValue  
ODocumentDefinition::fillLoadArgs( const Reference XC
 // create the OutplaceFrameProperties, and put them into the descriptor of 
the embedded object
 ::comphelper::NamedValueCollection OutplaceFrameProperties;
 OutplaceFrameProperties.put( TopWindow, (sal_Bool)sal_True );
+OutplaceFrameProperties.put( SupportPersistentWindowState, 
(sal_Bool)sal_True );
 
 Reference XFrame  xParentFrame;
 if ( m_pImpl-m_pDataSource )
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx 
b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 7c90c33..d0ac14e 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -120,7 +120,7 @@ namespace dbaui
 if ( !m_xFrameLoader.is() )
 {
 Reference XSingleServiceFactory  xFact = 
TaskCreator::create(m_xORB);
-Sequence Any  lArgs(2);
+Sequence Any  lArgs(3);
 NamedValue  aProp;
 sal_Int32   nArg = 0;
 
@@ -132,6 +132,10 @@ namespace dbaui
 aProp.Value = sal_True;
 lArgs[nArg++] = aProp;
 
+aProp.Name= OUString(SupportPersistentWindowState);
+aProp.Value = sal_True;
+lArgs[nArg++] = aProp;
+
 
m_xFrameLoader.set(xFact-createInstanceWithArguments(lArgs), UNO_QUERY_THROW);
 
 // everything we load can be considered a top level 
document, so set the respective bit at the window.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] Re-work 8bit characters in source code, or remove them.

[Michael Meeks (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/5550

Approvals:
  LibreOffice gerrit bot: Verified
  Michael Meeks: Verified; Looks good to me, approved


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

Gerrit-MessageType: merged
Gerrit-Change-Id: I93e14d4936c0ffbe03425d4a54bb0e09bc62b3e3
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Michael Meeks michael.me...@suse.com
Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org
Gerrit-Reviewer: Michael Meeks michael.me...@suse.com

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

[Libreoffice-commits] core.git: offapi/com

[Julien Nabet]

 offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f193e73136e5808b998339054e2278b1b2d16637
Author: Julien Nabet serval2...@yahoo.fr
Date:   Tue Aug 20 22:28:17 2013 +0200

Fix idl: no ResultSet attribute so remove #

Change-Id: I8b0025a1dcba5819edbb35395324efaee936eec5

diff --git a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl 
b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
index 7a1be1c..99a28d0 100644
--- a/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
+++ b/offapi/com/sun/star/chart2/data/XDatabaseDataProvider.idl
@@ -138,7 +138,7 @@ interface XDatabaseDataProvider
 are specified, a RowSet can be created with this information. If the 
results provided by the
 row set are to be additionally filtered, the Filter property can be 
used./p
 
-pNote that the Filter property does not make sense if a #ResultSet 
has been specified
+pNote that the Filter property does not make sense if a resultSet 
has been specified
 in the DataAccessDescriptor./p
 
 @see com::sun::star::sdb::RowSet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/rtl

[Stephan Bergmann]

 sal/rtl/strtmpl.cxx |   32 +---
 sal/rtl/ustring.cxx |   16 ++--
 2 files changed, 35 insertions(+), 13 deletions(-)

New commits:
commit b71c35216c5fb775aa578a0ada0406f6baad8487
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 20 22:25:33 2013 +0200

rtl::compareAsciiIgnoreCase cannot be used here

...as its assert requires that both input characters are ASCII, which need 
not
be the case in these compareIgnoreAsciiCase functions.  (Even if they take 
one
literal argument that must be strictly ASCII, the other argument can be an
arbitrary Unicode string in the case of OUString or an arbitrary 8-bit 
string in
the case of OString).

The logically correct version of rtl::compareAsciiIgnoreCase would arguably 
be
one that requires its two arguments to be valid UTF-32 code units, but that
could not be used in these places either, as for OUString they operate on
individual UTF-16 code units.

rtl::compareAsciiIgnoreCase likely makes less sense after all than assumed 
in
c8e39e66528affb66f1ae121fa36dd4ab31a9b0b Introduce rtl::compareIgnoreCase 
and
deprecate rtl/character.hxx equivalents, which this commit partly reverts.

Change-Id: Ib2eed3a1896e83d9c66b0479a03f9ec51e1c4dc0

diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index 8d759b4..dc54945 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -27,8 +27,6 @@
 #include limits
 #include boost/static_assert.hpp
 
-#include rtl/character.hxx
-
 /*
 inline void rtl_str_ImplCopy( IMPL_RTL_STRCODE* pDest,
   const IMPL_RTL_STRCODE* pSrc,
@@ -172,19 +170,25 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( 
compareIgnoreAsciiCase )( const IMPL_RTL_ST
 SAL_THROW_EXTERN_C()
 {
 sal_Int32   nRet;
+sal_Int32   c1;
+sal_Int32   c2;
 do
 {
-nRet = rtl::compareAsciiIgnoreCase(
-(sal_Int32)IMPL_RTL_USTRCODE( *pStr1 ),
-(sal_Int32)IMPL_RTL_USTRCODE( *pStr2 ));
-
+/* If character between 'A' and 'Z', than convert it to lowercase */
+c1 = (sal_Int32)IMPL_RTL_USTRCODE( *pStr1 );
+c2 = (sal_Int32)IMPL_RTL_USTRCODE( *pStr2 );
+if ( (c1 = 65)  (c1 = 90) )
+c1 += 32;
+if ( (c2 = 65)  (c2 = 90) )
+c2 += 32;
+nRet = c1-c2;
 if ( nRet != 0 )
 return nRet;
 
 pStr1++;
 pStr2++;
 }
-while ( *pStr2 );
+while ( c2 );
 
 return 0;
 }
@@ -200,12 +204,18 @@ sal_Int32 SAL_CALL IMPL_RTL_STRNAME( 
compareIgnoreAsciiCase_WithLength )( const
 const IMPL_RTL_STRCODE* pStr1End = pStr1 + nStr1Len;
 const IMPL_RTL_STRCODE* pStr2End = pStr2 + nStr2Len;
 sal_Int32   nRet;
+sal_Int32   c1;
+sal_Int32   c2;
 while ( (pStr1  pStr1End)  (pStr2  pStr2End) )
 {
-nRet = rtl::compareAsciiIgnoreCase(
-(sal_Int32)IMPL_RTL_USTRCODE( *pStr1 ),
-(sal_Int32)IMPL_RTL_USTRCODE( *pStr2 ));
-
+/* If character between 'A' and 'Z', than convert it to lowercase */
+c1 = (sal_Int32)IMPL_RTL_USTRCODE( *pStr1 );
+c2 = (sal_Int32)IMPL_RTL_USTRCODE( *pStr2 );
+if ( (c1 = 65)  (c1 = 90) )
+c1 += 32;
+if ( (c2 = 65)  (c2 = 90) )
+c2 += 32;
+nRet = c1-c2;
 if ( nRet != 0 )
 return nRet;
 
diff --git a/sal/rtl/ustring.cxx b/sal/rtl/ustring.cxx
index 3f54088..abf9db7 100644
--- a/sal/rtl/ustring.cxx
+++ b/sal/rtl/ustring.cxx
@@ -41,7 +41,6 @@
 #include strimp.hxx
 #include surrogates.hxx
 #include rtl/ustring.h
-#include rtl/character.hxx
 
 #include rtl/math.h
 #include rtl/tencinfo.h
@@ -405,10 +404,23 @@ sal_Int32 SAL_CALL 
rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength( co
 {
 const sal_Unicode*  pStr1End = pStr1 + nStr1Len;
 sal_Int32   nRet;
+sal_Int32   c1;
+sal_Int32   c2;
 while ( (nShortenedLength  0) 
 (pStr1  pStr1End)  *pStr2 )
 {
-nRet = rtl::compareAsciiIgnoreCase( *pStr1, (sal_Int32)((unsigned 
char)*pStr2));
+/* Check ASCII range */
+SAL_WARN_IF( ((unsigned char)*pStr2)  127, rtl.string,
+rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength 
- Found char  127 );
+
+/* If character between 'A' and 'Z', than convert it to lowercase */
+c1 = (sal_Int32)*pStr1;
+c2 = (sal_Int32)((unsigned char)*pStr2);
+if ( (c1 = 65)  (c1 = 90) )
+c1 += 32;
+if ( (c2 = 65)  (c2 = 90) )
+c2 += 32;
+nRet = c1-c2;
 if ( nRet != 0 )
 return nRet;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - connectivity/Library_firebird_sdbc.mk connectivity/source include/connectivity

[Andrzej J . R . Hunt]

 connectivity/Library_firebird_sdbc.mk|2 
 connectivity/source/commontools/dbtools2.cxx |   40 ++
 connectivity/source/drivers/firebird/Catalog.cxx |   28 ++-
 connectivity/source/drivers/firebird/Table.cxx   |   63 +---
 connectivity/source/drivers/firebird/User.cxx|   38 +
 connectivity/source/drivers/firebird/User.hxx|   49 
 connectivity/source/drivers/firebird/Users.cxx   |   90 +++
 connectivity/source/drivers/firebird/Users.hxx   |   65 
 include/connectivity/dbtools.hxx |3 
 9 files changed, 349 insertions(+), 29 deletions(-)

New commits:
commit e6c4e419d6bc3572b183ca8ed3f2b75417899fff
Author: Andrzej J.R. Hunt andr...@ahunt.org
Date:   Tue Aug 20 14:34:54 2013 +0100

Implement changing nullable. (firebird-sdbc)

Change-Id: I0aa745becbd8b3dae11917248205f46eb61c17de

diff --git a/connectivity/source/drivers/firebird/Table.cxx 
b/connectivity/source/drivers/firebird/Table.cxx
index 3f99917..2b30057 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -15,6 +15,8 @@
 #include connectivity/TIndexes.hxx
 #include connectivity/TKeys.hxx
 
+#include com/sun/star/sdbc/ColumnValue.hpp
+
 using namespace ::connectivity;
 using namespace ::connectivity::firebird;
 using namespace ::connectivity::sdbcx;
@@ -93,19 +95,20 @@ void SAL_CALL Table::alterColumnByName(const OUString 
rColName,
 uno::Reference XPropertySet  xColumn(m_pColumns-getByName(rColName), 
UNO_QUERY);
 
 // sdbcx::Descriptor
-bool bNameChanged = xColumn-getPropertyValue(Name) != 
rDescriptor-getPropertyValue(Name);
+const bool bNameChanged = xColumn-getPropertyValue(Name) != 
rDescriptor-getPropertyValue(Name);
 // sdbcx::ColumnDescriptor
-bool bTypeChanged = xColumn-getPropertyValue(Type) != 
rDescriptor-getPropertyValue(Type);
-bool bTypeNameChanged = xColumn-getPropertyValue(TypeName) != 
rDescriptor-getPropertyValue(TypeName);
-bool bPrecisionChanged = xColumn-getPropertyValue(Precision) != 
rDescriptor-getPropertyValue(Precision);
-bool bScaleChanged = xColumn-getPropertyValue(Scale) != 
rDescriptor-getPropertyValue(Scale);
-bool bIsNullableChanged = xColumn-getPropertyValue(IsNullable) != 
rDescriptor-getPropertyValue(IsNullable);
-bool bIsAutoIncrementChanged = 
xColumn-getPropertyValue(IsAutoIncrement) != 
rDescriptor-getPropertyValue(IsAutoIncrement);
+const bool bTypeChanged = xColumn-getPropertyValue(Type) != 
rDescriptor-getPropertyValue(Type);
+const bool bTypeNameChanged = xColumn-getPropertyValue(TypeName) != 
rDescriptor-getPropertyValue(TypeName);
+const bool bPrecisionChanged = xColumn-getPropertyValue(Precision) != 
rDescriptor-getPropertyValue(Precision);
+const bool bScaleChanged = xColumn-getPropertyValue(Scale) != 
rDescriptor-getPropertyValue(Scale);
+const bool bIsNullableChanged = xColumn-getPropertyValue(IsNullable) != 
rDescriptor-getPropertyValue(IsNullable);
+const bool bIsAutoIncrementChanged = 
xColumn-getPropertyValue(IsAutoIncrement) != 
rDescriptor-getPropertyValue(IsAutoIncrement);
 // TODO: remainder -- these are all optional so have to detect presence 
and change.
 
 bool bDefaultChanged = xColumn-getPropertyValue(DefaultValue)
  != 
rDescriptor-getPropertyValue(DefaultValue);
 
+// TODO: quote identifiers as needed.
 if (bNameChanged)
 {
 OUString sNewTableName;
@@ -125,8 +128,50 @@ void SAL_CALL Table::alterColumnByName(const OUString 
rColName,
 // possibly we have to wrap things in Util::evaluateStatusVector.
 }
 
-if (bPrecisionChanged || bScaleChanged
-|| bIsNullableChanged || bIsAutoIncrementChanged)
+if (bIsNullableChanged)
+{
+sal_Int32 nNullabble;
+rDescriptor-getPropertyValue(IsNullable) = nNullabble;
+
+if (nNullabble != ColumnValue::NULLABLE_UNKNOWN)
+{
+
+OUString sSql;
+// Dirty hack: can't change null directly in sql, we have to fiddle
+// the system tables manually.
+if (nNullabble == ColumnValue::NULLABLE)
+{
+sSql = UPDATE RDB$RELATION_FIELDS SET RDB$NULL_FLAG = NULL 
+   WHERE RDB$FIELD_NAME = ' + rColName + ' 
+   AND RDB$RELATION_NAME = ' + getName() + ';
+}
+else if (nNullabble == ColumnValue::NO_NULLS)
+{
+// And if we are making NOT NULL then we have to make sure we 
have
+// no nulls left in the column.
+OUString sFillNulls(UPDATE \ + getName() + \ SET \
++ rColName + \ = 0 
+WHERE \ + rColName + \ IS NULL);
+getConnection()-createStatement()-execute(sFillNulls);
+
+sSql = UPDATE 

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

[Stephan Bergmann]

 connectivity/source/drivers/firebird/Users.cxx |3 +--
 connectivity/source/drivers/firebird/Users.hxx |5 +
 2 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 293d31afa550a3f05760c711c91862bb8f1785c9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Aug 20 23:16:20 2013 +0200

-Werror,-Wunused-private-field

Change-Id: I6e7960dbe16e729c706d1055aea1ded357308064

diff --git a/connectivity/source/drivers/firebird/Users.cxx 
b/connectivity/source/drivers/firebird/Users.cxx
index 5f19765..b84d034 100644
--- a/connectivity/source/drivers/firebird/Users.cxx
+++ b/connectivity/source/drivers/firebird/Users.cxx
@@ -37,7 +37,6 @@ Users::Users(const uno::Reference XDatabaseMetaData  
rMetaData,
 sal_True,
 rMutex,
 rNames),
-m_rMutex(rMutex),
 m_xMetaData(rMetaData)
 {
 }
@@ -87,4 +86,4 @@ void Users::dropObject(sal_Int32 nPosition, const OUString 
sName)
 }
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/drivers/firebird/Users.hxx 
b/connectivity/source/drivers/firebird/Users.hxx
index 12f2ef3..ce35368 100644
--- a/connectivity/source/drivers/firebird/Users.hxx
+++ b/connectivity/source/drivers/firebird/Users.hxx
@@ -24,9 +24,6 @@ namespace connectivity
  */
 class Users: public ::connectivity::sdbcx::OCollection
 {
-private:
-::osl::Mutex m_rMutex;
-
 protected:
 ::com::sun::star::uno::Reference 
::com::sun::star::sdbc::XDatabaseMetaData 
 m_xMetaData;
@@ -62,4 +59,4 @@ namespace connectivity
 
 #endif // CONNECTIVITY_FIREBIRD_USERS_HXX
 
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 vcl/unx/generic/printer/ppdparser.cxx |   89 +++---
 1 file changed, 40 insertions(+), 49 deletions(-)

New commits:
commit 239696d95a0f6f1407e85f3d58901ee0b9ae3aee
Author: Michael Stahl mst...@redhat.com
Date:   Tue Aug 20 22:33:34 2013 +0200

vcl: ppdparser.cxx: clean up printf mess to build with dbglevel=11

Change-Id: Ida2b9e3c40205dafaf61ebec67da34d5043c432c

diff --git a/vcl/unx/generic/printer/ppdparser.cxx 
b/vcl/unx/generic/printer/ppdparser.cxx
index 5616bae..3cec3e7 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -264,10 +264,6 @@ namespace psp
 using namespace psp;
 
 
-#if OSL_DEBUG_LEVEL  2
-#define BSTRING(x) OUStringToOString( x, osl_getThreadTextEncoding() )
-#endif
-
 namespace
 {
 struct thePPDCache : public rtl::StaticPPDCache, thePPDCache {};
@@ -486,13 +482,12 @@ void PPDParser::initPPDFiles()
 {
 INetURLObject aDir( aExe );
 aDir.removeSegment();
-#ifdef DEBUG
-fprintf( stderr, scanning last chance dir: %s\n, 
OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), 
osl_getThreadTextEncoding() ).getStr() );
-#endif
+SAL_INFO(vcl.unx.print, scanning last chance dir: 
+ aDir.GetMainURL(INetURLObject::NO_DECODE));
 scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) );
-#ifdef DEBUG
-fprintf( stderr, SGENPRT %s\n, rPPDCache.pAllPPDFiles-find( 
OUString( SGENPRT ) ) == rPPDCache.pAllPPDFiles-end() ? not found : 
found );
-#endif
+SAL_INFO(vcl.unx.print, SGENPRT 
+ (rPPDCache.pAllPPDFiles-find(SGENPRT) ==
+rPPDCache.pAllPPDFiles-end() ? not found : 
found));
 }
 }
 }
@@ -629,9 +624,8 @@ const PPDParser* PPDParser::getParser( const OUString 
rFile )
 aFile = getPPDFile( rFile );
 if( aFile.isEmpty() )
 {
-#if OSL_DEBUG_LEVEL  1
-fprintf( stderr, Could not get printer PPD file \%s\ !\n, 
OUStringToOString( rFile, osl_getThreadTextEncoding() ).getStr() );
-#endif
+SAL_INFO(vcl.unx.print, Could not get printer PPD file \
+ rFile  \ !);
 return NULL;
 }
 
@@ -734,12 +728,13 @@ PPDParser::PPDParser( const OUString rFile ) :
 
 // now get the Values
 parse( aLines );
-#if OSL_DEBUG_LEVEL  2
-fprintf( stderr, acquired %d Keys from PPD %s:\n, m_aKeys.size(), 
BSTRING( m_aFile ).getStr() );
+#if OSL_DEBUG_LEVEL  1
+SAL_INFO(vcl.unx.print, acquired   m_aKeys.size()
+  Keys from PPD   m_aFile  :);
 for( PPDParser::hash_type::const_iterator it = m_aKeys.begin(); it != 
m_aKeys.end(); ++it )
 {
 const PPDKey* pKey = it-second;
-char* pSetupType = unknown;
+char const* pSetupType = unknown;
 switch( pKey-m_eSetupType )
 {
 case PPDKey::ExitServer:pSetupType = ExitServer;break;
@@ -750,18 +745,13 @@ PPDParser::PPDParser( const OUString rFile ) :
 case PPDKey::AnySetup:  pSetupType = AnySetup;break;
 default: break;
 };
-fprintf( stderr, \t\%s\ (%d values) OrderDependency: %d %s\n,
- BSTRING( pKey-getKey() ).getStr(),
- pKey-countValues(),
- pKey-m_nOrderDependency,
- pSetupType );
+SAL_INFO(vcl.unx.print, \t\  pKey-getKey()  \ (
+ pKey-countValues()  values) OrderDependency: 
+ pKey-m_nOrderDependency  pSetupType );
 for( int j = 0; j  pKey-countValues(); j++ )
 {
-fprintf( stderr, \t\t );
 const PPDValue* pValue = pKey-getValue( j );
-if( pValue == pKey-m_pDefaultValue )
-fprintf( stderr, (Default:)  );
-char* pVType = unknown;
+char const* pVType = unknown;
 switch( pValue-m_eType )
 {
 case eInvocation:   pVType = invocation;break;
@@ -771,21 +761,22 @@ PPDParser::PPDParser( const OUString rFile ) :
 case eNo:   pVType = no;break;
 default: break;
 };
-fprintf( stderr, option: \%s\, value: type %s \%s\\n,
- BSTRING( pValue-m_aOption ).getStr(),
- pVType,
- BSTRING( pValue-m_aValue ).getStr() );
+SAL_INFO(vcl.unx.print, \t\t
+ (pValue == pKey-m_pDefaultValue ? (Default:)  : )
+ option: \  pValue-m_aOption
+ \, value: type   pVType   \
+ pValue-m_aValue  \);
 }
 }
-fprintf( stderr, constraints: (%d found)\n, m_aConstraints.size() );
+SAL_INFO(vcl.unx.print,
+constraints: (  m_aConstraints.size()   found));
 for( std::list PPDConstraint ::const_iterator cit = 
m_aConstraints.begin(); cit != m_aConstraints.end(); ++cit )
 {
-fprintf( stderr, *\%s\ \%s\ 

[Libreoffice-commits] core.git: 2 commits - editeng/Library_editeng.mk editeng/qa editeng/source include/editeng sc/inc sc/Library_sc.mk sc/qa sc/source

[Kohei Yoshida]

 editeng/Library_editeng.mk  |1 
 editeng/qa/unit/core-test.cxx   |   93 +
 editeng/source/editeng/editobj.cxx  |  149 
 editeng/source/editeng/editobj2.hxx |8 +
 editeng/source/editeng/sectionattribute.cxx |   21 +++
 include/editeng/editobj.hxx |   13 ++
 include/editeng/sectionattribute.hxx|   37 ++
 sc/Library_sc.mk|1 
 sc/inc/column.hxx   |2 
 sc/inc/document.hxx |2 
 sc/inc/edittextiterator.hxx |   61 +++
 sc/inc/table.hxx|1 
 sc/qa/unit/ucalc.cxx|   94 +
 sc/qa/unit/ucalc.hxx|2 
 sc/source/core/data/edittextiterator.cxx|   86 
 15 files changed, 571 insertions(+)

New commits:
commit 6c4bedffb98a33b202692b225fc250b858ff9f65
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Tue Aug 20 17:23:12 2013 -0400

Add edit text iterator that iterates through only edit text cells.

Change-Id: I898d7a2d3f0ea472daddb9dd32f772a5d7268773

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 83e3358..1ef9a82 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -147,6 +147,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/data/dputil \
sc/source/core/data/drawpage \
sc/source/core/data/drwlayer \
+   sc/source/core/data/edittextiterator \
sc/source/core/data/fillinfo \
sc/source/core/data/formulacell \
sc/source/core/data/formulaiter \
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 49cc24a..4322c24 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -51,6 +51,7 @@ namespace sc {
 struct RefUpdateInsertTabContext;
 struct RefUpdateDeleteTabContext;
 struct RefUpdateMoveTabContext;
+class EditTextIterator;
 }
 
 class Fraction;
@@ -132,6 +133,7 @@ friend class ScColumnTextWidthIterator;
 friend class ScDocumentImport;
 friend class sc::SingleColumnSpanSet;
 friend class sc::ColumnSpanSet;
+friend class sc::EditTextIterator;
 
 ScColumn(const ScColumn); // disabled
 ScColumn operator= (const ScColumn); // disabled
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index c74c6c8..ab84d4c 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -56,6 +56,7 @@ namespace sc {
 class ColumnSpanSet;
 struct ColumnBlockPosition;
 struct RefUpdateContext;
+class EditTextIterator;
 }
 class SvxFontItem;
 
@@ -231,6 +232,7 @@ friend class ScTable;
 friend struct ScRefCellValue;
 friend class ScDocumentImport;
 friend class sc::ColumnSpanSet;
+friend class sc::EditTextIterator;
 
 typedef ::std::vectorScTable* TableContainer;
 private:
diff --git a/sc/inc/edittextiterator.hxx b/sc/inc/edittextiterator.hxx
new file mode 100644
index 000..f160b63
--- /dev/null
+++ b/sc/inc/edittextiterator.hxx
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef SC_EDITTEXTITERATOR_HXX
+#define SC_EDITTEXTITERATOR_HXX
+
+#include address.hxx
+#include mtvelements.hxx
+
+class ScColumn;
+class ScTable;
+class ScDocument;
+class EditTextObject;
+
+namespace sc {
+
+/**
+ * Iterate through all edit text cells in a given sheet.  The caller must
+ * check the validity of the sheet index passed to its constructor.
+ *
+ * It iterates from top to bottom, and then left to right order.
+ */
+class EditTextIterator
+{
+const ScTable mrTable;
+const ScColumn* mpCol;
+const ScColumn* mpColEnd;
+const CellStoreType* mpCells;
+CellStoreType::const_position_type maPos;
+CellStoreType::const_iterator miEnd;
+
+/**
+ * Move to the next edit text cell position if the current position is not
+ * an edit text.
+ */
+const EditTextObject* seek();
+
+/**
+ * Increment current position by one.
+ */
+void incPos();
+void incBlock();
+
+public:
+EditTextIterator( const ScDocument rDoc, SCTAB nTab );
+
+const EditTextObject* first();
+const EditTextObject* next();
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 06e8151..99c506b 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -210,6 +210,7 @@ friend class ScAttrRectIterator;
 friend class ScColumnTextWidthIterator;
 friend class ScDocumentImport;
 friend class sc::ColumnSpanSet;
+friend class sc::EditTextIterator;
 
 public:
 ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString 
rNewName,
diff --git 

[Libreoffice-qa] unspecified version missing from Bugzilla Assistant

[Tommy]

check this bug report:
https://bugs.freedesktop.org/show_bug.cgi?id=68294

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

[Libreoffice-bugs] [Bug 32443] PASTE SPECIAL: Comments erases value

[bugzilla-daemon]

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

bugquestcon...@online.de changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |---

--- Comment #2 from bugquestcon...@online.de ---
Since working with Calc (almost 2 year now) the described bug is really slowing
down work because one first  needs to copy the content of a target cell (for
the comment) somewhere, copy and paste special the comment, and then cut and
paste the original cell content. 

If the paste-special only comments works with out deleting the content of the
target cells it saves a lot or work: 4 clicks plus 4 ctrl+key strokes.

If this is a designed feature - I call it a bug - please inform where in the
Help file this information (I could not find any information) can be found and
I will place immediately an enhancement request.

I changed the status to REOPENED

Thanks for cooperation.

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

[Libreoffice-bugs] [Bug 67808] DRAW : Format Character Font Effects Outline = NOT functional with all font types

[bugzilla-daemon]

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

Maxim momonas...@gmail.com changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=67863

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

[Libreoffice-bugs] [Bug 67863] VIEWING: Characters with shadows appears heavily bolded, almost unreadable

[bugzilla-daemon]

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

Maxim momonas...@gmail.com changed:

   What|Removed |Added

 Status|NEEDINFO|NEW
   Severity|major   |normal
   Priority|high|medium
 CC||momonas...@gmail.com
   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=67808

--- Comment #2 from Maxim momonas...@gmail.com ---
Confirmed by bug 67808 comment 7, so changing to 'NEW'.

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

[Libreoffice-bugs] [Bug 67084] ASKLIBREOFFICE: Comment formatting under Askbot v0.7.48

[bugzilla-daemon]

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

Owen Genat owen.ge...@gmail.com changed:

   What|Removed |Added

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

--- Comment #14 from Owen Genat owen.ge...@gmail.com ---
I am setting this bug RESOLVED as FIXED, since the question editor has now been
turned on for the comments as well and appears to work as expected for the
cases I originally reported. Thanks to everyone who assisted with this.

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

[Libreoffice-bugs] [Bug 42159] Quick colour creation/selection in colour picker

[bugzilla-daemon]

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

ign_christian ign_christ...@yahoo.com changed:

   What|Removed |Added

 CC||swuensch+libreoffice@gmail.
   ||com

--- Comment #5 from ign_christian ign_christ...@yahoo.com ---
*** Bug 68248 has been marked as a duplicate of this bug. ***

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

[Libreoffice-bugs] [Bug 68301] New: FORMATTING: Formatting disappears when saving file

[bugzilla-daemon]

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

  Priority: medium
Bug ID: 68301
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: FORMATTING: Formatting disappears when saving file
  Severity: normal
Classification: Unclassified
OS: Linux (All)
  Reporter: sakari.aalto...@aalto.fi
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.0.2.2 release
 Component: Spreadsheet
   Product: LibreOffice

Problem description: 

Steps to reproduce:
1. Format negative numbers to be red, spellcheck strings accepting exceptions
(flagged ones)
2. Save file and exit
3. Restart and re-open file

Current behavior:When file is re-opened, negative numbers are (again) black,
exception strings are (again) flagged

Expected behavior:When file is re-opened, negative numbers are red, exception
strings are not flagged


Operating System: Ubuntu
Version: 4.0.2.2 release

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

[Libreoffice-bugs] [Bug 68248] Set customizable colours

[bugzilla-daemon]

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

ign_christian ign_christ...@yahoo.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #1 from ign_christian ign_christ...@yahoo.com ---


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

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

[Libreoffice-bugs] [Bug 52553] ASKLIBREOFFICE Allowed filetypes for upload too restrictive

[bugzilla-daemon]

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

--- Comment #7 from Owen Genat owen.ge...@gmail.com ---
Just an update on this issue. After the upgrade to Askbot v0.4.78 on 4th July
2013 all file types were excluded from being uploaded and existing attachments
no longer appeared linked. On 20th July 2013 I asked this question:

http://ask.libreoffice.org/en/question/20617/question-answer-attachments-for-asklo-not-showing/

...and a day later it was fixed (thanks Evgeny). The list of permissible file
types however appears to have been reduced, such that at present this is the
message displayed when attempting to upload an ODT:

allowed file types are '.jpg', '.jpeg', '.gif', '.bmp', '.png', '.tiff'

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

[Libreoffice-bugs] [Bug 68302] New: frame moves when graphical elements inside frame should be moved

[bugzilla-daemon]

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

  Priority: medium
Bug ID: 68302
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: frame moves when graphical elements inside frame
should be moved
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: lernfra...@email.de
  Hardware: x86 (IA32)
Status: UNCONFIRMED
   Version: 4.1.0.4 release
 Component: Writer
   Product: LibreOffice

Created attachment 84300
  -- https://bugs.freedesktop.org/attachment.cgi?id=84300action=edit
Frame with graphical elements and screenshots of the bug-behaviour

If graphical elements like arrows, boxes, shapes are inserted into a frame.

The COMPLETE frame is moved instead of the selected element when using
micro-movement by pressing Alt-Cursor (left/right up/down)

See attached file.

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

[Libreoffice-bugs] [Bug 52553] ASKLIBREOFFICE Allowed filetypes for upload too restrictive

[bugzilla-daemon]

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

--- Comment #8 from Owen Genat owen.ge...@gmail.com ---
Ugh. Askbot v0.4.78 in my prior comment should of course read Askbot
v0.7.48.

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

[Libreoffice-bugs] [Bug 65263] ASKLIBREOFFICE: search bar in Askbot 0.7.43 broken on QA pages

[bugzilla-daemon]

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

--- Comment #2 from Owen Genat owen.ge...@gmail.com ---
David, does this issue of typing in a search term and pressing ENTER still
cause problems under Askbot v0.7.48? For me, using Iceweasel v20.0 I now get
the appropriately reduced list of search results. If it is still an issue, we
may need to change the bug title. If it is no longer an issue, we can close
this bug.

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

[Libreoffice-bugs] [Bug 68290] EDITING: cursor moves with Enter key

[bugzilla-daemon]

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

--- Comment #3 from GerardF gerard.farg...@orange.fr ---
(In reply to comment #2)
 Hi GerardF,
 maybe better a request for enhancement.

Yes, of course.
I was convinced that I made the change to ENHANCEMENT. I was tired yesterday
evening...

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

[Libreoffice-bugs] [Bug 67665] Style font is not stored for ODG and ODP files: after editing a style, closing and reponening, it is changed

[bugzilla-daemon]

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

--- Comment #10 from Derek Keats de...@dkeats.com ---
This is a killer bug. What can be done to speed up getting it assigned and
getting a patch out there to fix it? It is forcing people to switch to
alternative packages to LibreOffice. Some of us upgraded because of awful bugs
in previous versions, so going back to older versions is not even really an
option. I am asking this out of innocence as a long time supporter of Free
Software. I cannot imagine having a bug that stops the application dead in its
tracks and then not fixing it. I would sell my soul to the devil for a
reasonable fix that is released so ordinary folk can use it.

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

[Libreoffice-bugs] [Bug 68289] UI: Window properties without content

[bugzilla-daemon]

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

--- Comment #1 from ign_christian ign_christ...@yahoo.com ---
Not reproducible on LO 4.0.5.1 (Win7 32bit). Have you tried resetting user
profile?

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

[Libreoffice-bugs] [Bug 65263] ASKLIBREOFFICE: search bar in Askbot 0.7.43 broken on QA pages

[bugzilla-daemon]

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

David djrei...@gmail.com changed:

   What|Removed |Added

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

--- Comment #3 from David djrei...@gmail.com ---
(In reply to comment #2)

Hi Owen - yes, I can confirmn Askbot is now working for me as expected; the
upgrade has addressed this bug. I'll sign this off as Resolved  Fuxed if I
can. Thanks for the nudge!

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

[Libreoffice-bugs] [Bug 32443] PASTE SPECIAL: Comments erases value

[bugzilla-daemon]

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

--- Comment #3 from bugquestcon...@online.de ---
additional information to comment 2

OS: XP/SP3
LibO: Version 4.0.4.2 (Build ID: 9e9821abd0ffdbc09cd8c52eaa574fa09eb08f2)

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

[Libreoffice-bugs] [Bug 68304] New: UI: Number of slides per row resets in the viewer

[bugzilla-daemon]

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

  Priority: medium
Bug ID: 68304
  Assignee: libreoffice-bugs@lists.freedesktop.org
   Summary: UI: Number of slides per row resets in the viewer
  Severity: normal
Classification: Unclassified
OS: Windows (All)
  Reporter: juanjose.garciarip...@gmail.com
  Hardware: Other
Whiteboard: BSA
Status: UNCONFIRMED
   Version: 4.1.0.4 release
 Component: Presentation
   Product: LibreOffice

Problem description: 
The problema arises when I watch my slides in the many-slide viewer and switch
back to the normal view (In Spanish they are Clasificador de diapositivas and
Normal views, but I do not have the english version around to check) Normally I
try to set the number of slides per row to 6 but when I switch to Normal and
then back to the slides viewer, the number of slides is reset to 5
systematically

Steps to reproduce:
1. Switch to the many-slides viewer and increase the # of slides per row to 6
2. Switch to normal view.
3. Switch back to the many-slides: the number of slides per row is again 5.

Current behavior:
The number of slides per row is reset.

Expected behavior:
The desired number of slides per row should be respected.

Operating System: Windows 8
Version: 4.1.0.4 release

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

[Libreoffice-bugs] [Bug 65263] ASKLIBREOFFICE: search bar in Askbot 0.7.43 broken on QA pages

[bugzilla-daemon]

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

--- Comment #4 from David djrei...@gmail.com ---
* Fixed (even!).

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

[Libreoffice-bugs] [Bug 67527] FILEOPEN: LO can't open files over SMB - wants to repair!

[bugzilla-daemon]

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

--- Comment #23 from Stephan Bergmann sberg...@redhat.com ---
(In reply to comment #22)
 (In reply to comment #20)
  What I could not (yet?) reproduce is a repair dialog appearing.
 As it's reproducible only under Ubuntu 12.04, I guess it's caused by old
 versions of GNOME\Samba libs. This explains the fact you can't reproduce
 that on a recent distro.

That makes it sound suspiciously like yet another fallout of GLib bug
https://bugzilla.gnome.org/show_bug.cgi?id=695925 GUINT32/64_SWAP_LE_BE
macros do not enclose val argument in parentheses, which [...] caused trouble
with LibreOffice, where running 'soffice sftp://.../.../test.odt' to access an
.odt file via GVFS failed to properly type-detect that file as a Writer
document and produced bogus error messages about the file being broken.

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

[Libreoffice-bugs] [Bug 67252] msoxl as text instead of calculated formular

[bugzilla-daemon]

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

--- Comment #7 from ecoro...@gmail.com ---
Have this bug on 4.1.0.4 Windows, on test file.

Also it comes along with wrong interpretation of decimal separator in formula:
dot  is read, and produces an error as locale specific is comma.

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