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

[Miklos Vajna]

 sw/qa/extras/ooxmlimport/data/tdf92454.docx  |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 +
 writerfilter/source/dmapper/DomainMapper.cxx |7 +++
 3 files changed, 16 insertions(+)

New commits:
commit f4badd9a485f32f787d78431ed673e2932973887
Author: Miklos Vajna 
Date:   Tue Sep 22 08:47:03 2015 +0200

tdf#92454 DOCX import: allow overriding para prop from num style in para 
style

Word has a feature like this: a paragraph style can refer to a numbering
style, and both can specify paragraph margins. If that's the case, then
the ones from the paragraph style has priority.

In Writer, the numbering style has priority, so the only chance for
correct import result is to set the margin directly on the paragraph in
this case.

Change-Id: Iff3b03bcc56e0db3a48452c293acf41c91b8f159

diff --git a/sw/qa/extras/ooxmlimport/data/tdf92454.docx 
b/sw/qa/extras/ooxmlimport/data/tdf92454.docx
new file mode 100644
index 000..7042668
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf92454.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 0f43ba9..2345c5c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2818,6 +2818,15 @@ DECLARE_OOXMLIMPORT_TEST(testIndents, "indents.docx")
 } while (xParaEnum->hasMoreElements());
 }
 
+DECLARE_OOXMLIMPORT_TEST(testTdf92454, "tdf92454.docx")
+{
+// The first paragraph had a large indentation / left margin as inheritance
+// in Word and Writer works differently, and no direct value was set to be
+// explicit.
+uno::Reference xParagraph(getParagraph(1), 
uno::UNO_QUERY);
+// This was beans::PropertyState_DEFAULT_VALUE.
+CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DIRECT_VALUE, 
xParagraph->getPropertyState("ParaFirstLineIndent"));
+}
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 9af39a7..eecbb43 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2042,6 +2042,13 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 
 rContext->Insert(PROP_PARA_RIGHT_MARGIN, 
uno::makeAny(nParaRightMargin));
 }
+
+// Indent properties from the paragraph style have priority
+// over the ones from the numbering styles in Word, not in
+// Writer.
+boost::optional oProperty;
+if (pStyleSheetProperties && (oProperty = 
pStyleSheetProperties->getProperty(PROP_PARA_FIRST_LINE_INDENT)))
+rContext->Insert(PROP_PARA_FIRST_LINE_INDENT, 
oProperty->second);
 }
 
 if( pStyleSheetProperties && pStyleSheetProperties->GetListLevel() 
>= 0 )
___
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

[Miklos Vajna]

 sw/inc/swmodule.hxx  |   70 +-
 sw/source/uibase/app/apphdl.cxx  |  120 +++
 sw/source/uibase/app/appopt.cxx  |4 -
 sw/source/uibase/app/swmodul1.cxx|  134 +--
 sw/source/uibase/app/swmodule.cxx|   68 -
 sw/source/uibase/dochdl/swdtflvr.cxx |   32 
 sw/source/uibase/docvw/edtdd.cxx |8 +-
 7 files changed, 218 insertions(+), 218 deletions(-)

New commits:
commit d214f1cb437ad1733cbebc95586d58f0ec19c16e
Author: Miklos Vajna 
Date:   Tue Sep 22 08:46:08 2015 +0200

sw: prefix members of SwModule

Change-Id: I5647e60dfbe5af460a077e1c2adf036fc2bb8037

diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 35d58c6..b2d01cd 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -65,47 +65,47 @@ namespace com{ namespace sun{ namespace star{ namespace 
scanner{
 
 class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public 
utl::ConfigurationListener
 {
-OUStringsActAuthor;
+OUStringm_sActAuthor;
 
 // ConfigItems
-SwModuleOptions*pModuleConfig;
-SwMasterUsrPref*pUsrPref;
-SwMasterUsrPref*pWebUsrPref;
-SwPrintOptions* pPrtOpt;
-SwPrintOptions* pWebPrtOpt;
-SwChapterNumRules*  pChapterNumRules;
-SwStdFontConfig*pStdFontConfig;
-SwNavigationConfig* pNavigationConfig;
-SwToolbarConfigItem*pToolbarConfig; //For stacked toolbars. Which one 
was visible?
-SwToolbarConfigItem*pWebToolbarConfig;
-SwDBConfig* pDBConfig;
-svtools::ColorConfig*   pColorConfig;
-SvtAccessibilityOptions* pAccessibilityOptions;
-SvtCTLOptions*  pCTLOptions;
-SvtUserOptions* pUserOptions;
-
-SfxErrorHandler*pErrorHdl;
-
-SwAttrPool  *pAttrPool;
+SwModuleOptions*m_pModuleConfig;
+SwMasterUsrPref*m_pUsrPref;
+SwMasterUsrPref*m_pWebUsrPref;
+SwPrintOptions* m_pPrintOptions;
+SwPrintOptions* m_pWebPrintOptions;
+SwChapterNumRules*  m_pChapterNumRules;
+SwStdFontConfig*m_pStdFontConfig;
+SwNavigationConfig* m_pNavigationConfig;
+SwToolbarConfigItem*m_pToolbarConfig; //For stacked toolbars. Which 
one was visible?
+SwToolbarConfigItem*m_pWebToolbarConfig;
+SwDBConfig* m_pDBConfig;
+svtools::ColorConfig*   m_pColorConfig;
+SvtAccessibilityOptions* m_pAccessibilityOptions;
+SvtCTLOptions*  m_pCTLOptions;
+SvtUserOptions* m_pUserOptions;
+
+SfxErrorHandler*m_pErrorHandler;
+
+SwAttrPool  *m_pAttrPool;
 
 // Current view is held here in order to avoid one's being forced
 // to work via GetActiveView.
 // View is valid until destroyed in Activate or exchanged.
-SwView* pView;
+SwView* m_pView;
 
 // List of all Redline-authors.
-std::vector* pAuthorNames;
+std::vector* m_pAuthorNames;
 
 // DictionaryList listener to trigger spellchecking or hyphenation
 ::com::sun::star::uno::Reference<
-::com::sun::star::linguistic2::XLinguServiceEventListener > 
xLngSvcEvtListener;
+::com::sun::star::linguistic2::XLinguServiceEventListener > 
m_xLinguServiceEventListener;
 ::com::sun::star::uno::Reference<
 ::com::sun::star::scanner::XScannerManager2 >m_xScannerManager;
 ::com::sun::star::uno::Reference<
 ::com::sun::star::linguistic2::XLanguageGuessing >  m_xLanguageGuesser;
 
-boolbAuthorInitialised : 1;
-boolbEmbeddedLoadSave : 1;
+boolm_bAuthorInitialised : 1;
+boolm_bEmbeddedLoadSave : 1;
 
 // Catch hint for DocInfo.
 virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint ) 
SAL_OVERRIDE;
@@ -119,7 +119,7 @@ protected:
 
 public:
 // public Data - used for internal Clipboard / Drag & Drop / XSelection
-SwTransferable  *pDragDrop, *pXSelection;
+SwTransferable  *m_pDragDrop, *m_pXSelection;
 
 TYPEINFO_OVERRIDE();
 SFX_DECL_INTERFACE(SW_INTERFACE_MODULE)
@@ -137,8 +137,8 @@ public:
 virtual ~SwModule();
 
 // Set view for internal use only. It is public only for technical reasons.
-inline  voidSetView(SwView* pVw) { pView = pVw; }
-inline  SwView* GetView() { return pView; }
+inline  voidSetView(SwView* pVw) { m_pView = pVw; }
+inline  SwView* GetView() { return m_pView; }
 
 // Handler for slots.
 voidStateOther(SfxItemSet &);
@@ -161,13 +161,13 @@ public:
 void ApplyUserCharUnit(bool bApplyChar, bool bWeb);  // apply_char_unit
 
 // Create ConfigItems.
-SwModuleOptions*GetModuleConfig()   { return pModuleConfig;}
+SwModuleOptions*GetModuleConfig()   { return m_pModuleConfig;}
 SwPrintOptions* GetPrtOptions(bool bWeb);
 SwChapterNumRules*  GetChapterNumRules();
-   

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

[Yousuf Philips]

 include/svx/sidebar/LinePropertyPanelBase.hxx |2 
 svx/source/sidebar/line/LinePropertyPanelBase.cxx |   16 ---
 svx/uiconfig/ui/sidebarline.ui|  109 +++---
 3 files changed, 59 insertions(+), 68 deletions(-)

New commits:
commit 050447a30012717643f1d056e0ba614f36e1303f
Author: Yousuf Philips 
Date:   Tue Sep 1 10:34:17 2015 +0400

tdf#89543 Unhide arrow style drop downs

Change-Id: I44c2b93389b88c0c1821ac727b46275bce8b076d
Reviewed-on: https://gerrit.libreoffice.org/18290
Tested-by: Jenkins 
Reviewed-by: Yousuf Philips 

diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx 
b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 8db5b44..dadb601 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -126,11 +126,9 @@ private:
 //ui controls
 VclPtr   mpFTWidth;
 VclPtr mpTBWidth;
-VclPtr   mpFTStyle;
 VclPtr mpLBStyle;
 VclPtr   mpFTTransparency;
 VclPtr mpMFTransparent;
-VclPtr   mpFTArrow;
 VclPtr mpLBStart;
 VclPtr mpLBEnd;
 VclPtr   mpFTEdgeStyle;
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx 
b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 9f4d20a..f4ee9ca 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -166,11 +166,9 @@ LinePropertyPanelBase::LinePropertyPanelBase(
 get(mpFTWidth, "widthlabel");
 get(mpTBWidth, "width");
 get(mpTBColor, "color");
-get(mpFTStyle, "stylelabel");
 get(mpLBStyle, "linestyle");
 get(mpFTTransparency, "translabel");
 get(mpMFTransparent, "linetransparency");
-get(mpFTArrow, "arrowlabel");
 get(mpLBStart, "beginarrowstyle");
 get(mpLBEnd, "endarrowstyle");
 get(mpFTEdgeStyle, "cornerlabel");
@@ -193,11 +191,9 @@ void LinePropertyPanelBase::dispose()
 mpFTWidth.clear();
 mpTBWidth.clear();
 mpTBColor.clear();
-mpFTStyle.clear();
 mpLBStyle.clear();
 mpFTTransparency.clear();
 mpMFTransparent.clear();
-mpFTArrow.clear();
 mpLBStart.clear();
 mpLBEnd.clear();
 mpFTEdgeStyle.clear();
@@ -253,9 +249,7 @@ void LinePropertyPanelBase::Initialize()
 mpMFTransparent->SetAccessibleName(OUString("Transparency"));  //wj acc
 
 mpTBWidth->SetAccessibleRelationLabeledBy(mpFTWidth);
-mpLBStyle->SetAccessibleRelationLabeledBy(mpFTStyle);
 mpMFTransparent->SetAccessibleRelationLabeledBy(mpFTTransparency);
-mpLBStart->SetAccessibleRelationLabeledBy(mpFTArrow);
 mpLBEnd->SetAccessibleRelationLabeledBy(mpLBEnd);
 
 aLink = LINK( this, LinePropertyPanelBase, ChangeEdgeStyleHdl );
@@ -275,12 +269,10 @@ void LinePropertyPanelBase::updateLineStyle(bool 
bDisabled, bool bSetOrDefault,
 {
 if(bDisabled)
 {
-mpFTStyle->Disable();
 mpLBStyle->Disable();
 }
 else
 {
-mpFTStyle->Enable();
 mpLBStyle->Enable();
 }
 
@@ -303,12 +295,10 @@ void LinePropertyPanelBase::updateLineDash(bool 
bDisabled, bool bSetOrDefault, c
 {
 if(bDisabled)
 {
-mpFTStyle->Disable();
 mpLBStyle->Disable();
 }
 else
 {
-mpFTStyle->Enable();
 mpLBStyle->Enable();
 }
 
@@ -389,12 +379,10 @@ void LinePropertyPanelBase::updateLineStart(bool 
bDisabled, bool bSetOrDefault,
 {
 if(bDisabled)
 {
-mpFTArrow->Disable();
 mpLBStart->Disable();
 }
 else
 {
-mpFTArrow->Enable();
 mpLBStart->Enable();
 }
 
@@ -417,12 +405,10 @@ void LinePropertyPanelBase::updateLineEnd(bool bDisabled, 
bool bSetOrDefault,
 {
 if(bDisabled)
 {
-mpFTArrow->Disable();
 mpLBEnd->Disable();
 }
 else
 {
-mpFTArrow->Enable();
 mpLBEnd->Enable();
 }
 
@@ -925,6 +911,8 @@ void LinePropertyPanelBase::ActivateControls()
 
 mpGridLineProps->Enable( bLineStyle );
 mpBoxArrowProps->Enable( bLineStyle );
+mpLBStart->Enable( bLineStyle );
+mpLBEnd->Enable( bLineStyle );
 }
 
 void LinePropertyPanelBase::setMapUnit(SfxMapUnit eMapUnit)
diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui
index 52ab635..c706aeb 100644
--- a/svx/uiconfig/ui/sidebarline.ui
+++ b/svx/uiconfig/ui/sidebarline.ui
@@ -1,11 +1,11 @@
 
-
+
 
   
-  
+  
   
 100
-5
+10
 20
   
   
@@ -29,21 +29,27 @@
   
 True
 False
+center
+3
 
-  
+  
+65
+True
 False
-0
-_Style:
-True
+True
+Select 
the style of the beginning arrowhead.
+Select 
the style of the beginning arrowhead.
+True
   
   

QA Meeting Minutes - 2015-09-16

[Robinson Tryon]

Hi all,

We had a great QA Meeting this past Wednesday and got some good input
about which types of bugs QA should investigate at the Hackfest. I'm
still interested in hearing your suggestions about particular
categories of bugs that deserve our attention, so please send those in
to me or list them here:
https://wiki.documentfoundation.org/Hackfest/Aarhus2015/QA

Minutes:
https://wiki.documentfoundation.org/QA/Meetings/2015/September_16

Our next meeting will be the Wednesday after the conference. I'm sure
we'll have a bunch to talk about!
https://wiki.documentfoundation.org/QA/Meetings/2015/September_30

Thanks,
--R

-- 
Robinson Tryon
QA Engineer - The Document Foundation
LibreOffice Community Outreach Herald
qu...@libreoffice.org
802-379-9482 | IRC: colonelqubit on Freenode
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Julien Nabet]

 wizards/com/sun/star/wizards/web/WWD_Startup.py |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 09c3e186e8b8562e3d502c5cbdef385753336b7f
Author: Julien Nabet 
Date:   Mon Sep 21 21:55:20 2015 +0200

tdf#94421: Web Wizard, option shift when loading saved session

Just use the right order
LOCAL_PUBLISHER first, ZIP_PUBLISHER second, FTP_PUBLISHER third and last 
one

Change-Id: I23ff96785910d62bbb2c221932d0ad2a2e755b3c
Reviewed-on: https://gerrit.libreoffice.org/18755
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/wizards/com/sun/star/wizards/web/WWD_Startup.py 
b/wizards/com/sun/star/wizards/web/WWD_Startup.py
index 1bbc905..0138438 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Startup.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Startup.py
@@ -494,8 +494,8 @@ class WWD_Startup(WWD_General):
 self.mountList(session.cp_GeneralInfo, self.genAware)
 task.advance(True)
 self.mountDataAware(session.cp_Publishing.getElement(LOCAL_PUBLISHER), 
0)
-self.mountDataAware(session.cp_Publishing.getElement(FTP_PUBLISHER), 1)
-self.mountDataAware(session.cp_Publishing.getElement(ZIP_PUBLISHER), 2)
+self.mountDataAware(session.cp_Publishing.getElement(ZIP_PUBLISHER), 1)
+self.mountDataAware(session.cp_Publishing.getElement(FTP_PUBLISHER), 2)
 task.advance(True)
 self.sessionNameDA.setDataObject(session, True)
 self.chkSaveSettings.Model.State = 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: 2 commits - loleaflet/reference.html loleaflet/spec

[Mihai Varga]

 loleaflet/reference.html  |  255 +-
 loleaflet/spec/loleaflet/loleafletSpec.js |4 
 2 files changed, 253 insertions(+), 6 deletions(-)

New commits:
commit f32b19eb39aa843ae88d86fc4205624d97452040
Author: Mihai Varga 
Date:   Mon Sep 21 23:06:59 2015 +0200

loleaflet: updated unit test's description

diff --git a/loleaflet/spec/loleaflet/loleafletSpec.js 
b/loleaflet/spec/loleaflet/loleafletSpec.js
index 4fbff63..4efa1b9 100644
--- a/loleaflet/spec/loleaflet/loleafletSpec.js
+++ b/loleaflet/spec/loleaflet/loleafletSpec.js
@@ -1,4 +1,4 @@
-describe('TileBench', function () {
+describe('LOLeaflet test', function () {
this.timeout(1);
var map;
var timeOut
@@ -38,7 +38,7 @@ describe('TileBench', function () {
map.remove();
});
 
-   describe('Benchmarking', function () {
+   describe('', function () {
it('Load all new tiles', function (done) {
map.on('statusindicator', function (e) {
if (e.statusType === 'alltilesloaded') {
commit f9a6048b03181350cf12ac0ca0a383111f9d1223
Author: Mihai Varga 
Date:   Fri Sep 18 17:53:08 2015 +0300

loleaflet: added the new methods to the html documentation

diff --git a/loleaflet/reference.html b/loleaflet/reference.html
index 8ce0eae..595dd62 100644
--- a/loleaflet/reference.html
+++ b/loleaflet/reference.html
@@ -55,6 +55,13 @@



+   LoLeaflet API
+   
+   General
+   Toolbar
+   Page oriented
+   Part oriented
+   
UI Layers

Marker
@@ -1377,6 +1384,246 @@ var map = L.map('map', {

 
 
+General
+
+General methods for document interaction.
+
+
+   
+   Method
+   Returns
+   Description
+   
+   
+   search(
+    phrase,
+    backward? )
+   
+   undefined
+   Searches for the given phrase downward from the current top 
border of the viewing area.
+Or backwards if specified.
+   
+   
+   setPermission(
+    
documenPermission)
+   
+   undefined
+   Sets the permission of the document.
+   
+   
+getDocSize()
+   Point
+   Returns the document size.
+   
+   
+getDocType()
+   DocumentTypeValues
+   Returns the document type.
+   
+   
+scroll(
+   x,
+   y,
+   Options)
+
+   undefined
+   Scroll right by 'x' and down by 'y' (or left and up if 
negative).
+   
+   
+scrollDown(
+   y,
+   Options)
+
+   undefined
+   Scroll down by 'y' (or up if negative).
+   
+   
+scrollRight(
+   x,
+   Options)
+
+   undefined
+   Scroll right by 'x' (or left if negative).
+   
+   
+scrollTop(
+   y,
+   Options)
+
+   undefined
+   Scroll to 'y' offset relative to the beginning of the 
document.
+   
+   
+scrollLeft(
+   x,
+   Options)
+
+   undefined
+   Scroll to 'x' offset relative to the beginning of the 
document.
+   
+   
+scrollOffset()
+   Point
+   Returns the scroll offset relative to the beginning of the 
document.
+   
+
+
+ScrollOptions
+
+
+   
+   property
+   type
+   description
+   
+   
+   update
+   Boolean
+Whether the update-scroll-offset event is fired.
+   
+
+
+Toolbar
+
+Toolbar methods.
+
+
+   
+   Method
+   Returns
+   Description
+   
+   
+   getToolbarCommandValues(
+    
unoCommand)
+   
+   Object
+   Returns a JSON mapping of the possible values.
+   
+   
+   toggleCommandState(
+    
unoCommand)
+   
+   undefined
+   Toggles the state for the given UNO command.
+   
+
+
+Page oriented
+
+Methods for page oriented documents.
+
+
+   
+   Method
+   Returns
+ 

Re: porting extension [java-netbeans] from OpenOffice to LibreOffice

[Andreas Mantke]

Hello,

Am 21.09.2015 um 18:21 schrieb John D'Orazio:
> I'm trying to create an account on the extensions website... I'm
> figuring maybe everyone is busy for the conference, but when the admin
> of the extensions website gets a chance, I'm ready to upload my plugin...
(...)
please fill in in your data in the form:
http://extensions.libreoffice.org/@@hosting-your-extension

and I'll set up an account for you on the site.

Kind regards,

-- 
## Developer LibreOffice
## Freie Office-Suite für Linux, Mac, Windows
## http://LibreOffice.org
## Support the Document Foundation (http://documentfoundation.org)
## Meine Seite: http://www.amantke.de 

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

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

[Julien Nabet]

 wizards/com/sun/star/wizards/table/TableWizard.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 78e1acffcb3d40266bc075c8b88595accbf62a1b
Author: Julien Nabet 
Date:   Mon Sep 21 22:35:36 2015 +0200

Typo: automaticcally->automatically

Change-Id: I0422965071f3828938b1b1a535f1eb4f2de481f2

diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java 
b/wizards/com/sun/star/wizards/table/TableWizard.java
index ce64033..8ba08ad 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -389,7 +389,7 @@ public class TableWizard extends DatabaseObjectWizard 
implements XTextListener
 {
 int maxfieldcount = curTableDescriptor.getMaxColumnsInTable();
 if (_icount >= (maxfieldcount - 1))
-{   // keep one column as reserve for the automaticcally created 
key
+{   // keep one column as reserve for the automatically created key
 String smessage = serrToManyFields;
 smessage = JavaTools.replaceSubString(smessage, 
String.valueOf(maxfieldcount), "%COUNT");
 showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, 
smessage);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'libreoffice-5-0' - el_GR/description.xml el_GR/el_GR.aff el_GR/el_GR.dic el_GR/README_el_GR.txt

[Andras Timar]

 el_GR/README_el_GR.txt |   10 
 el_GR/description.xml  |2 
 el_GR/el_GR.aff|  210 
 el_GR/el_GR.dic|782371 
-
 4 files changed, 518131 insertions(+), 264462 deletions(-)

New commits:
commit 519b229891334d3a6c008ee5336c81271471cd2f
Author: Andras Timar 
Date:   Mon Sep 21 17:56:43 2015 +0200

tdf#94415 update Greek dictionary to version 0.9

Change-Id: I66f68679f707e9fd7f98d15c5ab05c04b014f8b7
(cherry picked from commit 8236765eb34de01083e0554c3ccafa6d8ff1ee18)
Reviewed-on: https://gerrit.libreoffice.org/18754
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/el_GR/README_el_GR.txt b/el_GR/README_el_GR.txt
index 66771d8..3217982 100644
--- a/el_GR/README_el_GR.txt
+++ b/el_GR/README_el_GR.txt
@@ -1,14 +1,10 @@
-name  :  el_GR 0.7 version of the greek dictionary
-dd/mm/:  15/09/2006
+name  :  el_GR 0.9 version of the greek dictionary
+dd/mm/:  14/03/2015
 License   :  MPL 1.1/GPL 2.0/LGPL 2.1
 contact   :  Steve Stavropoulos
 URL   :  http://elspell.math.upatras.gr
 
-  This release added the MPL and LGPL to the available licences and an
-update to the .aff file (by Nick Demou).
-  The dictionary is triple licenced now and it is based on earlier work
-done by Evripidis Papakostas. [mentioned below]
-  The new licence is also mentioned below.
+Added about 240259 new words in this release (courtesy of Γιώργος 
Γέγος, with the kind help of Nick Demou).
 
  Steve Stavropoulos
 
diff --git a/el_GR/description.xml b/el_GR/description.xml
index 733e4a5..e9bfd96 100644
--- a/el_GR/description.xml
+++ b/el_GR/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 Greek spelling dictionary, and hyphenation 
rules
diff --git a/el_GR/el_GR.aff b/el_GR/el_GR.aff
index 42d9c63..5d1c46c 100644
--- a/el_GR/el_GR.aff
+++ b/el_GR/el_GR.aff
@@ -15,6 +15,8 @@
 #
 #  Added 59 REP rules and one more letter for the TRY (patch by Nick Demou)
 #
+#  Removed some REP rules and added some more (Nick Demou)
+#
 #  Steve Stavropoulos  01/05/2004
 #
 #  Based on an older job :
@@ -52,7 +54,7 @@ MAP 
 # Because of the automatic generation of the following REP there are some
 # combinations of letters that the greek language never uses, but I don't
 # think they will do any harm.
-REP 523
+REP 522
 REP á Ü
 REP Ü á
 REP ãê ãã
@@ -61,106 +63,78 @@ REP 
 REP ø ðó
 REP êó î
 REP î êó
-REP Üà Üà
 REP Üà Üâ
 REP Üà Üõ
 REP Üà Üû
-REP Üà Üý
 REP Üà áà
 REP Üà áâ
 REP Üà áõ
 REP Üà áû
 REP Üà áý
-REP Üâ Üà
-REP Üâ Üâ
 REP Üâ Üõ
 REP Üâ Üû
-REP Üâ Üý
 REP Üâ áà
 REP Üâ áâ
 REP Üâ áõ
 REP Üâ áû
 REP Üâ áý
-REP Üõ Üà
 REP Üõ Üâ
-REP Üõ Üõ
 REP Üõ Üû
-REP Üõ Üý
 REP Üõ áà
 REP Üõ áâ
 REP Üõ áõ
 REP Üõ áû
 REP Üõ áý
-REP Üû Üà
 REP Üû Üâ
 REP Üû Üõ
-REP Üû Üû
-REP Üû Üý
 REP Üû áà
 REP Üû áâ
 REP Üû áõ
 REP Üû áû
 REP Üû áý
-REP Üý Üà
 REP Üý Üâ
 REP Üý Üõ
 REP Üý Üû
-REP Üý Üý
 REP Üý áà
 REP Üý áâ
 REP Üý áõ
 REP Üý áû
 REP Üý áý
-REP áà Üà
 REP áà Üâ
 REP áà Üõ
 REP áà Üû
-REP áà Üý
-REP áà áà
 REP áà áâ
 REP áà áõ
 REP áà áû
 REP áà áý
-REP áâ Üà
 REP áâ Üâ
 REP áâ Üõ
 REP áâ Üû
-REP áâ Üý
 REP áâ áà
-REP áâ áâ
 REP áâ áõ
 REP áâ áû
 REP áâ áý
-REP áõ Üà
 REP áõ Üâ
 REP áõ Üõ
 REP áõ Üû
-REP áõ Üý
 REP áõ áà
 REP áõ áâ
-REP áõ áõ
 REP áõ áû
 REP áõ áý
-REP áû Üà
 REP áû Üâ
 REP áû Üõ
 REP áû Üû
-REP áû Üý
 REP áû áà
 REP áû áâ
 REP áû áõ
-REP áû áû
 REP áû áý
-REP áý Üà
 REP áý Üâ
 REP áý Üõ
 REP áý Üû
-REP áý Üý
 REP áý áà
 REP áý áâ
 REP áý áõ
 REP áý áû
-REP áý áý
 REP é ß
 REP ß é
 REP é ú
@@ -263,239 +237,166 @@ REP 
 REP þ ü
 REP ù þ
 REP þ ù
-REP Ýà Ýà
 REP Ýà Ýâ
 REP Ýà Ýõ
 REP Ýà Ýû
-REP Ýà Ýý
 REP Ýà åà
 REP Ýà åâ
 REP Ýà åõ
 REP Ýà åû
 REP Ýà åý
-REP Ýâ Ýà
-REP Ýâ Ýâ
 REP Ýâ Ýõ
 REP Ýâ Ýû
-REP Ýâ Ýý
 REP Ýâ åà
 REP Ýâ åâ
 REP Ýâ åõ
 REP Ýâ åû
 REP Ýâ åý
-REP Ýõ Ýà
 REP Ýõ Ýâ
-REP Ýõ Ýõ
 REP Ýõ Ýû
-REP Ýõ Ýý
 REP Ýõ åà
 REP Ýõ åâ
 REP Ýõ åõ
 REP Ýõ åû
 REP Ýõ åý
-REP Ýû Ýà
 REP Ýû Ýâ
 REP Ýû Ýõ
-REP Ýû Ýû
-REP Ýû Ýý
 REP Ýû åà
 REP Ýû åâ
 REP Ýû åõ
 REP Ýû åû
 REP Ýû åý
-REP Ýý Ýà
 REP Ýý Ýâ
 REP Ýý Ýõ
 REP Ýý Ýû
-REP Ýý Ýý
 REP Ýý åà
 REP Ýý åâ
 REP Ýý åõ
 REP Ýý åû
 REP Ýý åý
-REP åà Ýà
 REP åà Ýâ
 REP åà Ýõ
 REP åà Ýû
-REP åà Ýý
-REP åà åà
 REP åà åâ
 REP åà åõ
 REP åà åû
 REP åà åý
-REP åâ Ýà
 REP åâ Ýâ
 REP åâ Ýõ
 REP åâ Ýû
-REP åâ Ýý
 REP åâ åà
-REP åâ åâ
 REP åâ åõ
 REP åâ åû
 REP åâ åý
-REP åõ Ýà
 REP åõ Ýâ
 REP åõ Ýõ
 REP åõ Ýû
-REP åõ Ýý
 REP åõ åà
 REP åõ åâ
-REP åõ åõ
 REP åõ åû
 REP åõ åý
-REP åû Ýà
 REP åû Ýâ
 REP åû Ýõ
 REP åû Ýû
-REP åû Ýý
 REP åû åà
 REP åû åâ
 REP åû åõ
-REP åû åû
 REP åû åý
-REP åý Ýà
 REP åý Ýâ
 REP åý Ýõ
 REP åý Ýû
-REP åý Ýý
 REP åý åà
 REP åý åâ
 REP åý åõ
 REP åý åû
-REP åý åý
-REP ÝÀ ÝÀ
-REP ÝÀ Ýß
 REP ÝÀ Ýé
 REP ÝÀ Ýú
 REP ÝÀ åÀ
 REP ÝÀ åß
 REP ÝÀ åé
 REP ÝÀ åú
-REP Ýß ÝÀ
-

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - dictionaries

[Andras Timar]

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

New commits:
commit b55849e7f48f8eb89bda7cc4d1b3735ba5629c30
Author: Andras Timar 
Date:   Mon Sep 21 17:56:43 2015 +0200

Updated core
Project: dictionaries  519b229891334d3a6c008ee5336c81271471cd2f

tdf#94415 update Greek dictionary to version 0.9

Change-Id: I66f68679f707e9fd7f98d15c5ab05c04b014f8b7
(cherry picked from commit 8236765eb34de01083e0554c3ccafa6d8ff1ee18)
Reviewed-on: https://gerrit.libreoffice.org/18754
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dictionaries b/dictionaries
index 1a7a5f8..519b229 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 1a7a5f8de5e79e1f96095acf98bc5541a0cbac8f
+Subproject commit 519b229891334d3a6c008ee5336c81271471cd2f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/filter/excel/xipivot.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 24db3ec37d974402c0d3ce476c3aeffcff327ad7
Author: Eike Rathke 
Date:   Mon Sep 21 15:26:50 2015 +0200

Resolves: rhbz#1264585 check data pilot field name availability

Change-Id: Iaadf7044acb7299ee878de2fbc08992447587d62
(cherry picked from commit f09a91630c767370871389c28b81280807513431)
Reviewed-on: https://gerrit.libreoffice.org/18751
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/filter/excel/xipivot.cxx 
b/sc/source/filter/excel/xipivot.cxx
index 48fe3b3..92bad1d 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1031,13 +1031,19 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& 
rSaveData ) const
 
 XclPTDataFieldInfoList::const_iterator aIt = maDataInfoList.begin(), aEnd 
= maDataInfoList.end();
 
-ScDPSaveDimension& rSaveDim = *rSaveData.GetNewDimensionByName(aFieldName);
-ConvertDataField( rSaveDim, *aIt );
+ScDPSaveDimension* pSaveDim = rSaveData.GetNewDimensionByName(aFieldName);
+if (!pSaveDim)
+{
+SAL_WARN("sc.filter","XclImpPTField::ConvertDataField - field name not 
found: " << aFieldName);
+return;
+}
+
+ConvertDataField( *pSaveDim, *aIt );
 
 // multiple data fields -> clone dimension
 for( ++aIt; aIt != aEnd; ++aIt )
 {
-ScDPSaveDimension& rDupDim = rSaveData.DuplicateDimension( rSaveDim );
+ScDPSaveDimension& rDupDim = rSaveData.DuplicateDimension( *pSaveDim );
 ConvertDataFieldInfo( rDupDim, *aIt );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/filter/excel/xipivot.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 7e49f7d21349c5253ea9f50e21360bd43ffb2948
Author: Eike Rathke 
Date:   Mon Sep 21 15:26:50 2015 +0200

Resolves: rhbz#1264585 check data pilot field name availability

Change-Id: Iaadf7044acb7299ee878de2fbc08992447587d62
(cherry picked from commit f09a91630c767370871389c28b81280807513431)
Reviewed-on: https://gerrit.libreoffice.org/18752
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/filter/excel/xipivot.cxx 
b/sc/source/filter/excel/xipivot.cxx
index 2b48bcb..fbf5995 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1026,13 +1026,19 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& 
rSaveData ) const
 
 XclPTDataFieldInfoList::const_iterator aIt = maDataInfoList.begin(), aEnd 
= maDataInfoList.end();
 
-ScDPSaveDimension& rSaveDim = *rSaveData.GetNewDimensionByName(aFieldName);
-ConvertDataField( rSaveDim, *aIt );
+ScDPSaveDimension* pSaveDim = rSaveData.GetNewDimensionByName(aFieldName);
+if (!pSaveDim)
+{
+SAL_WARN("sc.filter","XclImpPTField::ConvertDataField - field name not 
found: " << aFieldName);
+return;
+}
+
+ConvertDataField( *pSaveDim, *aIt );
 
 // multiple data fields -> clone dimension
 for( ++aIt; aIt != aEnd; ++aIt )
 {
-ScDPSaveDimension& rDupDim = rSaveData.DuplicateDimension( rSaveDim );
+ScDPSaveDimension& rDupDim = rSaveData.DuplicateDimension( *pSaveDim );
 ConvertDataFieldInfo( rDupDim, *aIt );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source cui/source filter/source framework/source include/vcl sc/source sd/source svtools/source svx/source sw/source vcl/source

[Caolán McNamara]

 basctl/source/basicide/basdoc.cxx  |5 ++---
 cui/source/options/treeopt.cxx |6 +++---
 cui/source/tabpages/tpbitmap.cxx   |8 
 cui/source/tabpages/tpcolor.cxx|4 ++--
 cui/source/tabpages/tpgradnt.cxx   |4 ++--
 cui/source/tabpages/tphatch.cxx|4 ++--
 filter/source/graphicfilter/eos2met/eos2met.cxx|3 +--
 framework/source/uielement/fontsizemenucontroller.cxx  |2 +-
 include/vcl/vclptr.hxx |   13 -
 sc/source/ui/docshell/docsh4.cxx   |2 +-
 sc/source/ui/view/gridwin4.cxx |2 +-
 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx |2 +-
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx |4 ++--
 svtools/source/control/tabbar.cxx  |   14 +++---
 svtools/source/dialogs/roadmapwizard.cxx   |2 +-
 svtools/source/toolpanel/toolpaneldrawer.cxx   |2 +-
 svx/source/dialog/docrecovery.cxx  |6 +++---
 sw/source/ui/dbui/customizeaddresslistdialog.cxx   |4 ++--
 vcl/source/gdi/pdfwriter_impl2.cxx |2 +-
 19 files changed, 49 insertions(+), 40 deletions(-)

New commits:
commit 599fab44ad2ca626f046b9e9e4924110950a897c
Author: Caolán McNamara 
Date:   Mon Sep 21 13:37:17 2015 +0100

hide ScopedPtr::reset and add disposeAndClear

Change-Id: I55d6e789abd408b8478a2b9ae141d8899af2c309
Reviewed-on: https://gerrit.libreoffice.org/18745
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basctl/source/basicide/basdoc.cxx 
b/basctl/source/basicide/basdoc.cxx
index 1c878d82..b969c27 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -58,7 +58,7 @@ DocShell::~DocShell()
 SfxPrinter* DocShell::GetPrinter( bool bCreate )
 {
 if ( !pPrinter && bCreate )
-pPrinter.reset(VclPtr::Create(new SfxItemSet(
+pPrinter.disposeAndReset(VclPtr::Create(new SfxItemSet(
 GetPool(), SID_PRINTER_NOTFOUND_WARN, SID_PRINTER_NOTFOUND_WARN
 )));
 
@@ -69,8 +69,7 @@ void DocShell::SetPrinter( SfxPrinter* pPr )
 {
 if (pPr != pPrinter.get())
 {
-pPrinter.disposeAndClear();
-pPrinter.reset(pPr);
+pPrinter.disposeAndReset(pPr);
 }
 }
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 1495984..e18be0f 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1045,17 +1045,17 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 
 if(pPageInfo->m_nPageId == RID_SVXPAGE_COLOR)
 {
-pPageInfo->m_pPage.reset( ::CreateGeneralTabPage(
+pPageInfo->m_pPage.disposeAndReset( ::CreateGeneralTabPage(
 pPageInfo->m_nPageId, pTabBox, *pColorPageItemSet ) );
 mpColorPage = 
static_cast(pPageInfo->m_pPage.get());
 mpColorPage->SetupForViewFrame( SfxViewFrame::Current() );
 }
 else
 {
-pPageInfo->m_pPage.reset( 
::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet 
) );
+pPageInfo->m_pPage.disposeAndReset( 
::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet 
) );
 
 if(!pPageInfo->m_pPage && pGroupInfo->m_pModule)
-pPageInfo->m_pPage.reset( 
pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, 
*pGroupInfo->m_pInItemSet) );
+pPageInfo->m_pPage.disposeAndReset( 
pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, 
*pGroupInfo->m_pInItemSet) );
 
 }
 
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 462e9ab..22fa3d3 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -528,7 +528,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, 
Button*, void)
 
 if( !pWarnBox )
 {
-pWarnBox.reset(VclPtr::Create( GetParentDialog()
+pWarnBox.disposeAndReset(VclPtr::Create( 
GetParentDialog()
 ,"DuplicateNameDialog"
 ,"cui/ui/queryduplicatedialog.ui"));
 }
@@ -538,7 +538,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, ClickAddHdl_Impl, 
Button*, void)
 }
 
 pDlg.reset();
-pWarnBox.reset();
+pWarnBox.disposeAndClear();
 
 if( !nError )
 {
@@ -636,7 +636,7 @@ IMPL_LINK_NOARG_TYPED(SvxBitmapTabPage, 
ClickImportHdl_Impl, Button*, void)
 
 if( !pWarnBox )
 {
-pWarnBox.reset(VclPtr::Create( 
GetParentDialog()
+pWarnBox.disposeAndReset(VclPtr::Create( 
GetParentDialog()
 

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

[Eike Rathke]

 sc/source/filter/excel/xipivot.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit da4c217ac49ff05e352c0e6e46a46a4e9a0b78cc
Author: Eike Rathke 
Date:   Mon Sep 21 18:30:24 2015 +0200

init iterators only when needed

Almost only cosmetic here because the fields should be available, just
weren't in one case..

Change-Id: Ied68a91c8ef2cd32e293bf1d892eee3bee932ebf

diff --git a/sc/source/filter/excel/xipivot.cxx 
b/sc/source/filter/excel/xipivot.cxx
index 224c4d0..2539184 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1029,8 +1029,6 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& 
rSaveData ) const
 if (aFieldName.isEmpty())
 return;
 
-XclPTDataFieldInfoList::const_iterator aIt = maDataInfoList.begin(), aEnd 
= maDataInfoList.end();
-
 ScDPSaveDimension* pSaveDim = rSaveData.GetNewDimensionByName(aFieldName);
 if (!pSaveDim)
 {
@@ -1038,6 +1036,8 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& 
rSaveData ) const
 return;
 }
 
+XclPTDataFieldInfoList::const_iterator aIt = maDataInfoList.begin(), aEnd 
= maDataInfoList.end();
+
 ConvertDataField( *pSaveDim, *aIt );
 
 // multiple data fields -> clone dimension
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: porting extension [java-netbeans] from OpenOffice to LibreOffice

[John D'Orazio]

I'm trying to create an account on the extensions website... I'm figuring
maybe everyone is busy for the conference, but when the admin of the
extensions website gets a chance, I'm ready to upload my plugin...

On Sun, Sep 20, 2015 at 8:13 PM, John D'Orazio <
john.dora...@cappellaniauniroma3.org> wrote:

> Just to follow up, I've gone over the process a couple times, refactoring
> the copy-pastes, then double and triple checking that everything is in
> place... and it seems that I now have it working. I guess I can soon
> publish in the extensions website.
>
> On Sun, Sep 20, 2015 at 5:42 PM, John D'Orazio <
> john.dora...@cappellaniauniroma3.org> wrote:
>
>> Hello everyone, I wrote and published an extension for OpenOffice in Java
>> using the OpenOffice Netbeans plugin.
>>
>> Now I am trying to port it over to LibreOffice so I can publish it as an
>> extension there too.
>>
>> At first I was getting some errors such as this:
>>
>> Exception in thread "AWT-EventQueue-0" java.lang.VerifyError: Stack map
>> does not match the one at exception handler 354 Exception Details:
>>  Location: io/bibleget/BibleGetJSON.JSONParse(Ljava/lang/String;)V
>> @354: astore   Reason: Type
>> 'com/sun/star/lang/IllegalArgumentException' (current frame, stack[0]) is
>> not assignable to 'com/sun/star/uno/Exception' (stack map, stack[0])   
>> Current
>> Frame: bci: @283 flags: { } locals: { 'io/biblege
>>
>> But I think I figured out what the problem there was, it's not enough to
>> just change the context of the Netbeans plugin environment to LibreOffice 5
>> and LibreOffice 5 SDK, it's also necessary to actually create a new
>> OpenOffice plugin project after adjusting the context so that the right
>> .jar files will be included in the libraries.
>>
>> However when I try to create a new OpenOffice project, after going
>> through the wizard I am getting this error: "unknown entity
>> com.sun.star.frame.ProtocolHandler"
>>
>> So I don't know if the project is being created correctly or not...
>>
>> I tried deleting all files in the project except the LibreOffice jar
>> libraries, and copying over all the files from the OpenOffice project
>> together with all other libraries that I am using (not OpenOffice jars).
>> However when I "build and install in OpenOffice", it does install the
>> extension to the extension manager and open LibreOffice, and I do see the
>> addon menu with the menu items, but all of the menu items are greyed out.
>>
>> Does LibreOffice use a different .xcu format than OpenOffice? I'm
>> guessing it's not liking something in the
>> registry/data/org/openoffice/Office/Addons.xcu.
>>
>>
>> --
>> John R. D'Orazio
>>
>>
>
>
> --
> John R. D'Orazio
>



-- 
John R. D'Orazio
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 sw/qa/core/data/ww8/pass/hang-9.doc |binary
 sw/source/filter/ww8/ww8scan.cxx|   12 
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 5a47be272727d3d300b4dcdc707375f24fb919eb
Author: Caolán McNamara 
Date:   Mon Sep 21 12:14:19 2015 +0100

don't hang on busted subdocument offsets

Change-Id: I5d1d18f864496ec98894703f0a22e211a9dd14a5
(cherry picked from commit a2b90cd04733c2ec3b9cb3bb56d95f3298571ecc)
Reviewed-on: https://gerrit.libreoffice.org/18747
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/core/data/ww8/pass/hang-9.doc 
b/sw/qa/core/data/ww8/pass/hang-9.doc
new file mode 100644
index 000..4e9e412
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/hang-9.doc differ
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 867a0e7..109a3c2 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4450,11 +4450,15 @@ void WW8PLCFxDesc::ReduceByOffset()
 else
 nStartPos -= nCpOfs;
 }
-if( nEndPos != WW8_CP_MAX )
+if (nEndPos != WW8_CP_MAX)
 {
-OSL_ENSURE(nCpOfs <= nEndPos,
-"oh oh, so much for the subdocument piece theory");
-nEndPos   -= nCpOfs;
+if (nCpOfs > nEndPos)
+{
+SAL_WARN("sw.ww8", "broken subdocument piece entry");
+nEndPos = WW8_CP_MAX;
+}
+else
+nEndPos -= nCpOfs;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/oox oox/source sd/qa

[Katarina Behrens]

 include/oox/export/drawingml.hxx|2 -
 oox/source/export/drawingml.cxx |   40 +++
 sd/qa/unit/data/pptx/hyperlinktest.pptx |binary
 sd/qa/unit/export-tests.cxx |   46 
 4 files changed, 69 insertions(+), 19 deletions(-)

New commits:
commit e17187c323428b7edea425278ea33bca77db12b5
Author: Katarina Behrens 
Date:   Wed Aug 26 18:05:08 2015 +0200

tdf#91293: Preserve hyperlink on URL field OOXML export

The fix is twofold:
1.Get URL property from the underlying text field, not from the
text run -- put text field properties into rXPropSet (that's
what GETA macro later queries), not into rRun

6a043e9c0acff20e1618ca8ec15c21d5d0fd0d37 does s/rXPropSet/rRun/
afaics for no good reason

2. Retrieve string content from URL field early, so that the test
for empty text content doesn't fire

Reviewed-on: https://gerrit.libreoffice.org/18031
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

Conflicts:
sd/qa/unit/export-tests.cxx

Change-Id: I4317e4a2f6f2e6f15c30932adc80f1227e010af0
Reviewed-on: https://gerrit.libreoffice.org/18706
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index fff1e2c..bf5669a 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -108,7 +108,7 @@ protected:
 bool GetPropertyAndState( ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertySet > rXPropSet,
   ::com::sun::star::uno::Reference< 
::com::sun::star::beans::XPropertyState > rXPropState,
   const OUString& aName, 
::com::sun::star::beans::PropertyState& eState );
-const char* GetFieldType( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextRange > rRun, bool& bIsField );
+OUString GetFieldValue( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextRange > rRun, bool& bIsURLField );
 
 
 /// If bRelPathToMedia is true add "../" to image folder path while adding 
the image relationship
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 878276a..ecb66e3 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1438,7 +1438,7 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
 Reference< XTextField > rXTextField;
 GET( rXTextField, TextField );
 if( rXTextField.is() )
-rRun.set( rXTextField, UNO_QUERY );
+rXPropSet.set( rXTextField, UNO_QUERY );
 }
 
 // field properties starts here
@@ -1461,11 +1461,10 @@ void DrawingML::WriteRunProperties( Reference< 
XPropertySet > rRun, bool bIsFiel
 mpFS->endElementNS( XML_a, nElement );
 }
 
-const char* DrawingML::GetFieldType( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextRange > rRun, bool& bIsField )
+OUString DrawingML::GetFieldValue( ::com::sun::star::uno::Reference< 
::com::sun::star::text::XTextRange > rRun, bool& bIsURLField )
 {
-const char* sType = NULL;
 Reference< XPropertySet > rXPropSet( rRun, UNO_QUERY );
-OUString aFieldType;
+OUString aFieldType, aFieldValue;
 
 if( GETA( TextPortionType ) )
 {
@@ -1479,7 +1478,6 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 GET( rXTextField, TextField );
 if( rXTextField.is() )
 {
-bIsField = true;
 rXPropSet.set( rXTextField, UNO_QUERY );
 if( rXPropSet.is() )
 {
@@ -1487,17 +1485,19 @@ const char* DrawingML::GetFieldType( 
::com::sun::star::uno::Reference< ::com::su
 DBG(fprintf (stderr, "field kind: %s\n", USS(aFieldKind) ));
 if( aFieldKind == "Page" )
 {
-return "slidenum";
+aFieldValue = OUString("slidenum");
+}
+else if( aFieldKind == "URL" )
+{
+bIsURLField = true;
+GET( aFieldValue, Representation)
+
 }
-// else if( aFieldKind == "URL" ) {
-// do not return here
-// and make URL field text run with hyperlink property later
-// }
 }
 }
 }
 
-return sType;
+return aFieldValue;
 }
 
 void DrawingML::GetUUID( OStringBuffer& rBuffer )
@@ -1546,14 +1546,19 @@ void DrawingML::WriteRun( Reference< XTextRange > rRun )
 sal_Int16 nLevel = -1;
 GET( nLevel, NumberingLevel );
 
-const char* sFieldType;
-bool bIsField = false;
+bool bIsURLField = false;
+OUString sFieldValue = GetFieldValue( rRun, bIsURLField );
+bool bWriteField  = !( sFieldValue.isEmpty() || bIsURLField );
+
 OUString sText = rRun->getString();
 
 //if there is no text following t

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/source

[Caolán McNamara]

 sd/source/core/stlsheet.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 31d1004f00624a1d755914ad8313992abb9545a9
Author: Caolán McNamara 
Date:   Fri Sep 18 14:40:24 2015 +0100

valgrind, leak in SdStyleSheet

this is presumably a regression from

commit 8904bf48e0cb4d5d0890684ce82dc2ff3252e41f
Author: Michael Stahl 
Date:   Tue Jul 7 23:57:07 2015 +0200

sd: dispose SdStyleSheet properly

If it's disposed during document destruction it still retained pointers
to SfxItemSet and SfxStyleSheetBasePool.

where it was always deleted in the dtor, but now
is optional in ::dispose

lets set bMySet to true when pSet is created like sc does, rather
try going to an unconditional delete in ::dispose

Change-Id: I214675805e513f657e51c779758106194f6d14e3
(cherry picked from commit 217a22188274221035aec988eccea5e5c9768921)
Reviewed-on: https://gerrit.libreoffice.org/18694
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index a9f6f27..0295790 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -245,6 +245,7 @@ SfxItemSet& SdStyleSheet::GetItemSet()
 0, 0 };
 
 pSet = new SfxItemSet(GetPool().GetPool(), nWhichPairTable);
+bMySet = true;
 }
 
 return *pSet;
@@ -270,6 +271,7 @@ SfxItemSet& SdStyleSheet::GetItemSet()
 0, 0 };
 
 pSet = new SfxItemSet(GetPool().GetPool(), nWhichPairTable);
+bMySet = true;
 }
 
 return *pSet;
@@ -309,6 +311,7 @@ SfxItemSet& SdStyleSheet::GetItemSet()
  0, 0 };
 
 pSet = new SfxItemSet(GetPool().GetPool(), nWhichPairTable);
+bMySet = true;
 }
 
 return(*pSet);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sd/qa sd/source

[Caolán McNamara]

 sd/qa/unit/data/ppt/pass/hang-22.ppt |binary
 sd/source/filter/ppt/pptin.cxx   |3 -
 sd/source/filter/ppt/propread.cxx|   78 +--
 sd/source/filter/ppt/propread.hxx|4 -
 4 files changed, 43 insertions(+), 42 deletions(-)

New commits:
commit 642779743f74edcaa4e69a722ea07918ee79c592
Author: Caolán McNamara 
Date:   Fri Sep 18 12:46:29 2015 +0100

check stream status and string lengths

(cherry picked from commit 7af19f45b35c428d3e06972806e5a05489f45955)

if nSize was 1 with unicode encoding

nSize would wrap around in lcl_getMaxSafeStrLen

(cherry picked from commit f6368c29bdc3a9017bcae3f064d2cd8c7e37ed10)

rework this so we don't read the string, backup and re-read the string again

(cherry picked from commit 8523e57e427ef5b0b7f7067dcdd07f01176d2160)

Change-Id: I99f3d4a2ec760228f485d01fce856deb9c068431
Reviewed-on: https://gerrit.libreoffice.org/18690
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/sd/qa/unit/data/ppt/pass/hang-22.ppt 
b/sd/qa/unit/data/ppt/pass/hang-22.ppt
new file mode 100644
index 000..c869b39
Binary files /dev/null and b/sd/qa/unit/data/ppt/pass/hang-22.ppt differ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index dc4cadd..8cdaaff 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -367,7 +367,8 @@ bool ImplSdPPTImport::Import()
 if ( pSection )
 {
 Dictionary aDict;
-if ( pSection->GetDictionary( aDict ) )
+pSection->GetDictionary(aDict);
+if (!aDict.empty())
 {
 Dictionary::const_iterator iter = aDict.find( 
OUString("_PID_HLINKS") );
 
diff --git a/sd/source/filter/ppt/propread.cxx 
b/sd/source/filter/ppt/propread.cxx
index e4dc401..2f5fc73 100644
--- a/sd/source/filter/ppt/propread.cxx
+++ b/sd/source/filter/ppt/propread.cxx
@@ -269,10 +269,8 @@ void Section::AddProperty( sal_uInt32 nId, const 
sal_uInt8* pBuf, sal_uInt32 nBu
 maEntries.push_back( new PropEntry( nId, pBuf, nBufSize, mnTextEnc ) );
 }
 
-bool Section::GetDictionary( Dictionary& rDict )
+void Section::GetDictionary(Dictionary& rDict)
 {
-bool bRetValue = false;
-
 boost::ptr_vector::iterator iter;
 for (iter = maEntries.begin(); iter != maEntries.end(); ++iter)
 {
@@ -280,48 +278,50 @@ bool Section::GetDictionary( Dictionary& rDict )
 break;
 }
 
-if ( iter != maEntries.end() )
+if (iter == maEntries.end())
+return;
+
+SvMemoryStream aStream( iter->mpBuf, iter->mnSize, StreamMode::READ );
+aStream.Seek( STREAM_SEEK_TO_BEGIN );
+sal_uInt32 nDictCount(0);
+aStream.ReadUInt32( nDictCount );
+for (sal_uInt32 i = 0; i < nDictCount; ++i)
 {
-sal_uInt32 nDictCount, nId, nSize, nPos;
-SvMemoryStream aStream( iter->mpBuf, iter->mnSize, StreamMode::READ );
-aStream.Seek( STREAM_SEEK_TO_BEGIN );
-aStream.ReadUInt32( nDictCount );
-for ( sal_uInt32 i = 0; i < nDictCount; i++ )
+sal_uInt32 nId(0), nSize(0);
+aStream.ReadUInt32(nId).ReadUInt32(nSize);
+if (!aStream.good() || nSize > aStream.remainingSize())
+break;
+if (mnTextEnc == RTL_TEXTENCODING_UCS2)
+nSize >>= 1;
+if (!nSize)
+continue;
+OUString aString;
+try
 {
-aStream.ReadUInt32( nId ).ReadUInt32( nSize );
-if ( nSize )
+if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
 {
-OUString aString;
-nPos = aStream.Tell();
-try
-{
-sal_Char* pString = new sal_Char[ nSize ];
-aStream.Read( pString, nSize );
-if ( mnTextEnc == RTL_TEXTENCODING_UCS2 )
-{
-nSize >>= 1;
-aStream.Seek( nPos );
-sal_Unicode* pWString = 
reinterpret_cast(pString);
-for (sal_uInt32 j = 0; j < nSize; ++j)
-aStream.ReadUInt16(pWString[j]);
-aString = OUString(pWString, 
lcl_getMaxSafeStrLen(nSize));
-}
-else
-aString = OUString(pString, 
lcl_getMaxSafeStrLen(nSize), mnTextEnc);
-delete[] pString;
-}
-catch( const std::bad_alloc& )
-{
-OSL_FAIL( "sd Section::GetDictionary bad alloc" );
-}
-if ( aString.isEmpty() )
-break;
-rDict.insert( std::make_pair(aString,nId) );
+sal_Unicode* pWString = new sal_Unicode[nSize];
+for (sal_uInt32 j = 0; j < nSize; ++j)
+aStream.ReadUInt16(pWS

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

[Caolán McNamara]

 vcl/source/outdev/transparent.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 79a3a1ee610297ba6982e482cd471ee743e6ce8f
Author: Caolán McNamara 
Date:   Fri Sep 18 13:05:31 2015 +0100

valgrind: memory leak in scoped_ptr/unique_ptr -> VclPtr convert

regression from

commit 820576af4fd6441a752742b43d804e9837839925
Author: Noel Grandin 
Date:   Thu Mar 19 13:54:12 2015 +0200

start wrapping OutputDevice in VclPtr

 9,800 (568 direct, 9,232 indirect) bytes in 1 blocks are definitely lost 
in loss record 12,696 of 12,898
by 0xC602E72: 
ScopedVclPtrInstance::ScopedVclPtrInstance<>() (vclptr.hxx:375)

(cherry picked from commit 23d4d2f6ac5aa2ca94109e07421a1ed8330b85bd)

Change-Id: I356f39c339fd28a9e19a00d61b6f1bee492f2638
Reviewed-on: https://gerrit.libreoffice.org/18689
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/vcl/source/outdev/transparent.cxx 
b/vcl/source/outdev/transparent.cxx
index 69a4244..7f3b355 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -751,7 +751,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& 
rMtf, const Point& rPos,
 
 const AlphaMask aAlpha(xVDev->GetBitmap(aPoint, 
xVDev->GetOutputSizePixel()));
 
-xVDev.reset();
+xVDev.disposeAndClear();
 
 // draw masked content to target and restore MapMode
 DrawBitmapEx(aDstRect.TopLeft(), BitmapEx(aPaint, aAlpha));
@@ -799,7 +799,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& 
rMtf, const Point& rPos,
 
 aAlpha = xVDev->GetBitmap( Point(), 
xVDev->GetOutputSizePixel() );
 
-xVDev.reset();
+xVDev.disposeAndClear();
 
 EnableMapMode( false );
 DrawBitmapEx( aDstRect.TopLeft(), BitmapEx( aPaint, aAlpha 
) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: el_GR/description.xml el_GR/el_GR.aff el_GR/el_GR.dic el_GR/README_el_GR.txt

[Andras Timar]

 el_GR/README_el_GR.txt |   10 
 el_GR/description.xml  |2 
 el_GR/el_GR.aff|  210 
 el_GR/el_GR.dic|782371 
-
 4 files changed, 518131 insertions(+), 264462 deletions(-)

New commits:
commit 8236765eb34de01083e0554c3ccafa6d8ff1ee18
Author: Andras Timar 
Date:   Mon Sep 21 17:56:43 2015 +0200

tdf#94415 update Greek dictionary to version 0.9

Change-Id: I66f68679f707e9fd7f98d15c5ab05c04b014f8b7

diff --git a/el_GR/README_el_GR.txt b/el_GR/README_el_GR.txt
index 66771d8..3217982 100644
--- a/el_GR/README_el_GR.txt
+++ b/el_GR/README_el_GR.txt
@@ -1,14 +1,10 @@
-name  :  el_GR 0.7 version of the greek dictionary
-dd/mm/:  15/09/2006
+name  :  el_GR 0.9 version of the greek dictionary
+dd/mm/:  14/03/2015
 License   :  MPL 1.1/GPL 2.0/LGPL 2.1
 contact   :  Steve Stavropoulos
 URL   :  http://elspell.math.upatras.gr
 
-  This release added the MPL and LGPL to the available licences and an
-update to the .aff file (by Nick Demou).
-  The dictionary is triple licenced now and it is based on earlier work
-done by Evripidis Papakostas. [mentioned below]
-  The new licence is also mentioned below.
+Added about 240259 new words in this release (courtesy of Γιώργος 
Γέγος, with the kind help of Nick Demou).
 
  Steve Stavropoulos
 
diff --git a/el_GR/description.xml b/el_GR/description.xml
index 733e4a5..e9bfd96 100644
--- a/el_GR/description.xml
+++ b/el_GR/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 Greek spelling dictionary, and hyphenation 
rules
diff --git a/el_GR/el_GR.aff b/el_GR/el_GR.aff
index 42d9c63..5d1c46c 100644
--- a/el_GR/el_GR.aff
+++ b/el_GR/el_GR.aff
@@ -15,6 +15,8 @@
 #
 #  Added 59 REP rules and one more letter for the TRY (patch by Nick Demou)
 #
+#  Removed some REP rules and added some more (Nick Demou)
+#
 #  Steve Stavropoulos  01/05/2004
 #
 #  Based on an older job :
@@ -52,7 +54,7 @@ MAP 
 # Because of the automatic generation of the following REP there are some
 # combinations of letters that the greek language never uses, but I don't
 # think they will do any harm.
-REP 523
+REP 522
 REP á Ü
 REP Ü á
 REP ãê ãã
@@ -61,106 +63,78 @@ REP 
 REP ø ðó
 REP êó î
 REP î êó
-REP Üà Üà
 REP Üà Üâ
 REP Üà Üõ
 REP Üà Üû
-REP Üà Üý
 REP Üà áà
 REP Üà áâ
 REP Üà áõ
 REP Üà áû
 REP Üà áý
-REP Üâ Üà
-REP Üâ Üâ
 REP Üâ Üõ
 REP Üâ Üû
-REP Üâ Üý
 REP Üâ áà
 REP Üâ áâ
 REP Üâ áõ
 REP Üâ áû
 REP Üâ áý
-REP Üõ Üà
 REP Üõ Üâ
-REP Üõ Üõ
 REP Üõ Üû
-REP Üõ Üý
 REP Üõ áà
 REP Üõ áâ
 REP Üõ áõ
 REP Üõ áû
 REP Üõ áý
-REP Üû Üà
 REP Üû Üâ
 REP Üû Üõ
-REP Üû Üû
-REP Üû Üý
 REP Üû áà
 REP Üû áâ
 REP Üû áõ
 REP Üû áû
 REP Üû áý
-REP Üý Üà
 REP Üý Üâ
 REP Üý Üõ
 REP Üý Üû
-REP Üý Üý
 REP Üý áà
 REP Üý áâ
 REP Üý áõ
 REP Üý áû
 REP Üý áý
-REP áà Üà
 REP áà Üâ
 REP áà Üõ
 REP áà Üû
-REP áà Üý
-REP áà áà
 REP áà áâ
 REP áà áõ
 REP áà áû
 REP áà áý
-REP áâ Üà
 REP áâ Üâ
 REP áâ Üõ
 REP áâ Üû
-REP áâ Üý
 REP áâ áà
-REP áâ áâ
 REP áâ áõ
 REP áâ áû
 REP áâ áý
-REP áõ Üà
 REP áõ Üâ
 REP áõ Üõ
 REP áõ Üû
-REP áõ Üý
 REP áõ áà
 REP áõ áâ
-REP áõ áõ
 REP áõ áû
 REP áõ áý
-REP áû Üà
 REP áû Üâ
 REP áû Üõ
 REP áû Üû
-REP áû Üý
 REP áû áà
 REP áû áâ
 REP áû áõ
-REP áû áû
 REP áû áý
-REP áý Üà
 REP áý Üâ
 REP áý Üõ
 REP áý Üû
-REP áý Üý
 REP áý áà
 REP áý áâ
 REP áý áõ
 REP áý áû
-REP áý áý
 REP é ß
 REP ß é
 REP é ú
@@ -263,239 +237,166 @@ REP 
 REP þ ü
 REP ù þ
 REP þ ù
-REP Ýà Ýà
 REP Ýà Ýâ
 REP Ýà Ýõ
 REP Ýà Ýû
-REP Ýà Ýý
 REP Ýà åà
 REP Ýà åâ
 REP Ýà åõ
 REP Ýà åû
 REP Ýà åý
-REP Ýâ Ýà
-REP Ýâ Ýâ
 REP Ýâ Ýõ
 REP Ýâ Ýû
-REP Ýâ Ýý
 REP Ýâ åà
 REP Ýâ åâ
 REP Ýâ åõ
 REP Ýâ åû
 REP Ýâ åý
-REP Ýõ Ýà
 REP Ýõ Ýâ
-REP Ýõ Ýõ
 REP Ýõ Ýû
-REP Ýõ Ýý
 REP Ýõ åà
 REP Ýõ åâ
 REP Ýõ åõ
 REP Ýõ åû
 REP Ýõ åý
-REP Ýû Ýà
 REP Ýû Ýâ
 REP Ýû Ýõ
-REP Ýû Ýû
-REP Ýû Ýý
 REP Ýû åà
 REP Ýû åâ
 REP Ýû åõ
 REP Ýû åû
 REP Ýû åý
-REP Ýý Ýà
 REP Ýý Ýâ
 REP Ýý Ýõ
 REP Ýý Ýû
-REP Ýý Ýý
 REP Ýý åà
 REP Ýý åâ
 REP Ýý åõ
 REP Ýý åû
 REP Ýý åý
-REP åà Ýà
 REP åà Ýâ
 REP åà Ýõ
 REP åà Ýû
-REP åà Ýý
-REP åà åà
 REP åà åâ
 REP åà åõ
 REP åà åû
 REP åà åý
-REP åâ Ýà
 REP åâ Ýâ
 REP åâ Ýõ
 REP åâ Ýû
-REP åâ Ýý
 REP åâ åà
-REP åâ åâ
 REP åâ åõ
 REP åâ åû
 REP åâ åý
-REP åõ Ýà
 REP åõ Ýâ
 REP åõ Ýõ
 REP åõ Ýû
-REP åõ Ýý
 REP åõ åà
 REP åõ åâ
-REP åõ åõ
 REP åõ åû
 REP åõ åý
-REP åû Ýà
 REP åû Ýâ
 REP åû Ýõ
 REP åû Ýû
-REP åû Ýý
 REP åû åà
 REP åû åâ
 REP åû åõ
-REP åû åû
 REP åû åý
-REP åý Ýà
 REP åý Ýâ
 REP åý Ýõ
 REP åý Ýû
-REP åý Ýý
 REP åý åà
 REP åý åâ
 REP åý åõ
 REP åý åû
-REP åý åý
-REP ÝÀ ÝÀ
-REP ÝÀ Ýß
 REP ÝÀ Ýé
 REP ÝÀ Ýú
 REP ÝÀ åÀ
 REP ÝÀ åß
 REP ÝÀ åé
 REP ÝÀ åú
-REP Ýß ÝÀ
-REP Ýß Ýß
 REP Ýß Ýé
 REP Ýß Ýú
 REP Ýß åÀ
 REP Ýß åß
 REP Ýß åé
 REP Ýß åú
-REP Ýé ÝÀ
-REP Ýé Ýß
-REP Ýé Ýé
 REP Ýé Ýú
 REP Ýé åÀ
 REP Ýé åß
 REP Ýé åé
 REP Ýé åú
-REP Ýú ÝÀ
-REP Ýú Ýß
 REP Ýú Ý

[Libreoffice-commits] core.git: dictionaries

[Andras Timar]

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

New commits:
commit fc64a5d850081a89acd44d4f7c72db3b21279360
Author: Andras Timar 
Date:   Mon Sep 21 17:56:43 2015 +0200

Updated core
Project: dictionaries  8236765eb34de01083e0554c3ccafa6d8ff1ee18

tdf#94415 update Greek dictionary to version 0.9

Change-Id: I66f68679f707e9fd7f98d15c5ab05c04b014f8b7

diff --git a/dictionaries b/dictionaries
index 6eb65b4..8236765 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 6eb65b46c58dd0b2a83a6c767cfd60f7f29968f7
+Subproject commit 8236765eb34de01083e0554c3ccafa6d8ff1ee18
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Daniel Robertson]

 compilerplugins/clang/compat.hxx  |6 +++---
 compilerplugins/clang/refcounting.cxx |2 +-
 compilerplugins/clang/staticmethods.cxx   |2 +-
 compilerplugins/clang/unusedvariablecheck.cxx |2 +-
 compilerplugins/clang/vclwidgets.cxx  |2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit ef779d339e202dacea30b68ca8014207171e9ce4
Author: Daniel Robertson 
Date:   Sun Sep 20 19:37:48 2015 -0400

tdf#94389 compilerplugins: clang 3.7.0

Fix errors that occur in build with clang 3.7.0

Change-Id: I0e8743f2b6a288d10b4e78e884ce34cfca4dd77c
Reviewed-on: https://gerrit.libreoffice.org/18738
Reviewed-by: Stephan Bergmann 
Tested-by: Stephan Bergmann 

diff --git a/compilerplugins/clang/compat.hxx b/compilerplugins/clang/compat.hxx
index 22ed14b..0ca37fa 100644
--- a/compilerplugins/clang/compat.hxx
+++ b/compilerplugins/clang/compat.hxx
@@ -71,7 +71,7 @@ inline bool forallBases(
 void* callbackParam,
 bool AllowShortCircuit)
 {
-#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3
+#if (__clang_major__ == 3 && __clang_minor__ > 7) || __clang_major__ > 3
 (void) callbackParam;
 return decl.forallBases(BaseMatches, AllowShortCircuit);
 #else
@@ -146,7 +146,7 @@ inline clang::QualType getParamType(
 inline clang::Stmt::const_child_iterator begin(
 clang::Stmt::const_child_range const & range)
 {
-#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3
+#if (__clang_major__ == 3 && __clang_minor__ > 7) || __clang_major__ > 3
 return range.begin();
 #else
 return range.first;
@@ -156,7 +156,7 @@ inline clang::Stmt::const_child_iterator begin(
 inline clang::Stmt::const_child_iterator end(
 clang::Stmt::const_child_range const & range)
 {
-#if (__clang_major__ == 3 && __clang_minor__ >= 7) || __clang_major__ > 3
+#if (__clang_major__ == 3 && __clang_minor__ > 7) || __clang_major__ > 3
 return range.end();
 #else
 return range.second;
diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index 3a6c715..882d686 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -83,7 +83,7 @@ bool isDerivedFrom(const CXXRecordDecl *decl, const char 
*pString) {
 !decl->hasAnyDependentBases() &&
 !compat::forallBases(
 *decl,
-#if __clang_major__ == 3 && __clang_minor__ < 7
+#if __clang_major__ == 3 && __clang_minor__ <= 7
 BaseCheckNotSubclass,
 #else
 [pString](const CXXRecordDecl *BaseDefinition) -> bool
diff --git a/compilerplugins/clang/staticmethods.cxx 
b/compilerplugins/clang/staticmethods.cxx
index a02348f..42c958d 100644
--- a/compilerplugins/clang/staticmethods.cxx
+++ b/compilerplugins/clang/staticmethods.cxx
@@ -38,7 +38,7 @@ private:
 
 bool BaseCheckNotTestFixtureSubclass(
 const CXXRecordDecl *BaseDefinition
-#if __clang_major__ == 3 && __clang_minor__ < 7
+#if __clang_major__ == 3 && __clang_minor__ <= 7
 , void *
 #endif
 )
diff --git a/compilerplugins/clang/unusedvariablecheck.cxx 
b/compilerplugins/clang/unusedvariablecheck.cxx
index 80e32b8..ce35afe 100644
--- a/compilerplugins/clang/unusedvariablecheck.cxx
+++ b/compilerplugins/clang/unusedvariablecheck.cxx
@@ -51,7 +51,7 @@ void UnusedVariableCheck::run()
 
 bool BaseCheckNotDialogSubclass(
 const CXXRecordDecl *BaseDefinition
-#if __clang_major__ == 3 && __clang_minor__ < 7
+#if __clang_major__ == 3 && __clang_minor__ <= 7
 , void *
 #endif
 )
diff --git a/compilerplugins/clang/vclwidgets.cxx 
b/compilerplugins/clang/vclwidgets.cxx
index ea0cdff..6873ae2 100644
--- a/compilerplugins/clang/vclwidgets.cxx
+++ b/compilerplugins/clang/vclwidgets.cxx
@@ -59,7 +59,7 @@ static bool startsWith(const std::string& s, const char* 
other)
 
 bool BaseCheckNotWindowSubclass(
 const CXXRecordDecl *BaseDefinition
-#if __clang_major__ == 3 && __clang_minor__ < 7
+#if __clang_major__ == 3 && __clang_minor__ <= 7
 , void *
 #endif
 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 sc/source/filter/excel/xipivot.cxx |   12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

New commits:
commit f09a91630c767370871389c28b81280807513431
Author: Eike Rathke 
Date:   Mon Sep 21 15:26:50 2015 +0200

Resolves: rhbz#1264585 check data pilot field name availability

Change-Id: Iaadf7044acb7299ee878de2fbc08992447587d62

diff --git a/sc/source/filter/excel/xipivot.cxx 
b/sc/source/filter/excel/xipivot.cxx
index aa8c7de..224c4d0 100644
--- a/sc/source/filter/excel/xipivot.cxx
+++ b/sc/source/filter/excel/xipivot.cxx
@@ -1031,13 +1031,19 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& 
rSaveData ) const
 
 XclPTDataFieldInfoList::const_iterator aIt = maDataInfoList.begin(), aEnd 
= maDataInfoList.end();
 
-ScDPSaveDimension& rSaveDim = *rSaveData.GetNewDimensionByName(aFieldName);
-ConvertDataField( rSaveDim, *aIt );
+ScDPSaveDimension* pSaveDim = rSaveData.GetNewDimensionByName(aFieldName);
+if (!pSaveDim)
+{
+SAL_WARN("sc.filter","XclImpPTField::ConvertDataField - field name not 
found: " << aFieldName);
+return;
+}
+
+ConvertDataField( *pSaveDim, *aIt );
 
 // multiple data fields -> clone dimension
 for( ++aIt; aIt != aEnd; ++aIt )
 {
-ScDPSaveDimension& rDupDim = rSaveData.DuplicateDimension( rSaveDim );
+ScDPSaveDimension& rDupDim = rSaveData.DuplicateDimension( *pSaveDim );
 ConvertDataFieldInfo( rDupDim, *aIt );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sw/source/core/doc/DocumentStylePoolManager.cxx |   70 ++--
 1 file changed, 43 insertions(+), 27 deletions(-)

New commits:
commit 41139b2261fb93886a8ba28d081b2d12a2f7835a
Author: Samuel Mehrbrodt 
Date:   Mon Sep 21 14:48:17 2015 +0200

Cleanup: One statement per line

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

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 3a7567b..71fbb0c 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -245,9 +245,12 @@ namespace
 SwTwips nUpper, SwTwips nLower )
 {
 
-SvxLRSpaceItem aLR( RES_LR_SPACE ); SvxULSpaceItem aUL( RES_UL_SPACE );
-aLR.SetTextFirstLineOfst( sal_uInt16(nEZ) ); aLR.SetTextLeft( 
sal_uInt16(nLeft) );
-aUL.SetUpper( sal_uInt16(nUpper) ); aUL.SetLower( sal_uInt16(nLower) );
+SvxLRSpaceItem aLR( RES_LR_SPACE );
+SvxULSpaceItem aUL( RES_UL_SPACE );
+aLR.SetTextFirstLineOfst( sal_uInt16(nEZ) );
+aLR.SetTextLeft( sal_uInt16(nLeft) );
+aUL.SetUpper( sal_uInt16(nUpper) );
+aUL.SetLower( sal_uInt16(nLower) );
 rSet.Put( aLR );
 rSet.Put( aUL );
 
@@ -370,8 +373,7 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 
 case RES_POOLCOLL_TEXT: // Text body
 {
-SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT,
-RES_PARATR_LINESPACING );
+SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT, 
RES_PARATR_LINESPACING );
 SvxULSpaceItem aUL( 0, PT_7, RES_UL_SPACE );
 aLSpc.SetPropLineSpace( (const sal_uInt8) 120 );
 if( 
m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) ) 
aUL.SetLower( HTML_PARSPACE );
@@ -391,7 +393,8 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 SvxLRSpaceItem aLR( RES_LR_SPACE );
 aLR.SetTextFirstLineOfst( -(short)GetMetricVal( CM_05 ));
 aLR.SetTextLeft( GetMetricVal( CM_1 ));
-SvxTabStopItem aTStops(RES_PARATR_TABSTOP);aTStops.Insert( 
SvxTabStop( 0 ));
+SvxTabStopItem aTStops(RES_PARATR_TABSTOP);
+aTStops.Insert( SvxTabStop( 0 ));
 
 aSet.Put( aLR );
 aSet.Put( aTStops );
@@ -411,7 +414,8 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 aLR.SetTextFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
   GetMetricVal( CM_05)) );
 aLR.SetTextLeft( GetMetricVal( CM_1 ) * 5 );
-SvxTabStopItem aTStops( RES_PARATR_TABSTOP );
aTStops.Insert( SvxTabStop( 0 ));
+SvxTabStopItem aTStops( RES_PARATR_TABSTOP );
+aTStops.Insert( SvxTabStop( 0 ));
 
 aSet.Put( aLR );
 aSet.Put( aTStops );
@@ -486,7 +490,8 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 case RES_POOLCOLL_SIGNATURE:// Signatures
 case RES_POOLCOLL_TABLE:// Tabele content
 {
-SwFormatLineNumber aLN; aLN.SetCountLines( false );
+SwFormatLineNumber aLN;
+aLN.SetCountLines( false );
 aSet.Put( aLN );
 }
 break;
@@ -572,7 +577,8 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 case RES_POOLCOLL_FOOTERL:
 case RES_POOLCOLL_FOOTERR:
 {
-SwFormatLineNumber aLN; aLN.SetCountLines( false );
+SwFormatLineNumber aLN;
+aLN.SetCountLines( false );
 aSet.Put( aLN );
 
 long nRightMargin = lcl_GetRightMargin( m_rDoc );
@@ -589,7 +595,8 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 {
 SetAllScriptItem( aSet, SvxWeightItem( WEIGHT_BOLD, 
RES_CHRATR_WEIGHT ) );
 aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST 
) );
-SwFormatLineNumber aLN; aLN.SetCountLines( false );
+SwFormatLineNumber aLN;
+aLN.SetCountLines( false );
 aSet.Put( aLN );
 }
 break;
@@ -602,18 +609,22 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 aLR.SetTextLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) 
);
 SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, 
RES_CHRATR_FONTSIZE ) );
 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

[Julien Nabet]

 vcl/unx/generic/app/saldisp.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit cc7edea1be64c2050664b9a4b40192baa3d067ea
Author: Julien Nabet 
Date:   Fri Sep 18 22:48:55 2015 +0200

tdf#94275: core dump when XKeysymToString returns NULL

0  strlen () at ../sysdeps/x86_64/strlen.S:106
1  0x7fffdfd69083 in SalDisplay::GetKeyNameFromKeySym 
(this=this@entry=0x1121b30, nKeySym=)
at 
/build/libreoffice-Ke3JzN/libreoffice-5.0.1~rc2/vcl/unx/generic/app/saldisp.cxx:744
2  0x7fffdfd696f5 in SalDisplay::GetKeyName (this=0x1121b30, 
nKeyCode=nKeyCode@entry=9476) at 
/build/libreoffice-Ke3JzN/libreoffice-5.0.1~rc2/vcl/unx/generic/app/saldisp.cxx:798
3  0x7fffe17892a2 in GtkSalFrame::GetKeyName (this=, 
nKeyCode=) at 
/build/libreoffice-Ke3JzN/libreoffice-5.0.1~rc2/vcl/unx/gtk/window/gtksalframe.cxx:3005
4  0x76125bbc in vcl::KeyCode::GetName 
(this=this@entry=0x7fffbfb0, pWindow=, pWindow@entry=0x0)
   at 
/build/libreoffice-Ke3JzN/libreoffice-5.0.1~rc2/vcl/source/window/keycod.cxx:108

Thank you Alex Bennée for having noticed this.

Change-Id: I4fa89241c72144d5c76cd6175368c6878fc57a46
Reviewed-on: https://gerrit.libreoffice.org/18708
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit e7ff9ade29aff212b2e2728a15bbf5a11f5b8717)
Reviewed-on: https://gerrit.libreoffice.org/18744

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 0810641..ff71bc6 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -741,11 +741,16 @@ OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym 
) const
 if( aRet.isEmpty() )
 {
 const char *pString = XKeysymToString( nKeySym );
-int n = strlen( pString );
-if( n > 2 && pString[n-2] == '_' )
-aRet = OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 
);
+if (pString)
+{
+int n = strlen( pString );
+if( n > 2 && pString[n-2] == '_' )
+aRet = OUString( pString, n-2, 
RTL_TEXTENCODING_ISO_8859_1 );
+else
+aRet = OUString( pString, n, 
RTL_TEXTENCODING_ISO_8859_1 );
+}
 else
-aRet = OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
+aRet = "???";
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/appl/appcfg.cxx  |2 +-
 sfx2/source/appl/appdata.cxx |5 -
 sfx2/source/appl/appdde.cxx  |4 ++--
 sfx2/source/appl/appserv.cxx |2 +-
 sfx2/source/appl/appuno.cxx  |4 ++--
 sfx2/source/appl/helpinterceptor.hxx |2 +-
 sfx2/source/appl/imestatuswindow.cxx |2 +-
 sfx2/source/appl/imestatuswindow.hxx |2 +-
 sfx2/source/appl/linksrc.cxx |6 +++---
 sfx2/source/appl/newhelp.hxx |6 +++---
 sfx2/source/appl/sfxhelp.cxx |2 +-
 sfx2/source/appl/shutdownicon.hxx|2 +-
 sfx2/source/bastyp/fltfnc.cxx|   14 +++---
 sfx2/source/bastyp/fltlst.cxx|2 +-
 sfx2/source/bastyp/progress.cxx  |2 +-
 sfx2/source/control/itemdel.cxx  |2 +-
 sfx2/source/control/request.cxx  |   30 +++---
 store/source/store.cxx   |2 +-
 sw/qa/core/data/ww8/pass/hang-9.doc  |binary
 sw/source/filter/ww8/ww8scan.cxx |   12 
 20 files changed, 55 insertions(+), 48 deletions(-)

New commits:
commit a2b90cd04733c2ec3b9cb3bb56d95f3298571ecc
Author: Caolán McNamara 
Date:   Mon Sep 21 12:14:19 2015 +0100

don't hang on busted subdocument offsets

Change-Id: I5d1d18f864496ec98894703f0a22e211a9dd14a5

diff --git a/sw/qa/core/data/ww8/pass/hang-9.doc 
b/sw/qa/core/data/ww8/pass/hang-9.doc
new file mode 100644
index 000..4e9e412
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/hang-9.doc differ
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index 683b296..35848d8 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -4409,11 +4409,15 @@ void WW8PLCFxDesc::ReduceByOffset()
 else
 nStartPos -= nCpOfs;
 }
-if( nEndPos != WW8_CP_MAX )
+if (nEndPos != WW8_CP_MAX)
 {
-OSL_ENSURE(nCpOfs <= nEndPos,
-"oh oh, so much for the subdocument piece theory");
-nEndPos   -= nCpOfs;
+if (nCpOfs > nEndPos)
+{
+SAL_WARN("sw.ww8", "broken subdocument piece entry");
+nEndPos = WW8_CP_MAX;
+}
+else
+nEndPos -= nCpOfs;
 }
 }
 
commit 951dbdd13100f92fb3ded20fd8d14ca645c4af37
Author: Caolán McNamara 
Date:   Mon Sep 21 11:44:39 2015 +0100

cppcheck: noExplicitConstructor

Change-Id: I53f9965609c04fd2f0b955fd04de8fc953917344

diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 54cd152..0b8818e 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -89,7 +89,7 @@ class SfxEventAsyncer_Impl : public SfxListener
 public:
 
 virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint ) 
SAL_OVERRIDE;
-SfxEventAsyncer_Impl( const SfxEventHint& rHint );
+explicit SfxEventAsyncer_Impl(const SfxEventHint& rHint);
 virtual ~SfxEventAsyncer_Impl();
 DECL_LINK_TYPED( IdleHdl, Idle*, void );
 };
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 4e98840..ec09c13 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -62,7 +62,10 @@ private:
 SfxAppData_Impl& m_rAppData;
 
 public:
-SfxBasicManagerCreationListener( SfxAppData_Impl& _rAppData ) :m_rAppData( 
_rAppData ) { }
+explicit SfxBasicManagerCreationListener(SfxAppData_Impl& _rAppData)
+: m_rAppData(_rAppData)
+{
+}
 
 virtual ~SfxBasicManagerCreationListener();
 
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 233a2a0..0013924 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -64,7 +64,7 @@ OUString SfxDdeServiceName_Impl( const OUString& sIn )
 class ImplDdeService : public DdeService
 {
 public:
-ImplDdeService( const OUString& rNm )
+explicit ImplDdeService( const OUString& rNm )
 : DdeService( rNm )
 {}
 virtual bool MakeTopic( const OUString& );
@@ -217,7 +217,7 @@ public:
 DdeData aData;
 ::com::sun::star::uno::Sequence< sal_Int8 > aSeq;
 
-SfxDdeDocTopic_Impl( SfxObjectShell* pShell )
+explicit SfxDdeDocTopic_Impl( SfxObjectShell* pShell )
 : DdeTopic( pShell->GetTitle(SFX_TITLE_FULLNAME) ), pSh( pShell )
 {}
 
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 1d6798d..69073f9 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -244,7 +244,7 @@ namespace
 private:
 DECL_LINK_TYPED(ShowHdl, Button*, void);
 public:
-LicenseDialog(vcl::Window *pParent=NULL);
+explicit LicenseDialog(vcl::Window *pParent=NULL);
 };
 
 LicenseDialog::LicenseDialog(vcl::Window *pParent)
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 28f7f0a..c856fed 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -1716,7 +1716,7 @@ class RequestPackageReparation_Impl : public 
::cppu::WeakIm

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

[Julien Nabet]

 vcl/unx/generic/app/saldisp.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit e7ff9ade29aff212b2e2728a15bbf5a11f5b8717
Author: Julien Nabet 
Date:   Fri Sep 18 22:48:55 2015 +0200

tdf#94275: core dump when XKeysymToString returns NULL

0  strlen () at ../sysdeps/x86_64/strlen.S:106
1  0x7fffdfd69083 in SalDisplay::GetKeyNameFromKeySym 
(this=this@entry=0x1121b30, nKeySym=)
at 
/build/libreoffice-Ke3JzN/libreoffice-5.0.1~rc2/vcl/unx/generic/app/saldisp.cxx:744
2  0x7fffdfd696f5 in SalDisplay::GetKeyName (this=0x1121b30, 
nKeyCode=nKeyCode@entry=9476) at 
/build/libreoffice-Ke3JzN/libreoffice-5.0.1~rc2/vcl/unx/generic/app/saldisp.cxx:798
3  0x7fffe17892a2 in GtkSalFrame::GetKeyName (this=, 
nKeyCode=) at 
/build/libreoffice-Ke3JzN/libreoffice-5.0.1~rc2/vcl/unx/gtk/window/gtksalframe.cxx:3005
4  0x76125bbc in vcl::KeyCode::GetName 
(this=this@entry=0x7fffbfb0, pWindow=, pWindow@entry=0x0)
   at 
/build/libreoffice-Ke3JzN/libreoffice-5.0.1~rc2/vcl/source/window/keycod.cxx:108

Thank you Alex Bennée for having noticed this.

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

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 9f08021..4b47eda 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -741,11 +741,16 @@ OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym 
) const
 if( aRet.isEmpty() )
 {
 const char *pString = XKeysymToString( nKeySym );
-int n = strlen( pString );
-if( n > 2 && pString[n-2] == '_' )
-aRet = OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 
);
+if (pString)
+{
+int n = strlen( pString );
+if( n > 2 && pString[n-2] == '_' )
+aRet = OUString( pString, n-2, 
RTL_TEXTENCODING_ISO_8859_1 );
+else
+aRet = OUString( pString, n, 
RTL_TEXTENCODING_ISO_8859_1 );
+}
 else
-aRet = OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
+aRet = "???";
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 wizards/com/sun/star/wizards/common/SystemDialog.py |2 -
 wizards/com/sun/star/wizards/web/WWD_Events.py  |   28 
 wizards/com/sun/star/wizards/web/WebWizardConst.py  |2 -
 3 files changed, 8 insertions(+), 24 deletions(-)

New commits:
commit af814158b101418adad4f9a21d3b2303620b0396
Author: Julien Nabet 
Date:   Sat Sep 19 09:44:02 2015 +0200

tdf#94351: Web Wizard multiselection doesn't work

Call getSelectedFiles instead of getFiles+adapt behavior so it deals
with an array of files with their full path

Change-Id: I21b6c32dea85460461925a9b44dac195d79b7eac
Reviewed-on: https://gerrit.libreoffice.org/18714
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.py 
b/wizards/com/sun/star/wizards/common/SystemDialog.py
index dc0b3f4..e1bb6bf 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.py
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.py
@@ -113,7 +113,7 @@ class SystemDialog(object):
 self.systemDialog.setMultiSelectionMode(multiSelect)
 self.systemDialog.setDisplayDirectory(self.subst(displayDirectory))
 if self.execute(self.systemDialog):
-return self.systemDialog.getFiles()
+return self.systemDialog.getSelectedFiles()
 
 except Exception:
 traceback.print_exc()
diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py 
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index c5dc75e..03f2e12 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -894,39 +894,23 @@ class WWD_Events(WWD_Startup):
 def loadDocuments(self):
 offset = self.parent.selectedDoc[0] + 1 if 
(len(self.parent.selectedDoc) > 0) else self.parent.getDocsCount()
 
-'''
-if the user chose one file, the list starts at 0,
-if he chose more than one, the first entry is a directory name,
-all the others are filenames.
-'''
-if len(self.files) > 1:
-start = 1
-else:
-start = 0
-
 #Number of documents failed to validate.
 failed = 0
 
 # store the directory
-if start == 1:
-self.parent.settings.cp_DefaultSession.cp_InDirectory = 
self.files[0]
-else:
-self.parent.settings.cp_DefaultSession.cp_InDirectory = \
-FileAccess.getParentDir(self.files[0])
+self.parent.settings.cp_DefaultSession.cp_InDirectory = \
+FileAccess.getParentDir(self.files[0])
 
 '''
 Here i go through each file, and validate it.
 If its ok, I add it to the ListModel/ConfigSet
 '''
 
-for i in range(start, len(self.files)):
+for i in range(0, len(self.files)):
 doc = CGDocument()
 doc.setRoot(self.parent.settings)
 
-if start == 0:
-doc.cp_URL = self.files[i]
-else:
-doc.cp_URL = FileAccess.connectURLs(self.files[0], 
self.files[i])
+doc.cp_URL = self.files[i]
 
 '''
 so - i check each document and if it is ok I add it.
@@ -935,14 +919,14 @@ class WWD_Events(WWD_Startup):
 done in the checkDocument(...) method
 '''
 if self.parent.checkDocument(doc, self.task, self.xC):
-index = offset + i - failed - start
+index = offset + i - failed
 
self.parent.settings.cp_DefaultSession.cp_Content.cp_Documents.add(index, doc)
 else:
 failed += 1
 
 # if any documents where added,
 # set the first one to be the current-selected document.
-if len(self.files) > start + failed:
+if len(self.files) > failed:
 self.parent.setSelectedDoc([offset])
 
 # update the ui...
diff --git a/wizards/com/sun/star/wizards/web/WebWizardConst.py 
b/wizards/com/sun/star/wizards/web/WebWizardConst.py
index f6a2282..363ecd8 100644
--- a/wizards/com/sun/star/wizards/web/WebWizardConst.py
+++ b/wizards/com/sun/star/wizards/web/WebWizardConst.py
@@ -55,4 +55,4 @@ TASK_FINISH = "t_fin"
 when the user adds more than this number
 of documents to the list, a status dialog opens.
 '''
-MIN_ADD_FILES_FOR_DIALOG = 2
+MIN_ADD_FILES_FOR_DIALOG = 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - wizards/com

[Julien Nabet]

 wizards/com/sun/star/wizards/web/WWD_Events.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7a4edfbc4bce290e4e26f55728f670bf24423151
Author: Julien Nabet 
Date:   Sat Sep 19 14:51:24 2015 +0200

tdf#92934: Web Wizard: Cannot Export Zip archive

pubAware_ adds 2 elements for each of these:
LOCAL_PUBLISHER, ZIP_PUBLISHER, FTP_PUBLISHER
and since ZIP_PUBLISHER is added in second positon,
the right index is 2 not 4

Change-Id: I0a533fd0cefcbbfca0e95628f64fac6258019600
Reviewed-on: https://gerrit.libreoffice.org/18715
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 
(cherry picked from commit e72a4a3c2e1608e301daef0b6e87cc70d814e736)
Reviewed-on: https://gerrit.libreoffice.org/18717
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/wizards/com/sun/star/wizards/web/WWD_Events.py 
b/wizards/com/sun/star/wizards/web/WWD_Events.py
index 4f2208c..42b4184 100644
--- a/wizards/com/sun/star/wizards/web/WWD_Events.py
+++ b/wizards/com/sun/star/wizards/web/WWD_Events.py
@@ -459,7 +459,7 @@ class WWD_Events(WWD_Startup):
 zipFile = sd.callStoreDialog(
 self.settings.cp_DefaultSession.cp_OutDirectory,
 self.resources.resDefaultArchiveFilename)
-self.setPublishUrl(ZIP_PUBLISHER, zipFile, 4)
+self.setPublishUrl(ZIP_PUBLISHER, zipFile, 2)
 self.getPublisher(ZIP_PUBLISHER).overwriteApproved = True
 
 '''
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mark Hung]

 sw/source/core/doc/extinput.cxx |   43 +++-
 1 file changed, 25 insertions(+), 18 deletions(-)

New commits:
commit e7760d428bc82ccfcae14f1907b78f9f1013b88c
Author: Mark Hung 
Date:   Tue Sep 8 07:29:38 2015 +0800

Fix tdf#87500 - Freeze with English/Japanese mixture undo.

Language poolitem will be inserted after user completes editing
with IME, making it refer to valid range when undo.

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

diff --git a/sw/source/core/doc/extinput.cxx b/sw/source/core/doc/extinput.cxx
index 362842a..9e82eca 100644
--- a/sw/source/core/doc/extinput.cxx
+++ b/sw/source/core/doc/extinput.cxx
@@ -59,6 +59,9 @@ SwExtTextInput::~SwExtTextInput()
 sal_Int32 nEndCnt = GetMark()->nContent.GetIndex();
 if( nEndCnt != nSttCnt )
 {
+// Prevent IME edited text being grouped with non-IME edited text.
+bool bKeepGroupUndo = pDoc->GetIDocumentUndoRedo().DoesGroupUndo();
+pDoc->GetIDocumentUndoRedo().DoGroupUndo(false);
 if( nEndCnt < nSttCnt )
 {
 std::swap(nSttCnt, nEndCnt);
@@ -66,24 +69,6 @@ SwExtTextInput::~SwExtTextInput()
 
 // In order to get Undo/Redlining etc. working correctly,
 // we need to go through the Doc interface
-if(eInputLanguage != LANGUAGE_DONTKNOW)
-{
-// #i41974# Only set language attribute
-// for CJK/CTL scripts.
-bool bLang = true;
-sal_uInt16 nWhich = RES_CHRATR_LANGUAGE;
-
switch(SvtLanguageOptions::GetI18NScriptTypeOfLanguage(eInputLanguage))
-{
-case  i18n::ScriptType::ASIAN: nWhich = 
RES_CHRATR_CJK_LANGUAGE; break;
-case  i18n::ScriptType::COMPLEX:   nWhich = 
RES_CHRATR_CTL_LANGUAGE; break;
-default: bLang = false;
-}
-if ( bLang )
-{
-SvxLanguageItem aLangItem( eInputLanguage, nWhich );
-
pDoc->getIDocumentContentOperations().InsertPoolItem(*this, aLangItem );
-}
-}
 rIdx = nSttCnt;
 const OUString sText( pTNd->GetText().copy(nSttCnt, nEndCnt - 
nSttCnt));
 if( bIsOverwriteCursor && !sOverwriteText.isEmpty() )
@@ -124,6 +109,28 @@ SwExtTextInput::~SwExtTextInput()
 pDoc->getIDocumentContentOperations().InsertString( *this, 
sText );
 }
 }
+pDoc->GetIDocumentUndoRedo().DoGroupUndo(bKeepGroupUndo);
+if (eInputLanguage != LANGUAGE_DONTKNOW)
+{
+sal_uInt16 nWhich = RES_CHRATR_LANGUAGE;
+sal_Int16 nScriptType = 
SvtLanguageOptions::GetI18NScriptTypeOfLanguage(eInputLanguage);
+switch(nScriptType)
+{
+case  i18n::ScriptType::ASIAN:
+nWhich = RES_CHRATR_CJK_LANGUAGE; break;
+case  i18n::ScriptType::COMPLEX:
+nWhich = RES_CHRATR_CTL_LANGUAGE; break;
+}
+// #i41974# Only set language attribute for CJK/CTL scripts.
+if (RES_CHRATR_LANGUAGE != nWhich && pTNd->GetLang( nSttCnt, 
nEndCnt-nSttCnt, nScriptType) != eInputLanguage)
+{
+SvxLanguageItem aLangItem( eInputLanguage, nWhich );
+rIdx = nSttCnt;
+GetMark()->nContent = nEndCnt;
+
pDoc->getIDocumentContentOperations().InsertPoolItem(*this, aLangItem );
+}
+
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 slideshow/source/engine/smilfunctionparser.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 4c657f5a1a340ec9afe795d911625991f6a9cf7a
Author: Stephan Bergmann 
Date:   Mon Sep 21 12:05:25 2015 +0200

Properly #if these debug hooks

...moved here with 6fbab2ce87372bd98275d8239cd782d0ca6375e8 
"loplugin:unreffun";
this file still indirectly includes boost/scoped_ptr.hpp via. boost/spirit

Change-Id: Ib2f251420950395f58415c1f7c944b7e8fd61476

diff --git a/slideshow/source/engine/smilfunctionparser.cxx 
b/slideshow/source/engine/smilfunctionparser.cxx
index 3cc64da..2dd955f 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -626,6 +626,8 @@ namespace slideshow
 }
 }
 
+#if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
+
 // debug hooks
 
 namespace boost
@@ -641,4 +643,6 @@ void sp_scalar_destructor_hook(void *)
 
 }
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 73/f626dc527a97e4c96d6eeb509bff55e24400c8

[Caolán McNamara]

 73/f626dc527a97e4c96d6eeb509bff55e24400c8 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1c6694c3524186c7378682eb0b1b11521babc33c
Author: Caolán McNamara 
Date:   Mon Sep 21 10:18:33 2015 +0100

Notes added by 'git notes add'

diff --git a/73/f626dc527a97e4c96d6eeb509bff55e24400c8 
b/73/f626dc527a97e4c96d6eeb509bff55e24400c8
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/73/f626dc527a97e4c96d6eeb509bff55e24400c8
@@ -0,0 +1 @@
+ignore: googletest
___
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' - 06/de7664d7c85390f3780f5025f69f08d4116867

[Caolán McNamara]

 06/de7664d7c85390f3780f5025f69f08d4116867 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit ad3954413c0c74317e5ae32d282c6b0bf24aee80
Author: Caolán McNamara 
Date:   Mon Sep 21 10:18:09 2015 +0100

Notes added by 'git notes add'

diff --git a/06/de7664d7c85390f3780f5025f69f08d4116867 
b/06/de7664d7c85390f3780f5025f69f08d4116867
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/06/de7664d7c85390f3780f5025f69f08d4116867
@@ -0,0 +1 @@
+ignore: googletest
___
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' - 93/dbde5274464c89de5cd55bea70491e043bc9b4

[Caolán McNamara]

 93/dbde5274464c89de5cd55bea70491e043bc9b4 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 09d700761e90b8bfffd1e4c5a3f195ed03df0298
Author: Caolán McNamara 
Date:   Mon Sep 21 10:17:46 2015 +0100

Notes added by 'git notes add'

diff --git a/93/dbde5274464c89de5cd55bea70491e043bc9b4 
b/93/dbde5274464c89de5cd55bea70491e043bc9b4
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/93/dbde5274464c89de5cd55bea70491e043bc9b4
@@ -0,0 +1 @@
+ignore: googletest
___
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' - fa/ff774b727508f7eb088a18a8d3b46f4a51a6af

[Caolán McNamara]

 fa/ff774b727508f7eb088a18a8d3b46f4a51a6af |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a3dbc880b480994bc1765646d1b40d9bd58441ff
Author: Caolán McNamara 
Date:   Mon Sep 21 10:16:58 2015 +0100

Notes added by 'git notes add'

diff --git a/fa/ff774b727508f7eb088a18a8d3b46f4a51a6af 
b/fa/ff774b727508f7eb088a18a8d3b46f4a51a6af
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/fa/ff774b727508f7eb088a18a8d3b46f4a51a6af
@@ -0,0 +1 @@
+ignore: googletest
___
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' - d7/b7943aa73e3d39f3e6c7b594ec16145aa96494

[Caolán McNamara]

 d7/b7943aa73e3d39f3e6c7b594ec16145aa96494 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 891cafb431690a2ee5560811af29541e71a69c71
Author: Caolán McNamara 
Date:   Mon Sep 21 10:17:19 2015 +0100

Notes added by 'git notes add'

diff --git a/d7/b7943aa73e3d39f3e6c7b594ec16145aa96494 
b/d7/b7943aa73e3d39f3e6c7b594ec16145aa96494
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/d7/b7943aa73e3d39f3e6c7b594ec16145aa96494
@@ -0,0 +1 @@
+ignore: googletest
___
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' - 20/1e6e9f5459adf7acac04f64a8b5de3944e1943

[Caolán McNamara]

 20/1e6e9f5459adf7acac04f64a8b5de3944e1943 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7992a3096110c1c5a04d4b3712cc0fbc41782bca
Author: Caolán McNamara 
Date:   Mon Sep 21 10:16:33 2015 +0100

Notes added by 'git notes add'

diff --git a/20/1e6e9f5459adf7acac04f64a8b5de3944e1943 
b/20/1e6e9f5459adf7acac04f64a8b5de3944e1943
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/20/1e6e9f5459adf7acac04f64a8b5de3944e1943
@@ -0,0 +1 @@
+ignore: googletest
___
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/e9a481c2c5ec461434e93b1d41937dca30ce03

[Caolán McNamara]

 f2/e9a481c2c5ec461434e93b1d41937dca30ce03 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8f447e36a6abee1c8f23c8b38cb76245068f11b2
Author: Caolán McNamara 
Date:   Mon Sep 21 10:15:56 2015 +0100

Notes added by 'git notes add'

diff --git a/f2/e9a481c2c5ec461434e93b1d41937dca30ce03 
b/f2/e9a481c2c5ec461434e93b1d41937dca30ce03
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/f2/e9a481c2c5ec461434e93b1d41937dca30ce03
@@ -0,0 +1 @@
+ignore: googletest
___
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' - 2 commits - 85/d23a62a5032a663a3867c2cd68fa12c0a5b022 eb/80254927fe946fce3461da934bc321ae2f14f7

[Caolán McNamara]

 85/d23a62a5032a663a3867c2cd68fa12c0a5b022 |1 +
 eb/80254927fe946fce3461da934bc321ae2f14f7 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 60f3108a6815dd83d67e05600a4e8f4ae4ba4881
Author: Caolán McNamara 
Date:   Mon Sep 21 10:15:25 2015 +0100

Notes added by 'git notes add'

diff --git a/eb/80254927fe946fce3461da934bc321ae2f14f7 
b/eb/80254927fe946fce3461da934bc321ae2f14f7
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/eb/80254927fe946fce3461da934bc321ae2f14f7
@@ -0,0 +1 @@
+ignore: googletest
commit 9c475c4d30e73757d612bc566e466cb175651f70
Author: Caolán McNamara 
Date:   Mon Sep 21 10:15:15 2015 +0100

Notes added by 'git notes add'

diff --git a/85/d23a62a5032a663a3867c2cd68fa12c0a5b022 
b/85/d23a62a5032a663a3867c2cd68fa12c0a5b022
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/85/d23a62a5032a663a3867c2cd68fa12c0a5b022
@@ -0,0 +1 @@
+ignore: googletest
___
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' - 2 commits - 97/ecdde80124d44cdcaec2bddc061851a50bcaf1 9d/56aa1540dd2b109220f121d8d2384b7ceb2434

[Caolán McNamara]

 97/ecdde80124d44cdcaec2bddc061851a50bcaf1 |1 +
 9d/56aa1540dd2b109220f121d8d2384b7ceb2434 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 863f4112f1967091bcf5f5ba43475dc761760212
Author: Caolán McNamara 
Date:   Mon Sep 21 10:15:03 2015 +0100

Notes added by 'git notes add'

diff --git a/97/ecdde80124d44cdcaec2bddc061851a50bcaf1 
b/97/ecdde80124d44cdcaec2bddc061851a50bcaf1
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/97/ecdde80124d44cdcaec2bddc061851a50bcaf1
@@ -0,0 +1 @@
+ignore: googletest
commit 28bf40bc90c1e55a8cd24d4182ee31cf0539
Author: Caolán McNamara 
Date:   Mon Sep 21 10:14:52 2015 +0100

Notes added by 'git notes add'

diff --git a/9d/56aa1540dd2b109220f121d8d2384b7ceb2434 
b/9d/56aa1540dd2b109220f121d8d2384b7ceb2434
new file mode 100644
index 000..a5c0c77
--- /dev/null
+++ b/9d/56aa1540dd2b109220f121d8d2384b7ceb2434
@@ -0,0 +1 @@
+ignore: googletest
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

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

New commits:
commit d66d6d70591049ccf99f22d3f52e85f26dbfe433
Author: Caolán McNamara 
Date:   Mon Sep 21 09:43:05 2015 +0100

valgrind: use of uninit data in sw_globalfilter test

Change-Id: I4d327d1e65c8ef5b9dede18ac55f1658d8e3569a

diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index e0d6a88..c8a8dc2 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -82,7 +82,7 @@ long ZCodec::EndCompression()
 {
 long retvalue = 0;
 
-if (meState != STATE_INIT)
+if (mbStatus && meState != STATE_INIT)
 {
 if (meState == STATE_COMPRESS)
 {
@@ -106,7 +106,7 @@ long ZCodec::EndCompression()
 delete[] mpInBuf;
 meState = STATE_INIT;
 }
-return ( mbStatus ) ? retvalue : -1;
+return mbStatus ? retvalue : -1;
 }
 
 long ZCodec::Compress( SvStream& rIStm, SvStream& rOStm )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 slideshow/source/engine/smilfunctionparser.cxx |   15 +++
 slideshow/source/engine/sp_debug.cxx   |8 
 2 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit 6fbab2ce87372bd98275d8239cd782d0ca6375e8
Author: Stephan Bergmann 
Date:   Mon Sep 21 10:31:14 2015 +0200

loplugin:unreffun

Change-Id: I526b9e1cff25a30c3f6b935c1a11ef571f7a12ea

diff --git a/slideshow/source/engine/smilfunctionparser.cxx 
b/slideshow/source/engine/smilfunctionparser.cxx
index 7ded14f..3cc64da 100644
--- a/slideshow/source/engine/smilfunctionparser.cxx
+++ b/slideshow/source/engine/smilfunctionparser.cxx
@@ -626,4 +626,19 @@ namespace slideshow
 }
 }
 
+// debug hooks
+
+namespace boost
+{
+
+void sp_scalar_constructor_hook(void *)
+{
+}
+
+void sp_scalar_destructor_hook(void *)
+{
+}
+
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/slideshow/source/engine/sp_debug.cxx 
b/slideshow/source/engine/sp_debug.cxx
index 0a68607..38d507a 100644
--- a/slideshow/source/engine/sp_debug.cxx
+++ b/slideshow/source/engine/sp_debug.cxx
@@ -198,10 +198,6 @@ std::size_t find_unreachable_objects(bool report)
 namespace boost
 {
 
-void sp_scalar_constructor_hook(void *)
-{
-}
-
 void sp_scalar_constructor_hook(void * px, std::size_t size, void * pn)
 {
 #ifdef BOOST_HAS_THREADS
@@ -213,10 +209,6 @@ void sp_scalar_constructor_hook(void * px, std::size_t 
size, void * pn)
 get_map()[pn] = std::make_pair(px, size);
 }
 
-void sp_scalar_destructor_hook(void *)
-{
-}
-
 void sp_scalar_destructor_hook(void *, std::size_t, void * pn)
 {
 #ifdef BOOST_HAS_THREADS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Samuel Mehrbrodt]

 sw/source/core/doc/DocumentStylePoolManager.cxx |9 ++---
 sw/source/core/doc/docnum.cxx   |1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 6afa5614463fbc952d5a983c813d587edbc82fac
Author: Samuel Mehrbrodt 
Date:   Mon Sep 21 08:46:01 2015 +0200

Cleanup: Remove superfluous comment

No need to mention that there has been a check for some state sometime.

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

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 3fd845b..3a7567b 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -204,15 +204,10 @@ namespace
 pColl->SetFormatAttr( aLR );
 }
 
-// #i71764#
-// Check on document setting 
OUTLINE_LEVEL_YIELDS_OUTLINE_RULE no longer needed.
 // All paragraph styles, which are assigned to a level of 
the
 // outline style has to have the outline style set as its 
list style.
-{
-SwNumRuleItem aItem(pOutlineRule->GetName());
-
-pColl->SetFormatAttr(aItem);
-}
+SwNumRuleItem aItem(pOutlineRule->GetName());
+pColl->SetFormatAttr(aItem);
 }
 }
 pColl->SetNextTextFormatColl( 
*pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 787558f..ea9c695 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -158,7 +158,6 @@ void SwDoc::PropagateOutlineRule()
 // Check only the list style, which is set at the paragraph style
 const SwNumRuleItem & rCollRuleItem = pColl->GetNumRule( false );
 
-// Check on document setting OUTLINE_LEVEL_YIELDS_OUTLINE_RULE no 
longer needed.
 if ( rCollRuleItem.GetValue().isEmpty() )
 {
 SwNumRule * pMyOutlineRule = GetOutlineNumRule();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sc/inc/hints.hxx|   12 +---
 sc/source/core/tool/hints.cxx   |8 
 sc/source/ui/unoobj/linkuno.cxx |6 +++---
 3 files changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 921686a827e663199c040f376249de727613751f
Author: Noel Grandin 
Date:   Sun Sep 20 21:21:54 2015 +0200

convert SC_LINKREFTYPE to scoped enum

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

diff --git a/sc/inc/hints.hxx b/sc/inc/hints.hxx
index cedbb00..f219973 100644
--- a/sc/inc/hints.hxx
+++ b/sc/inc/hints.hxx
@@ -81,15 +81,13 @@ public:
 };
 
 //! move ScLinkRefreshedHint to a different file?
-
-#define SC_LINKREFTYPE_NONE 0
-#define SC_LINKREFTYPE_SHEET1
-#define SC_LINKREFTYPE_AREA 2
-#define SC_LINKREFTYPE_DDE  3
+enum class ScLinkRefType {
+NONE, SHEET, AREA, DDE
+};
 
 class ScLinkRefreshedHint : public SfxHint
 {
-sal_uInt16  nLinkType;  // SC_LINKREFTYPE_...
+ScLinkRefType nLinkType;
 OUStringaUrl;   // used for sheet links
 OUStringaDdeAppl;   // used for dde links:
 OUStringaDdeTopic;
@@ -106,7 +104,7 @@ public:
 voidSetDdeLink( const OUString& rA, const OUString& rT, const 
OUString& rI, sal_uInt8 nM );
 voidSetAreaLink( const ScAddress& rPos );
 
-sal_uInt16  GetLinkType() const { return nLinkType; }
+ScLinkRefType   GetLinkType() const { return nLinkType; }
 const OUString& GetUrl() const  { return aUrl; }
 const OUString& GetDdeAppl() const  { return aDdeAppl; }
 const OUString& GetDdeTopic() const { return aDdeTopic; }
diff --git a/sc/source/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx
index 3d7a69b..3cbd133 100644
--- a/sc/source/core/tool/hints.cxx
+++ b/sc/source/core/tool/hints.cxx
@@ -57,7 +57,7 @@ ScPointerChangedHint::~ScPointerChangedHint()
 //  ScLinkRefreshedHint - a link has been refreshed
 
 ScLinkRefreshedHint::ScLinkRefreshedHint() :
-nLinkType( SC_LINKREFTYPE_NONE ),
+nLinkType( ScLinkRefType::NONE ),
 nDdeMode( 0 )
 {
 }
@@ -68,14 +68,14 @@ ScLinkRefreshedHint::~ScLinkRefreshedHint()
 
 void ScLinkRefreshedHint::SetSheetLink( const OUString& rSourceUrl )
 {
-nLinkType = SC_LINKREFTYPE_SHEET;
+nLinkType = ScLinkRefType::SHEET;
 aUrl = rSourceUrl;
 }
 
 void ScLinkRefreshedHint::SetDdeLink(
 const OUString& rA, const OUString& rT, const OUString& rI, 
sal_uInt8 nM )
 {
-nLinkType = SC_LINKREFTYPE_DDE;
+nLinkType = ScLinkRefType::DDE;
 aDdeAppl  = rA;
 aDdeTopic = rT;
 aDdeItem  = rI;
@@ -84,7 +84,7 @@ void ScLinkRefreshedHint::SetDdeLink(
 
 void ScLinkRefreshedHint::SetAreaLink( const ScAddress& rPos )
 {
-nLinkType = SC_LINKREFTYPE_AREA;
+nLinkType = ScLinkRefType::AREA;
 aDestPos = rPos;
 }
 
diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx
index 693c7d9..eb2b8b9 100644
--- a/sc/source/ui/unoobj/linkuno.cxx
+++ b/sc/source/ui/unoobj/linkuno.cxx
@@ -102,7 +102,7 @@ void ScSheetLinkObj::Notify( SfxBroadcaster&, const 
SfxHint& rHint )
 else if ( dynamic_cast(&rHint) )
 {
 const ScLinkRefreshedHint& rLH = static_cast(rHint);
-if ( rLH.GetLinkType() == SC_LINKREFTYPE_SHEET && rLH.GetUrl() == 
aFileName )
+if ( rLH.GetLinkType() == ScLinkRefType::SHEET && rLH.GetUrl() == 
aFileName )
 Refreshed_Impl();
 }
 }
@@ -628,7 +628,7 @@ void ScAreaLinkObj::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 else if ( dynamic_cast(&rHint) )
 {
 const ScLinkRefreshedHint& rLH = static_cast(rHint);
-if ( rLH.GetLinkType() == SC_LINKREFTYPE_AREA )
+if ( rLH.GetLinkType() == ScLinkRefType::AREA )
 {
 //  get this link to compare dest position
 ScAreaLink* pLink = lcl_GetAreaLink(pDocShell, nPos);
@@ -1074,7 +1074,7 @@ void ScDDELinkObj::Notify( SfxBroadcaster&, const 
SfxHint& rHint )
 else if ( dynamic_cast(&rHint) )
 {
 const ScLinkRefreshedHint& rLH = static_cast(rHint);
-if ( rLH.GetLinkType() == SC_LINKREFTYPE_DDE &&
+if ( rLH.GetLinkType() == ScLinkRefType::DDE &&
  rLH.GetDdeAppl()  == aAppl &&
  rLH.GetDdeTopic() == aTopic &&
  rLH.GetDdeItem()  == aItem )   //! mode is ignored
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sc/inc/global.hxx  |6 ++---
 sc/inc/scmod.hxx   |   44 -
 sc/source/ui/app/inputhdl.cxx  |   14 ++---
 sc/source/ui/app/scmod.cxx |4 +--
 sc/source/ui/inc/inputhdl.hxx  |2 -
 sc/source/ui/view/tabvwsh4.cxx |8 +++
 6 files changed, 39 insertions(+), 39 deletions(-)

New commits:
commit 588e1f97577b53a0131fa24c3cdfdf158b27efa7
Author: Noel Grandin 
Date:   Sun Sep 20 16:27:05 2015 +0200

convert SC_ENTER constants to scoped enum

Change-Id: Idd77e2dbbcb1d1c7238ed9b5998730f0e0a9bf50
Reviewed-on: https://gerrit.libreoffice.org/18732
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index a030e38..2af2c8d6 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -239,9 +239,9 @@ enum class ScLinkMode {
 NONE, NORMAL, VALUE
 };
 //  input
-#define SC_ENTER_NORMAL 0
-#define SC_ENTER_BLOCK  1
-#define SC_ENTER_MATRIX 2
+enum class ScEnterMode {
+NORMAL, BLOCK, MATRIX
+};
 
 //  step = 10pt, max. indention = 100 
steps
 #define SC_INDENT_STEP  200
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 482a6e6..3d70b9f 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -104,7 +104,7 @@ class ScModule: public SfxModule, public SfxListener, 
utl::ConfigurationListener
 SvtUserOptions* pUserOptions;
 SfxErrorHandler*pErrorHdl;
 ScFormEditData* pFormEditData;
-sal_uInt16  nCurRefDlgId;
+sal_uInt16  nCurRefDlgId;
 boolbIsWaterCan:1;
 boolbIsInEditCommand:1;
 boolbIsInExecuteDrop:1;
@@ -120,8 +120,8 @@ private:
 static void InitInterface_Impl();
 
 public:
-ScModule( SfxObjectFactory* pFact );
-virtual ~ScModule();
+ScModule( SfxObjectFactory* pFact );
+virtual~ScModule();
 
 virtual voidNotify( SfxBroadcaster& rBC, const SfxHint& rHint ) 
SAL_OVERRIDE;
 virtual voidConfigurationChanged( utl::ConfigurationBroadcaster*, 
sal_uInt32 ) SAL_OVERRIDE;
@@ -168,28 +168,28 @@ public:
 
 // Options:
 const ScViewOptions&GetViewOptions  ();
-SC_DLLPUBLICconst ScDocOptions& GetDocOptions   ();
-SC_DLLPUBLICconst ScAppOptions& GetAppOptions   ();
-SC_DLLPUBLICconst ScDefaultsOptions&   GetDefaultsOptions ();
-SC_DLLPUBLIC const ScFormulaOptions&   GetFormulaOptions ();
-SC_DLLPUBLIC const ScInputOptions& GetInputOptions ();
-SC_DLLPUBLICconst ScPrintOptions&   GetPrintOptions ();
-voidSetViewOptions  ( const ScViewOptions& rOpt );
-SC_DLLPUBLICvoidSetDocOptions   ( const ScDocOptions& 
rOpt );
-SC_DLLPUBLICvoidSetAppOptions   ( const ScAppOptions& 
rOpt );
-voidSetDefaultsOptions ( const ScDefaultsOptions& rOpt 
);
-SC_DLLPUBLIC voidSetFormulaOptions ( const 
ScFormulaOptions& rOpt );
+SC_DLLPUBLIC const ScDocOptions&GetDocOptions   ();
+SC_DLLPUBLIC const ScAppOptions&GetAppOptions   ();
+SC_DLLPUBLIC const ScDefaultsOptions&   GetDefaultsOptions ();
+SC_DLLPUBLIC const ScFormulaOptions&GetFormulaOptions ();
+SC_DLLPUBLIC const ScInputOptions&  GetInputOptions ();
+SC_DLLPUBLIC const ScPrintOptions&  GetPrintOptions ();
+voidSetViewOptions  ( const ScViewOptions& rOpt );
+SC_DLLPUBLIC void   SetDocOptions   ( const ScDocOptions& rOpt );
+SC_DLLPUBLIC void   SetAppOptions   ( const ScAppOptions& rOpt );
+voidSetDefaultsOptions ( const ScDefaultsOptions& rOpt );
+SC_DLLPUBLIC void   SetFormulaOptions ( const ScFormulaOptions& rOpt );
 SC_DLLPUBLIC void   SetInputOptions ( const ScInputOptions& rOpt );
-voidSetPrintOptions ( const ScPrintOptions& rOpt );
-voidInsertEntryToLRUList(sal_uInt16 nFIndex);
+voidSetPrintOptions ( const ScPrintOptions& rOpt );
+voidInsertEntryToLRUList(sal_uInt16 nFIndex);
 static void RecentFunctionsChanged();
 
 static void GetSpellSettings( sal_uInt16& rDefLang, sal_uInt16& 
rCjkLang, sal_uInt16& rCtlLang,
-bool& rAutoSpell );
+  bool& rAutoSpell );
 static void SetAutoSpellProperty( bool bSet );
 static bool HasThesaurusLanguage( sal_uInt16 nLang );
 
-sal_uInt16  GetOptDigitLanguage();  // from CTL options
+sal_uInt16   GetOptDigitLanguage();  // from CTL options
 
 ScNavipiCfg&GetNavipiCfg();
 ScAddInCfg& GetAddInCfg();
@@ -203,9 +203,9 @@ SC_DLLPUBLICvoidSetA

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

[Noel Grandin]

 sc/inc/document.hxx|   10 +-
 sc/inc/global.hxx  |9 -
 sc/inc/table.hxx   |   20 ++--
 sc/source/core/data/documen3.cxx   |8 
 sc/source/core/data/table1.cxx |4 ++--
 sc/source/core/tool/interpr1.cxx   |2 +-
 sc/source/filter/excel/xelink.cxx  |2 +-
 sc/source/filter/xml/XMLTableSourceContext.cxx |6 +++---
 sc/source/ui/docshell/tablink.cxx  |   12 ++--
 sc/source/ui/inc/undotab.hxx   |2 +-
 sc/source/ui/undo/undotab.cxx  |8 
 sc/source/ui/unoobj/cellsuno.cxx   |   14 +++---
 sc/source/ui/view/viewfun2.cxx |2 +-
 13 files changed, 49 insertions(+), 50 deletions(-)

New commits:
commit bd6f61ad7afcd51f7cb23c14558fdccbda1803a1
Author: Noel Grandin 
Date:   Sun Sep 20 15:52:48 2015 +0200

convert SC_LINK constants to scoped enum

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

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index afa2b7e..2f275a8 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -714,19 +714,19 @@ public:
 SC_DLLPUBLIC formula::FormulaGrammar::AddressConvention 
GetAddressConvention() const;
 SC_DLLPUBLIC formula::FormulaGrammar::Grammar GetGrammar() const { return 
eGrammar;}
 SC_DLLPUBLIC void SetGrammar( formula::FormulaGrammar::Grammar eGram );
-SC_DLLPUBLIC sal_uInt8  GetLinkMode( SCTAB nTab ) const;
-boolIsLinked( SCTAB nTab ) const;
+SC_DLLPUBLIC ScLinkMode GetLinkMode( SCTAB nTab ) const;
+bool IsLinked( SCTAB nTab ) const;
 SC_DLLPUBLIC const OUString  GetLinkDoc( SCTAB nTab ) const;
 const OUString   GetLinkFlt( SCTAB nTab ) const;
 const OUString   GetLinkOpt( SCTAB nTab ) const;
 SC_DLLPUBLIC const OUString  GetLinkTab( SCTAB nTab ) const;
 sal_uLong   GetLinkRefreshDelay( SCTAB nTab ) const;
-voidSetLink( SCTAB nTab, sal_uInt8 nMode, const OUString& rDoc,
+voidSetLink( SCTAB nTab, ScLinkMode nMode, const OUString& 
rDoc,
 const OUString& rFilter, const OUString& rOptions,
 const OUString& rTabName, sal_uLong nRefreshDelay 
);
 boolHasLink( const OUString& rDoc,
 const OUString& rFilter, const OUString& rOptions 
) const;
-SC_DLLPUBLIC bool   LinkExternalTab( SCTAB& nTab, const OUString& 
aDocTab,
+SC_DLLPUBLIC bool LinkExternalTab( SCTAB& nTab, const OUString& aDocTab,
 const OUString& aFileName,
 const OUString& aTabName );
 
@@ -734,7 +734,7 @@ public:
 SC_DLLPUBLIC ScExternalRefManager* GetExternalRefManager() const;
 boolIsInExternalReferenceMarking() const;
 voidMarkUsedExternalReferences();
-bool MarkUsedExternalReferences( ScTokenArray& rArr, const ScAddress& rPos 
);
+boolMarkUsedExternalReferences( ScTokenArray& rArr, const 
ScAddress& rPos );
 
 /** Returns the pool containing external formula parsers. Creates the pool
 on first call. */
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 51a8d94..a030e38 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -234,11 +234,10 @@ const InsertDeleteFlags IDF_AUTOFILL   = IDF_ALL & 
~(IDF_NOTE | IDF_OBJECTS);
 #define SC_LAYER_CONTROLS   3
 #define SC_LAYER_HIDDEN 4
 
-//  link tables
-#define SC_LINK_NONE0
-#define SC_LINK_NORMAL  1
-#define SC_LINK_VALUE   2
-
+//  link tables
+enum class ScLinkMode {
+NONE, NORMAL, VALUE
+};
 //  input
 #define SC_ENTER_NORMAL 0
 #define SC_ENTER_BLOCK  1
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 8a12532..ed832f1 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -125,15 +125,15 @@ private:
 OUString aCodeName;
 OUString aComment;
 
-OUString   aLinkDoc;
-OUString   aLinkFlt;
-OUString   aLinkOpt;
-OUString   aLinkTab;
-sal_uLong   nLinkRefreshDelay;
-sal_uInt8   nLinkMode;
+OUStringaLinkDoc;
+OUStringaLinkFlt;
+OUStringaLinkOpt;
+OUStringaLinkTab;
+sal_uLong   nLinkRefreshDelay;
+ScLinkMode  nLinkMode;
 
 // page style template
-OUString   aPageStyle;
+OUStringaPageStyle;
 SizeaPageSizeTwips; // size of the print-page
 SCCOL   nRepeatStartX;  // repeating rows/columns
 SCCOL   nRepeatEndX;// REPEAT_N

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

[Caolán McNamara]

 slideshow/inc/pch/precompiled_slideshow.hxx   |1 -
 slideshow/source/engine/effectrewinder.hxx|3 +--
 slideshow/source/engine/shapes/shapeimporter.cxx  |4 ++--
 slideshow/source/engine/shapes/viewmediashape.hxx |1 -
 slideshow/source/engine/sp_debug.cxx  |1 -
 slideshow/source/inc/eventmultiplexer.hxx |4 ++--
 slideshow/source/inc/screenupdater.hxx|4 ++--
 7 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 64144c28fef385625b0edc95e1aceed82e028d40
Author: Caolán McNamara 
Date:   Fri Sep 18 16:55:15 2015 +0100

boost->std

Change-Id: I787ff19fd41d5ecee56efa1aa7ee539f46650703
Reviewed-on: https://gerrit.libreoffice.org/18703
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx 
b/slideshow/inc/pch/precompiled_slideshow.hxx
index e007ffb..07318fb 100644
--- a/slideshow/inc/pch/precompiled_slideshow.hxx
+++ b/slideshow/inc/pch/precompiled_slideshow.hxx
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/slideshow/source/engine/effectrewinder.hxx 
b/slideshow/source/engine/effectrewinder.hxx
index 7132376..97975d5 100644
--- a/slideshow/source/engine/effectrewinder.hxx
+++ b/slideshow/source/engine/effectrewinder.hxx
@@ -28,9 +28,8 @@
 
 #include 
 
-#include 
-
 #include 
+#include 
 #include 
 
 namespace slideshow { namespace internal {
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx 
b/slideshow/source/engine/shapes/shapeimporter.cxx
index e3c70ff..c92e27a 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -52,7 +52,7 @@
 #include "slideshowcontext.hxx"
 
 #include 
-#include 
+#include 
 
 using namespace com::sun::star;
 
@@ -116,7 +116,7 @@ bool importShapeGraphic(
 // no special string found, graphic must be
 // external. Load via GraphicIm porter
 INetURLObject aTmp( aURL );
-boost::scoped_ptr pGraphicStream(
+std::unique_ptr pGraphicStream(
 utl::UcbStreamHelper::CreateStream(
 aTmp.GetMainURL( INetURLObject::NO_DECODE ),
 StreamMode::READ ) );
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx 
b/slideshow/source/engine/shapes/viewmediashape.hxx
index 7b73930..dc6d284 100644
--- a/slideshow/source/engine/shapes/viewmediashape.hxx
+++ b/slideshow/source/engine/shapes/viewmediashape.hxx
@@ -25,7 +25,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include "viewlayer.hxx"
diff --git a/slideshow/source/engine/sp_debug.cxx 
b/slideshow/source/engine/sp_debug.cxx
index 2efb80e..0a68607 100644
--- a/slideshow/source/engine/sp_debug.cxx
+++ b/slideshow/source/engine/sp_debug.cxx
@@ -32,7 +32,6 @@
 #if defined(BOOST_SP_ENABLE_DEBUG_HOOKS)
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/slideshow/source/inc/eventmultiplexer.hxx 
b/slideshow/source/inc/eventmultiplexer.hxx
index 1dde126..cd70cd9 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -27,7 +27,7 @@
 #include "vieweventhandler.hxx"
 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -727,7 +727,7 @@ public:
 bool notifyHyperlinkClicked( OUString const& hyperLink );
 
 private:
-boost::scoped_ptr mpImpl;
+std::unique_ptr mpImpl;
 };
 
 } // namespace internal
diff --git a/slideshow/source/inc/screenupdater.hxx 
b/slideshow/source/inc/screenupdater.hxx
index ade4096..2fbf426 100644
--- a/slideshow/source/inc/screenupdater.hxx
+++ b/slideshow/source/inc/screenupdater.hxx
@@ -23,7 +23,7 @@
 #include "viewupdate.hxx"
 #include "unoviewcontainer.hxx"
 #include 
-#include 
+#include 
 
 /* Definition of ScreenUpdater class */
 
@@ -128,7 +128,7 @@ namespace slideshow
 
 private:
 struct ImplScreenUpdater;
-boost::scoped_ptr mpImpl;
+std::unique_ptr mpImpl;
 
 };
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 vcl/inc/osx/a11yfocustracker.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd38f64014f81df215fca9fd69e5963e161c47e2
Author: Noel Grandin 
Date:   Mon Sep 21 09:29:14 2015 +0200

fix OSX build

after my Link<> changes

Change-Id: I418101e2bf2a29b13b7e9eadaedfe57776cf45ee

diff --git a/vcl/inc/osx/a11yfocustracker.hxx b/vcl/inc/osx/a11yfocustracker.hxx
index 3dc3926..0188cac 100644
--- a/vcl/inc/osx/a11yfocustracker.hxx
+++ b/vcl/inc/osx/a11yfocustracker.hxx
@@ -87,7 +87,7 @@ private:
 std::set> m_aDocumentWindowList;
 
 // the link object needed for Application::addEventListener
-Link<> m_aWindowEventLink;
+Link m_aWindowEventLink;
 
 // the UNO XAccessibilityEventListener for Documents and other non VCL 
objects
 const ::com::sun::star::uno::Reference< DocumentFocusListener > 
m_xDocumentFocusListener;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits