[Libreoffice-commits] help.git: help-to-wiki.py to-wiki/getalltitles.py to-wiki/wikiconv2.py

[Akash Deshpande]

 help-to-wiki.py |   18 --
 to-wiki/getalltitles.py |   26 +-
 to-wiki/wikiconv2.py|   15 +++
 3 files changed, 28 insertions(+), 31 deletions(-)

New commits:
commit 187a8d006c9b738a387eedd65c0cb71e8257e6ce
Author: Akash Deshpande 
Date:   Sat Sep 3 16:13:28 2016 -0400

help-to-wiki shell call replaced with a function

shell call to run getalltitles has been replaced
with a function call.

Also added a new option to save the title file
alltitles.csv  If this file is needed, to continue
to generate this, please add -t to the run.
Or else, please remove it so that a stale file
is not kept around

Change-Id: I2902243df59d415fb313efa7d4132b0190658fa3
Reviewed-on: https://gerrit.libreoffice.org/28650
Reviewed-by: jan iversen 
Tested-by: jan iversen 
Reviewed-by: Andras Timar 

diff --git a/help-to-wiki.py b/help-to-wiki.py
index 19d58ed..448a1da 100755
--- a/help-to-wiki.py
+++ b/help-to-wiki.py
@@ -11,9 +11,7 @@ import sys, os, getopt, signal
 
 sys.path.append(sys.path[0]+"/to-wiki")
 import wikiconv2
-
-# FIXME do proper modules from getalltitles & wikiconv2
-# [so far this is in fact just a shell thing]
+import getalltitles
 
 def usage():
 print '''
@@ -24,6 +22,7 @@ Converts .xhp files into a wiki
 -h, --help- this help
 -n, --no-translations - generate only English pages
 -r, --redirects   - generate also redirect pages
+-t, --title-savefile  - save the title file
 
 Most probably, you want to generate the redirects only once when you initially
 populate the wiki, and then only update the ones that broke.\n'''
@@ -68,12 +67,13 @@ langs = ['', 'ast', 'bg', 'bn', 'bn-IN', 'ca', 'cs', 'da', 
'de', \
 
 # Argument handling
 try:
-opts, args = getopt.getopt(sys.argv[1:], 'hnr', ['help', 
'no-translations', 'redirects'])
+opts, args = getopt.getopt(sys.argv[1:], 'hnrt', ['help', 
'no-translations', 'redirects', 'title-savefile'])
 except getopt.GetoptError:
 usage()
 sys.exit(1)
 
 generate_redirects = False
+title_savefile = False
 for opt, arg in opts:
 if opt in ('-h', '--help'):
 usage()
@@ -82,6 +82,8 @@ for opt, arg in opts:
 langs = ['']
 elif opt in ('-r', '--redirects'):
 generate_redirects = True
+elif opt in ('-t', '--title-savefile'):
+title_savefile = True
 
 def signal_handler(signal, frame):
 sys.stderr.write( 'Exiting...\n' )
@@ -93,7 +95,11 @@ signal.signal(signal.SIGINT, signal_handler)
 create_wiki_dirs()
 
 print "Generating the titles..."
-os.system( "python to-wiki/getalltitles.py source/text > alltitles.csv" )
+title_data = getalltitles.gettitles("source/text")
+if title_savefile:
+with open ('alltitles.csv', 'w') as f:
+for d in title_data:
+f.write('%s;%s;%s\n' % (d[0], d[1], d[2]))
 
 try:
 po_path = args[0]
@@ -103,6 +109,6 @@ except:
 
 # do the work
 for lang in langs:
-wikiconv2.convert(generate_redirects, lang, '%s/%s/helpcontent2/source'% 
(po_path, lang))
+wikiconv2.convert(title_data, generate_redirects, lang, 
'%s/%s/helpcontent2/source'% (po_path, lang))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/to-wiki/getalltitles.py b/to-wiki/getalltitles.py
index 8db9bcb..71f5aed 100755
--- a/to-wiki/getalltitles.py
+++ b/to-wiki/getalltitles.py
@@ -137,18 +137,18 @@ def parsexhp(filename):
 title = title.strip('_')
 title = make_unique(title)
 alltitles.append(title)
-print filename + ';' + title + ';' + readable_title
-
-if len(sys.argv) < 2:
-print "getalltitles.py "
-print "e.g. getalltitles.py source/text/scalc"
-sys.exit(1)
-
-pattern = "xhp"
-
-for root, dirs, files in os.walk(sys.argv[1]):
-for i in files:
-if i.find(pattern) >= 0:
-parsexhp(root+"/"+i)
+return((filename, title, readable_title))
+
+# Main Function
+def gettitles(path):
+pattern = "xhp"
+alltitles = []
+for root, dirs, files in os.walk(path):
+for i in files:
+if i.find(pattern) >= 0:
+t = parsexhp(root+"/"+i)
+if t is not None:
+alltitles.append(t)
+return alltitles
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/to-wiki/wikiconv2.py b/to-wiki/wikiconv2.py
index f6569b8..b239419 100755
--- a/to-wiki/wikiconv2.py
+++ b/to-wiki/wikiconv2.py
@@ -1371,15 +1371,6 @@ class XhpParser(ParserBase):
 ParserBase.__init__(self, filename, follow_embed, embedding_app,
 current_app, wiki_page_name, lang, XhpFile(), 
buf.encode('utf-8'))
 
-def loadallfiles(filename):
-global titles
-titles = []
-file = codecs.open(filename, "r", "utf-8")
-for line in file:
-title = line.split(";", 2)
-titles.append(title)
-file.close()
-
 class WikiConverter(Thread):
 def __init__(self, inputfile, wiki_page_name, lang, outputfile):
   

[Libreoffice-commits] core.git: helpcontent2

[Akash Deshpande]

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

New commits:
commit 79586cf338a6f02ca3568b12f88380cb61957dc9
Author: Akash Deshpande 
Date:   Sat Sep 3 16:13:28 2016 -0400

Updated core
Project: help  187a8d006c9b738a387eedd65c0cb71e8257e6ce

help-to-wiki shell call replaced with a function

shell call to run getalltitles has been replaced
with a function call.

Also added a new option to save the title file
alltitles.csv  If this file is needed, to continue
to generate this, please add -t to the run.
Or else, please remove it so that a stale file
is not kept around

Change-Id: I2902243df59d415fb313efa7d4132b0190658fa3
Reviewed-on: https://gerrit.libreoffice.org/28650
Reviewed-by: jan iversen 
Tested-by: jan iversen 
Reviewed-by: Andras Timar 

diff --git a/helpcontent2 b/helpcontent2
index fbd93f4..187a8d0 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fbd93f4c667396b55f7c2df3707590ba56218b39
+Subproject commit 187a8d006c9b738a387eedd65c0cb71e8257e6ce
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 sfx2/source/dialog/recfloat.cxx|  138 -
 sfx2/source/inc/recfloat.hxx   |5 -
 sfx2/uiconfig/ui/floatingrecord.ui |3 
 3 files changed, 1 insertion(+), 145 deletions(-)

New commits:
commit ccb986bae00ece4c1402ea89e66c9e46a331c8b1
Author: Maxim Monastirsky 
Date:   Fri Sep 9 10:00:34 2016 +0300

Simplify SfxRecordingFloat_Impl by using SidebarToolBox

Change-Id: I3d2348d8e3db91b0ae4e757efa14a0168604a2b0

diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index 780fb40..aebfd9c 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -18,15 +18,9 @@
  */
 
 #include 
-#include 
-#include 
-#include 
-#include 
 
 #include 
-#include 
 #include 
-#include 
 
 #include "recfloat.hxx"
 #include "dialog.hrc"
@@ -38,90 +32,6 @@
 #include 
 #include 
 
-using namespace ::com::sun::star;
-
-static OUString GetLabelFromCommandURL( const OUString& rCommandURL, const 
uno::Reference< frame::XFrame >& xFrame )
-{
-OUString aLabel;
-OUString aModuleIdentifier;
-uno::Reference< container::XNameAccess > xUICommandLabels;
-uno::Reference< uno::XComponentContext > xContext;
-uno::Reference< container::XNameAccess > xUICommandDescription;
-uno::Reference< css::frame::XModuleManager2 > xModuleManager;
-
-static uno::WeakReference< uno::XComponentContext > xTmpContext;
-static uno::WeakReference< container::XNameAccess > xTmpNameAccess;
-static uno::WeakReference< css::frame::XModuleManager2 > xTmpModuleMgr;
-
-xContext = xTmpContext;
-if ( !xContext.is() )
-{
-xContext = ::comphelper::getProcessComponentContext();
-xTmpContext = xContext;
-}
-
-xUICommandDescription = xTmpNameAccess;
-if ( !xUICommandDescription.is() )
-{
-xUICommandDescription = frame::theUICommandDescription::get(xContext);
-xTmpNameAccess = xUICommandDescription;
-}
-
-xModuleManager = xTmpModuleMgr;
-if ( !xModuleManager.is() )
-{
-xModuleManager = frame::ModuleManager::create(xContext);
-xTmpModuleMgr = xModuleManager;
-}
-
-// Retrieve label from UI command description service
-try
-{
-try
-{
-aModuleIdentifier = xModuleManager->identify( xFrame );
-}
-catch( uno::Exception& )
-{
-}
-
-uno::Any a = xUICommandDescription->getByName( aModuleIdentifier );
-uno::Reference< container::XNameAccess > xUICommands;
-a >>= xUICommandLabels;
-}
-catch ( uno::Exception& )
-{
-}
-
-if ( xUICommandLabels.is() )
-{
-try
-{
-if ( !rCommandURL.isEmpty() )
-{
-uno::Sequence< beans::PropertyValue > aPropSeq;
-uno::Any a( xUICommandLabels->getByName( rCommandURL ));
-if ( a >>= aPropSeq )
-{
-for ( sal_Int32 i = 0; i < aPropSeq.getLength(); i++ )
-{
-if ( aPropSeq[i].Name == "Label" )
-{
-aPropSeq[i].Value >>= aLabel;
-break;
-}
-}
-}
-}
-}
-catch (uno::Exception& )
-{
-}
-}
-
-return aLabel;
-}
-
 SFX_IMPL_FLOATINGWINDOW( SfxRecordingFloatWrapper_Impl, 
SID_RECORDING_FLOATWINDOW );
 
 SfxRecordingFloatWrapper_Impl::SfxRecordingFloatWrapper_Impl( vcl::Window* 
pParentWnd ,
@@ -169,29 +79,6 @@ SfxRecordingFloat_Impl::SfxRecordingFloat_Impl(
  pParent,
  "FloatingRecord", "sfx/ui/floatingrecord.ui", 
pBind->GetActiveFrame() )
 {
-get(m_pTbx, "toolbar");
-
-// Retrieve label from helper function
-uno::Reference< frame::XFrame > xFrame = getFrame();
-OUString aCommandStr( ".uno:StopRecording" );
-sal_uInt16 nItemId = m_pTbx->GetItemId(aCommandStr);
-m_pTbx->SetItemText( nItemId, GetLabelFromCommandURL( aCommandStr, xFrame 
));
-
-// create a generic toolbox controller for our internal toolbox
-svt::GenericToolboxController* pController = new 
svt::GenericToolboxController(
-
::comphelper::getProcessComponentContext(),
-xFrame,
-m_pTbx,
-nItemId,
-aCommandStr );
-xStopRecTbxCtrl.set( static_cast< cppu::OWeakObject* >( pController ),
- uno::UNO_QUERY );
-uno::Reference< util::XUpdatable > xUpdate( xStopRecTbxCtrl, 
uno::UNO_QUERY );
-if ( xUpdate.is() )
-xUpdate->update();
-
-m_pTbx->SetSelectHdl( LINK( this, SfxRecordingFloat_Impl, Select ) );
-
 // start recording
 Sfx

Branch libreoffice-5-2-2 and Tag libreoffice-5.2.2.1 created

[jan iversen]

Hi all, 
The tag libreoffice-5.2.2.1 (AKA 5.2.2 RC1) and the corresponding branch 
libreoffice-5-2-2 have been created. The branch will be used for fine tuning of 
the 5.2.2 release. (there is one additional RC planned).
The following rules apply: + preferably just translation or blocker fixes + 
only cherry-picking from libreoffice-5-2 branch + 2 additional reviews needed; 
2nd reviewer pushes + no regular merges back to anything
The 'libreoffice-5-2' branch is still active and will be used for the 5.2.3 
bugfix release. Please read more at 
https://wiki.documentfoundation.org/ReleasePlan/5.2#5.2.2_releasehttp://wiki.documentfoundation.org/Development/Branches
 http://wiki.documentfoundation.org/Release_Criteria 
 Now, if you want to switch your clone to the branch, please do: 
 ./g pull -r
./g checkout -b libreoffice-5-2-2 origin/libreoffice-5-2-2
To checkout the tag, use 
 ./g fetch --tags 
./g checkout -b tag-libreoffice-5.2.2.1 libreoffice-5.2.2.1 
Hopefully it will work for you :-) Most probably, you will also want to do (if 
you haven't done it yet): 
 git config --global push.default tracking 
 When you do git push with this, git will push only the branch you are on; e.g. 
libreoffice-5-2-2 when you have switched to it. 
This will save you some git shouting at you. Linux distro packages might find 
source tarballs at http://dev-builds.libreoffice.org/pre-releases/src/ They 
will soon be available from the official page together with the builds.
Rgds
jan I
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods: fails with Assertion

[Alex McMurchy]

Hi Eike

Will it helpful if I installed Lubuntu 14.04 64bit and see if I get the 
same problem?


Alex



On 08/09/16 16:01, Eike Rathke wrote:

Hi Alex,

On Thursday, 2016-09-08 13:28:46 +0100, Alex McMurchy wrote:


[... -msse ...]

Both failed for the same reason.

Pity.. ok, thanks for trying, we'll have to further investigate.


Is the problem just a 32bit issue?

Yes. Only two tinderbox 32-bit builds (and your's) have the problem.

   Eike



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

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

[Stephan Bergmann]

 compilerplugins/clang/refcounting.cxx |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 31dc693029a6a6f68262ecb68ea7b6dafd291003
Author: Stephan Bergmann 
Date:   Fri Sep 9 09:46:39 2016 +0200

loplugin:refcounting: No more special-handling of SvXMLImportContext

...after 32ccb4ea863651c22bf33cc15012971d2a2d2810 "resolve the snafu with 2
separate refcounted bases"

Change-Id: Iaf13deb0b83b6dfe1a2cf3863e07cf042c8e4f47

diff --git a/compilerplugins/clang/refcounting.cxx 
b/compilerplugins/clang/refcounting.cxx
index 97eea57..bcfc11b 100644
--- a/compilerplugins/clang/refcounting.cxx
+++ b/compilerplugins/clang/refcounting.cxx
@@ -35,7 +35,6 @@ this is a bug =) since aFooMember assumes heap allocated 
lifecycle and
 not delete on last 'release'.
 
 TODO check that things that extend SvRefBase are managed by SvRef
-TODO fix the SvXMLImportContext class (mentioned below)
 TODO fix the slideshow::internal::SlideView class (mentioned below)
 */
 
@@ -138,11 +137,6 @@ bool containsXInterfaceSubclass(const Type* pType0) {
 if (isDerivedFrom(pRecordDecl, "dbaui::OSbaWeakSubObject")) { // 
module dbaccess
 return false;
 }
-// FIXME this class extends 2 different ref-counting bases, SvRefBase 
and XInterface (via. cppu::WeakImplHelper)
-// I have no idea how to fix it
-if (isDerivedFrom(pRecordDecl, "SvXMLImportContext")) { // module 
xmloff
-return false;
-}
 // The actual problem child is SlideView, of which this is the parent.
 // Everything in the hierarchy above this wants to be managed via 
boost::shared_ptr
 if (isDerivedFrom(pRecordDecl, "slideshow::internal::UnoView")) { // 
module slideshow
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[sll]

 sd/source/ui/docshell/docshel4.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e7446c7e7cef06c3f3aa2f19292a412944f0f8a3
Author: sll 
Date:   Thu Sep 8 16:34:01 2016 +0200

tdf#62717 FILESAVE : Names Master pages are not saved properly

Change-Id: If58a72fca0f9cbdeb6fc11cc36dbf13e22cdd99a
Reviewed-on: https://gerrit.libreoffice.org/28750
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/sd/source/ui/docshell/docshel4.cxx 
b/sd/source/ui/docshell/docshel4.cxx
index 0b9e6a2..7f99c57 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -993,7 +993,7 @@ bool DrawDocShell::SaveAsOwnFormat( SfxMedium& rMedium )
 aLayoutName = aURL.getName();
 }
 
-if (!aLayoutName.isEmpty())
+if (aLayoutName.isEmpty())
 {
 sal_uInt32 nCount = mpDoc->GetMasterSdPageCount(PK_STANDARD);
 for (sal_uInt32 i = 0; i < nCount; ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stanislav Horacek]

 source/text/scalc/01/04060118.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea2be76c292e9b2ad455bc47540d8e03626b7ee7
Author: Stanislav Horacek 
Date:   Thu Sep 8 13:38:31 2016 +0200

tdf#100990 correct example for RATE function

Change-Id: I8161bd5b805ffc0e852c2d2516e48eba8bdf10cd
Reviewed-on: https://gerrit.libreoffice.org/28745
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/source/text/scalc/01/04060118.xhp 
b/source/text/scalc/01/04060118.xhp
index e016c25..b2dd4bb 100644
--- a/source/text/scalc/01/04060118.xhp
+++ b/source/text/scalc/01/04060118.xhp
@@ -335,7 +335,7 @@
 
 Example
 What is the 
constant interest rate for a payment period of 3 periods if 10 currency units 
are paid regularly and the present cash value is 900 currency units.
-=RATE(3;10;900) = -121% The interest rate is therefore 
121%.
+=RATE(3;-10;900) = -75.63% The interest rate is therefore 
75.63%.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stanislav Horacek]

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

New commits:
commit 52e9cab97dbd7caded0eb63d33ccf12ec61aaec6
Author: Stanislav Horacek 
Date:   Thu Sep 8 13:38:31 2016 +0200

Updated core
Project: help  ea2be76c292e9b2ad455bc47540d8e03626b7ee7

tdf#100990 correct example for RATE function

Change-Id: I8161bd5b805ffc0e852c2d2516e48eba8bdf10cd
Reviewed-on: https://gerrit.libreoffice.org/28745
Reviewed-by: jan iversen 
Tested-by: jan iversen 

diff --git a/helpcontent2 b/helpcontent2
index 187a8d0..ea2be76 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 187a8d006c9b738a387eedd65c0cb71e8257e6ce
+Subproject commit ea2be76c292e9b2ad455bc47540d8e03626b7ee7
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tumer]

 android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java |   11 
--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit fbda3f9a8d2d3f2ccd7999a3f110c56bce38c1d8
Author: Mert Tumer 
Date:   Tue Aug 9 17:16:11 2016 +0300

tdf#96810 - Fix Android Viewer: Keyboard can not hide with keyboard button.

Change-Id: I87d83953094d31ed4e1bcf60c55dd19056a7994e
Reviewed-on: https://gerrit.libreoffice.org/28005
Tested-by: Jenkins 
Reviewed-by: jan iversen 

diff --git 
a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java 
b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 1cbdabb..bd21fe2 100755
--- a/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ b/android/source/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -96,6 +96,7 @@ public class LibreOfficeMainActivity extends 
AppCompatActivity {
 return mTempFile != null;
 }
 
+private boolean isKeyboardOpen = false;
 @Override
 public void onCreate(Bundle savedInstanceState) {
 Log.w(LOGTAG, "onCreate..");
@@ -368,13 +369,18 @@ public class LibreOfficeMainActivity extends 
AppCompatActivity {
  * Show software keyboard.
  * Force the request on main thread.
  */
+
+
 public void showSoftKeyboard() {
+
 LOKitShell.getMainHandler().post(new Runnable() {
 @Override
 public void run() {
-showSoftKeyboardDirect();
+if(!isKeyboardOpen) showSoftKeyboardDirect();
+else hideSoftKeyboardDirect();
 }
 });
+
 }
 
 private void showSoftKeyboardDirect() {
@@ -384,7 +390,7 @@ public class LibreOfficeMainActivity extends 
AppCompatActivity {
 InputMethodManager inputMethodManager = (InputMethodManager) 
getApplicationContext().getSystemService(Context.INPUT_METHOD_SERVICE);
 inputMethodManager.showSoftInput(layerView, 
InputMethodManager.SHOW_FORCED);
 }
-
+isKeyboardOpen=true;
 hideBottomToolbar();
 }
 
@@ -419,6 +425,7 @@ public class LibreOfficeMainActivity extends 
AppCompatActivity {
 if (getCurrentFocus() != null) {
 InputMethodManager inputMethodManager = (InputMethodManager) 
getApplicationContext().getSystemService(Context.INPUT_METHOD_SERVICE);
 
inputMethodManager.hideSoftInputFromWindow(getCurrentFocus().getWindowToken(), 
0);
+isKeyboardOpen=false;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx |   40 -
 cppuhelper/qa/unourl/cppu_unourl.cxx   |4 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit b3c72c734087b178cbcf1622e1088335c6eaf6a7
Author: Miklos Vajna 
Date:   Fri Sep 9 09:18:57 2016 +0200

cppuhelper: fix loplugin:cppunitassertequals warnings

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

diff --git a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx 
b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
index 3190b77..097ad9b 100644
--- a/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
+++ b/cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx
@@ -70,8 +70,8 @@ namespace cppu_ifcontainer
 
 pContainer = new cppu::OInterfaceContainerHelper(m_aGuard);
 
-CPPUNIT_ASSERT_MESSAGE("Empty container not empty",
-   pContainer->getLength() == 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("Empty container not empty",
+   static_cast(0), 
pContainer->getLength());
 
 int i;
 for (i = 0; i < nTests; i++)
@@ -79,21 +79,21 @@ namespace cppu_ifcontainer
 Reference xRef = new 
ContainerListener(&aStats);
 int nNewLen = pContainer->addInterface(xRef);
 
-CPPUNIT_ASSERT_MESSAGE("addition length mismatch",
-   nNewLen == i + 1);
-CPPUNIT_ASSERT_MESSAGE("addition length mismatch",
-   pContainer->getLength() == i + 1);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("addition length mismatch",
+   i + 1, nNewLen);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("addition length mismatch",
+   static_cast(i + 1), 
pContainer->getLength());
 }
 CPPUNIT_ASSERT_MESSAGE("alive count mismatch",
-   aStats.m_nAlive == nTests);
+   bool(aStats.m_nAlive == nTests));
 
 EventObject aObj;
 pContainer->disposeAndClear(aObj);
 
 CPPUNIT_ASSERT_MESSAGE("dispose count mismatch",
-   aStats.m_nDisposed == nTests);
-CPPUNIT_ASSERT_MESSAGE("leaked container left alive",
-   aStats.m_nAlive == 0);
+   bool(aStats.m_nDisposed == nTests));
+CPPUNIT_ASSERT_EQUAL_MESSAGE("leaked container left alive",
+   0, aStats.m_nAlive);
 
 delete pContainer;
 }
@@ -116,19 +116,19 @@ namespace cppu_ifcontainer
 aElements = pContainer->getElements();
 
 CPPUNIT_ASSERT_MESSAGE("query contents",
-   (int)aElements.getLength() == nTests);
+   bool((int)aElements.getLength() == nTests));
 if ((int)aElements.getLength() == nTests)
 {
 for (i = 0; i < nTests; i++)
 {
 CPPUNIT_ASSERT_MESSAGE("mismatching elements",
-   aElements[i] == aListeners[i]);
+   bool(aElements[i] == 
aListeners[i]));
 }
 }
 pContainer->clear();
 
-CPPUNIT_ASSERT_MESSAGE("non-empty container post clear",
-   pContainer->getLength() == 0);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("non-empty container post clear",
+   static_cast(0), 
pContainer->getLength());
 delete pContainer;
 }
 
@@ -158,9 +158,9 @@ namespace cppu_ifcontainer
 
 CPPUNIT_ASSERT_MESSAGE("no helper", pHelper != nullptr);
 Sequence > aSeq = 
pHelper->getElements();
-CPPUNIT_ASSERT_MESSAGE("wrong num elements", aSeq.getLength() 
== 2);
-CPPUNIT_ASSERT_MESSAGE("match", aSeq[0] == xRefs[i*2]);
-CPPUNIT_ASSERT_MESSAGE("match", aSeq[1] == xRefs[i*2+1]);
+CPPUNIT_ASSERT_EQUAL_MESSAGE("wrong num elements", 
static_cast(2), aSeq.getLength());
+CPPUNIT_ASSERT_MESSAGE("match", bool(aSeq[0] == xRefs[i*2]));
+CPPUNIT_ASSERT_MESSAGE("match", bool(aSeq[1] == xRefs[i*2+1]));
 }
 
 // remove every other interface
@@ -176,8 +176,8 @@ namespace cppu_ifcontainer
 
 CPPUNIT_ASSERT_MESSAGE("no helper", pHelper != nullptr);
 Sequence > aSeq = 
pHelper->getElements();
-CPPUNIT_ASSERT_MESSAGE("wrong num elements", aSeq.getLength() 
== 1);
-CPPUNIT_ASSERT_MESSAGE("match", aSeq[0] == xRefs[i*2]);
+CPPUNIT_ASSERT_EQUA

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

[Noel Grandin]

 include/xmloff/shapeimport.hxx   |6 +++---
 include/xmloff/txtstyli.hxx  |3 ++-
 include/xmloff/xmlictxt.hxx  |2 +-
 include/xmloff/xmlnumi.hxx   |2 +-
 sw/source/filter/xml/xmlfmt.cxx  |4 ++--
 sw/source/filter/xml/xmltbli.hxx |2 +-
 xmloff/inc/XMLTextColumnsContext.hxx |4 ++--
 xmloff/inc/xmltabi.hxx   |2 +-
 xmloff/source/draw/sdxmlimp_impl.hxx |2 +-
 xmloff/source/draw/ximp3dscene.cxx   |2 +-
 xmloff/source/draw/ximpstyl.cxx  |4 ++--
 xmloff/source/draw/ximpstyl.hxx  |6 +++---
 xmloff/source/forms/layerimport.cxx  |3 +++
 xmloff/source/forms/layerimport.hxx  |4 +++-
 xmloff/source/style/xmlnumi.cxx  |2 +-
 xmloff/source/style/xmlstyle.cxx |6 +++---
 xmloff/source/style/xmltabi.cxx  |2 +-
 xmloff/source/text/XMLTextColumnsContext.cxx |2 +-
 xmloff/source/text/txtparaimphint.hxx|2 +-
 xmloff/source/text/txtstyli.cxx  |3 +++
 20 files changed, 36 insertions(+), 27 deletions(-)

New commits:
commit d4b0ab2214425545aac5d98c49dc320ee39d6dc2
Author: Noel Grandin 
Date:   Fri Sep 9 10:24:05 2016 +0200

loplugin:refcounting

Change-Id: I3ab5f1df08670fdad3e31aadafd3a02f1925dd88

diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 3042e03..a1263c8 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/shapeimport.hxx
@@ -204,7 +204,7 @@ protected:
 SvXMLImport& mrImport;
 
 // list for local light contexts
-::std::vector< css::uno::Reference< SdXML3DLightContext > >
+::std::vector< rtl::Reference< SdXML3DLightContext > >
 maList;
 
 // local parameters which need to be read
@@ -274,8 +274,8 @@ class XMLOFF_DLLPUBLIC XMLShapeImportHelper : public 
salhelper::SimpleReferenceO
 rtl::Reference mpPresPagePropsMapper;
 
 // contexts for Style and AutoStyle import
-css::uno::Reference mxStylesContext;
-css::uno::Reference mxAutoStylesContext;
+rtl::Reference mxStylesContext;
+rtl::Reference mxAutoStylesContext;
 
 // contexts for xShape contents TokenMaps
 std::unique_ptr  mpGroupShapeElemTokenMap;
diff --git a/include/xmloff/txtstyli.hxx b/include/xmloff/txtstyli.hxx
index 3b7cb23..a142e3d 100644
--- a/include/xmloff/txtstyli.hxx
+++ b/include/xmloff/txtstyli.hxx
@@ -53,7 +53,7 @@ private:
 // Introduce import of empty list style (#i69523#)
 boolmbListStyleSet : 1;
 
-css::uno::Reference mxEventContext;
+rtl::Reference mxEventContext;
 
 protected:
 
@@ -69,6 +69,7 @@ public:
 const css::uno::Reference< css::xml::sax::XAttributeList > & 
xAttrList,
 SvXMLStylesContext& rStyles, sal_uInt16 nFamily,
 bool bDefaultStyle = false );
+~XMLTextStyleContext() override;
 
 virtual SvXMLImportContext *CreateChildContext(
 sal_uInt16 nPrefix,
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index c9d987e..eddbf70 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -130,7 +130,7 @@ public:
 void ReleaseRef();
 };
 
-typedef css::uno::Reference SvXMLImportContextRef;
+typedef rtl::Reference SvXMLImportContextRef;
 
 #endif // INCLUDED_XMLOFF_XMLICTXT_HXX
 
diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index dbe8adc..ee7913a 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -33,7 +33,7 @@
 namespace com { namespace sun { namespace star { namespace frame { class 
XModel; } } } }
 
 class SvxXMLListLevelStyleContext_Impl;
-typedef std::vector> 
SvxXMLListStyle_Impl;
+typedef std::vector> 
SvxXMLListStyle_Impl;
 
 class XMLOFF_DLLPUBLIC SvxXMLListStyleContext
 : public SvXMLStyleContext
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index 53c81a1..09920b1 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -256,7 +256,7 @@ SwXMLConditionContext_Impl::~SwXMLConditionContext_Impl()
 }
 
 
-typedef std::vector> 
SwXMLConditions_Impl;
+typedef std::vector> 
SwXMLConditions_Impl;
 
 class SwXMLTextStyleContext_Impl : public XMLTextStyleContext
 {
@@ -327,7 +327,7 @@ SvXMLImportContext 
*SwXMLTextStyleContext_Impl::CreateChildContext(
 
 if( XML_NAMESPACE_STYLE == nPrefix && IsXMLToken( rLocalName, XML_MAP ) )
 {
-uno::Reference xCond{
+rtl::Reference xCond{
 new SwXMLConditionContext_Impl( GetImport(), nPrefix,
 rLocalName, xAttrList )};
 if( xCond->IsValid() )
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index 11fd9c2..d050022 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -80,7 +80,7 @

Re: Test File: sc/qa/unit/data/functions/fods/chiinv.fods: fails with Assertion

[Eike Rathke]

Hi Alex,

On Friday, 2016-09-09 08:46:20 +0100, Alex McMurchy wrote:

> Will it helpful if I installed Lubuntu 14.04 64bit and see if I get the same
> problem?

Unlikely. The problem so far only showed up in 32-bit builds.
But thanks for offering.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key "ID" 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Better use 64-bit 0x6A6CD5B765632D3A here is why: https://evil32.com/
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


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

Fwd: [Libreoffice-qa] Fwd: QA Meeting @ Brno Libreoffice Conference. Wed 19.00-20.00(UTC+2)

[Xisco Faulí]

Hi all,

taking into account that some of us are present at Brno Libreoffice 
Conference this week, we're going to have a face-to-face QA meeting from 
19.00 to 20.00 UTC+2 at the Red Hat Offices while the hackfest session 
is taking place.


Therefore, I invite everybody present at the Libreoffice Conference to 
join the meeting as we would like to hear anything you have to say with 
regards to QA.


On the other hand,  we would also like to try something Gabriel proposed 
yesterday. Basically, we would like to offer the possibility for 
non-QA/non-developer people to report bugs in person, mainly thinking of 
FOSDEM and the incoming Libreoffice Conferences, so we can also show 
them how doing QA looks like at the same time. We plan to do a public 
announcement in the social networks during the course of the day and 
it's going to take place today from 20.00 to 22.00 to see whether 
someone is showing up or not.


I'll keep you updated.

Regards
Xisco
___
List Name: Libreoffice-qa mailing list
Mail address: libreoffice...@lists.freedesktop.org
Change settings: 
https://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? 
http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/

Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: chart2/source dbaccess/source desktop/source extensions/source include/svtools sc/source svtools/source sw/source

[Noel Grandin]

 chart2/source/controller/dialogs/dlg_CreationWizard.cxx |4 +---
 dbaccess/source/ui/dlg/dbwizsetup.cxx   |2 +-
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx |2 +-
 extensions/source/abpilot/abspilot.cxx  |3 +--
 include/svtools/extensionlistbox.hxx|2 +-
 include/svtools/fmtfield.hxx|2 +-
 include/svtools/grfmgr.hxx  |   14 +++---
 include/svtools/ivctrl.hxx  |4 ++--
 include/svtools/javainteractionhandler.hxx  |2 +-
 include/svtools/roadmapwizard.hxx   |6 ++
 include/svtools/scrwin.hxx  |3 +--
 include/svtools/treelistbox.hxx |3 +--
 sc/source/ui/view/printfun.cxx  |2 +-
 svtools/source/contnr/imivctl.hxx   |2 +-
 svtools/source/contnr/imivctl1.cxx  |   10 +-
 svtools/source/contnr/treelistbox.cxx   |4 ++--
 svtools/source/control/fmtfield.cxx |8 +---
 svtools/source/control/scriptedtext.cxx |   16 ++--
 svtools/source/control/scrwin.cxx   |5 ++---
 svtools/source/dialogs/roadmapwizard.cxx|8 
 svtools/source/graphic/grfmgr.cxx   |   16 
 svtools/source/graphic/grfmgr2.cxx  |   13 +
 svtools/source/java/javacontext.cxx |2 +-
 svtools/source/java/javainteractionhandler.cxx  |4 ++--
 sw/source/core/layout/paintfrm.cxx  |2 +-
 sw/source/ui/dbui/mailmergewizard.cxx   |3 +--
 26 files changed, 56 insertions(+), 86 deletions(-)

New commits:
commit c3c3e5b0554ca3f49649c96cf0b0b1b770713532
Author: Noel Grandin 
Date:   Fri Sep 9 08:37:09 2016 +0200

loplugin:constantparam in svtools

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

diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx 
b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 7402c58..268cf58 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -47,9 +47,7 @@ using namespace ::com::sun::star;
 
 CreationWizard::CreationWizard( vcl::Window* pParent, const uno::Reference< 
frame::XModel >& xChartModel
, const uno::Reference< uno::XComponentContext 
>& xContext )
-: svt::RoadmapWizard( pParent,
-WizardButtonFlags::HELP | WizardButtonFlags::CANCEL | 
WizardButtonFlags::PREVIOUS | WizardButtonFlags::NEXT | 
WizardButtonFlags::FINISH
-  )
+: svt::RoadmapWizard( pParent )
 , m_xChartModel(xChartModel,uno::UNO_QUERY)
 , m_xCC( xContext )
 , m_pTemplateProvider(nullptr)
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 197c321..b9f5e15 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -106,7 +106,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(vcl::Window* 
_pParent
,const Reference< XComponentContext >& _rxORB
,const css::uno::Any& _aDataSourceName
)
-:svt::RoadmapWizard( _pParent, WizardButtonFlags::NEXT | 
WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | 
WizardButtonFlags::CANCEL | WizardButtonFlags::HELP )
+:svt::RoadmapWizard( _pParent )
 
 , m_pOutSet(nullptr)
 , m_bIsConnectable( false)
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 3c74a32..445a7fa 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -178,7 +178,7 @@ ExtensionRemovedListener::~ExtensionRemovedListener()
 
 // ExtensionBox_Impl
 ExtensionBox_Impl::ExtensionBox_Impl(vcl::Window* pParent) :
-IExtensionListBox( pParent, WB_BORDER | WB_TABSTOP | WB_CHILDDLGCTRL ),
+IExtensionListBox( pParent ),
 m_bHasScrollBar( false ),
 m_bHasActive( false ),
 m_bNeedsRecalc( true ),
diff --git a/extensions/source/abpilot/abspilot.cxx 
b/extensions/source/abpilot/abspilot.cxx
index a7b6c79..5eee1ca 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -55,8 +55,7 @@ namespace abp
 using namespace ::com::sun::star::lang;
 
 OAddressBookSourcePilot::OAddressBookSourcePilot(vcl::Window* _pParent, 
const Reference< XComponentContext >& _rxORB)
-:OAddr

problem with loolwsd ./configure...

[Поляков Максим Александрович]

Hello.

I'm trying to configure libreoffice for my owncloud server based on RHEL7.2
And I've stuck on https://github.com/LibreOffice/online/tree/master/loolwsd

...
checking Poco/Net/WebSocket.h presence... yes
configure: WARNING: Poco/Net/WebSocket.h: present but cannot be compiled
configure: WARNING: Poco/Net/WebSocket.h: check for missing prerequisite 
headers?
configure: WARNING: Poco/Net/WebSocket.h: see the Autoconf documentation
configure: WARNING: Poco/Net/WebSocket.h: section "Present But Cannot Be 
Compiled"
configure: WARNING: Poco/Net/WebSocket.h: proceeding with the compiler's result
configure: WARNING: ##  ##
configure: WARNING: ## Report this to libreoffice@lists.freedesktop.org ##
configure: WARNING: ##  ##
checking for Poco/Net/WebSocket.h... no
configure: error: header Poco/Net/WebSocket.h not found, perhaps you want to 
use --with-poco-includes
...

I use command "/opt/git/online/loolwsd/configure --enable-silent-rules 
--with-lokit-path=/opt/git/libreoffice/include 
--with-lo-path=/opt/git/libreoffice/instdir --enable-debug 
--with-poco-includes=/opt/poco/Net/include -with-poco-libs=/opt/poco/lib".

The latest Poco compiled from 
http://pocoproject.org/releases/poco-1.7.5/poco-1.7.5-all.tar.gz  to /opt/poco/
LibreOffice is compiled from https://www.libreoffice.org/about-us/source-code/ 
to /opt/git/libreoffice

I've got the same issue with poco-*-1.7.4 from 
ftp://fr2.rpmfind.net/linux/sourceforge/k/ke/kenzy/special/C7/x86_64/

Any ideas?

Thank you in advance,
   Maxim Polyakov

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - extensions/source

[Markus Mohrhard]

 extensions/source/update/check/updatecheck.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 08f79e4686b97b8dae4acf0a804b8bbd1c29dd34
Author: Markus Mohrhard 
Date:   Mon Aug 8 04:44:09 2016 +0200

it is possible that Sources is empty

See e.g.

http://crashreport.libreoffice.org/stats/crash_details/570429b8-21e3-494e-9677-ea95fa8a5293

Change-Id: I8c05efd61fa5a91511c06c660c49a0c470a96c88
Reviewed-on: https://gerrit.libreoffice.org/27947
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 
Reviewed-on: https://gerrit.libreoffice.org/28753
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extensions/source/update/check/updatecheck.cxx 
b/extensions/source/update/check/updatecheck.cxx
index 8fe2363..86dc5c5 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -846,6 +846,12 @@ UpdateCheck::download()
 State eState = m_eState;
 aGuard.clear();
 
+if (aInfo.Sources.empty())
+{
+SAL_WARN("extension.updatecheck", "download called without source");
+return;
+}
+
 if( aInfo.Sources[0].IsDirect )
 {
 // Ignore second click of a double click
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 sc/source/filter/xml/xmlbodyi.cxx |4 ++--
 starmath/source/mathmlimport.cxx  |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e5981249db34db2367bae2a2f3e7e8d9f8bd09a0
Author: Noel Grandin 
Date:   Fri Sep 9 11:30:26 2016 +0200

loplugin:refcounting

Change-Id: Ic2ab440e011502a1df3cd658fd8a86acc5d5c31c

diff --git a/sc/source/filter/xml/xmlbodyi.cxx 
b/sc/source/filter/xml/xmlbodyi.cxx
index 88b4a34..379a3a5 100644
--- a/sc/source/filter/xml/xmlbodyi.cxx
+++ b/sc/source/filter/xml/xmlbodyi.cxx
@@ -236,8 +236,8 @@ void ScXMLBodyContext::EndElement()
 if (!bHadCalculationSettings)
 {
 // #111055#; set calculation settings defaults if there is no 
calculation settings element
-ScXMLCalculationSettingsContext aContext( GetScImport(), 
XML_NAMESPACE_TABLE, GetXMLToken(XML_CALCULATION_SETTINGS), nullptr );
-aContext.EndElement();
+rtl::Reference pContext( new 
ScXMLCalculationSettingsContext(GetScImport(), XML_NAMESPACE_TABLE, 
GetXMLToken(XML_CALCULATION_SETTINGS), nullptr) );
+pContext->EndElement();
 }
 
 ScXMLImport::MutexGuard aGuard(GetScImport());
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 2690824..6e526e4 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -2070,10 +2070,10 @@ SvXMLImportContext 
*SmXMLDocContext_Impl::CreateChildContext(
 /*Basically theres an implicit mrow around certain bare
  *elements, use a RowContext to see if this is one of
  *those ones*/
-SmXMLRowContext_Impl aTempContext(GetSmImport(),nPrefix,
-GetXMLToken(XML_MROW));
+rtl::Reference aTempContext(new 
SmXMLRowContext_Impl(GetSmImport(),nPrefix,
+GetXMLToken(XML_MROW)));
 
-pContext = aTempContext.StrictCreateChildContext(nPrefix,
+pContext = aTempContext->StrictCreateChildContext(nPrefix,
 rLocalName, xAttrList);
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 15 commits - include/xmloff writerperfect/inc writerperfect/qa writerperfect/source xmloff/inc xmloff/source

[David Tardon]

 include/xmloff/SchXMLImportHelper.hxx|   25 +-
 include/xmloff/shapeimport.hxx   |2 
 include/xmloff/xmlnumfi.hxx  |4 
 writerperfect/inc/WPXSvInputStream.hxx   |2 
 writerperfect/qa/unit/DirectoryStreamTest.cxx|   13 -
 writerperfect/source/calc/StarOfficeCalcImportFilter.cxx |2 
 writerperfect/source/common/WPXSvInputStream.cxx |   10 
 writerperfect/source/draw/StarOfficeDrawImportFilter.cxx |2 
 writerperfect/source/draw/ZMFImportFilter.cxx|2 
 writerperfect/source/writer/StarOfficeWriterImportFilter.cxx |   11 
 xmloff/inc/animationimport.hxx   |7 
 xmloff/inc/animimp.hxx   |5 
 xmloff/inc/xexptran.hxx  |   11 
 xmloff/source/chart/MultiPropertySetHandler.hxx  |   30 --
 xmloff/source/chart/SchXMLImport.cxx |   54 +---
 xmloff/source/draw/animationimport.cxx   |   34 --
 xmloff/source/draw/animimp.cxx   |   13 -
 xmloff/source/draw/shapeimport.cxx   |   29 --
 xmloff/source/draw/xexptran.cxx  |  135 ++-
 xmloff/source/draw/ximpcustomshape.cxx   |   23 -
 xmloff/source/draw/ximpshap.cxx  |   26 --
 xmloff/source/draw/ximpshap.hxx  |3 
 xmloff/source/draw/ximpstyl.cxx  |   11 
 xmloff/source/draw/ximpstyl.hxx  |6 
 xmloff/source/style/xmlnumfi.cxx |   46 +--
 25 files changed, 173 insertions(+), 333 deletions(-)

New commits:
commit 43c6b20b9fef7b6d331ae15cfcc9fd2632799584
Author: David Tardon 
Date:   Fri Sep 9 11:44:18 2016 +0200

use std::unique_ptr

Change-Id: I46dd045b2648f711b3e29ffea0c2e264c141293c

diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 9d035e4..e2b0f8d 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -65,11 +65,11 @@ struct SvXMLNumFmtEntry
 class SvXMLNumImpData
 {
 SvNumberFormatter*  pFormatter;
-SvXMLTokenMap*  pStylesElemTokenMap;
-SvXMLTokenMap*  pStyleElemTokenMap;
-SvXMLTokenMap*  pStyleAttrTokenMap;
-SvXMLTokenMap*  pStyleElemAttrTokenMap;
-LocaleDataWrapper*  pLocaleData;
+std::unique_ptr  pStylesElemTokenMap;
+std::unique_ptr  pStyleElemTokenMap;
+std::unique_ptr  pStyleAttrTokenMap;
+std::unique_ptr  pStyleElemAttrTokenMap;
+std::unique_ptr  pLocaleData;
 std::vector m_NameEntries;
 
 uno::Reference< uno::XComponentContext > m_xContext;
@@ -78,7 +78,6 @@ public:
 SvXMLNumImpData(
 SvNumberFormatter* pFmt,
 const uno::Reference& rxContext );
-~SvXMLNumImpData();
 
 SvNumberFormatter*  GetNumberFormatter() const  { return pFormatter; }
 const SvXMLTokenMap&GetStylesElemTokenMap();
@@ -365,25 +364,11 @@ SvXMLNumImpData::SvXMLNumImpData(
 SvNumberFormatter* pFmt,
 const uno::Reference& rxContext )
 :   pFormatter(pFmt),
-pStylesElemTokenMap(nullptr),
-pStyleElemTokenMap(nullptr),
-pStyleAttrTokenMap(nullptr),
-pStyleElemAttrTokenMap(nullptr),
-pLocaleData(nullptr),
 m_xContext(rxContext)
 {
 SAL_WARN_IF( !rxContext.is(), "xmloff", "got no service manager" );
 }
 
-SvXMLNumImpData::~SvXMLNumImpData()
-{
-delete pStylesElemTokenMap;
-delete pStyleElemTokenMap;
-delete pStyleAttrTokenMap;
-delete pStyleElemAttrTokenMap;
-delete pLocaleData;
-}
-
 sal_uInt32 SvXMLNumImpData::GetKeyForName( const OUString& rName )
 {
 sal_uInt16 nCount = m_NameEntries.size();
@@ -479,7 +464,7 @@ const SvXMLTokenMap& 
SvXMLNumImpData::GetStylesElemTokenMap()
 XML_TOKEN_MAP_END
 };
 
-pStylesElemTokenMap = new SvXMLTokenMap( aStylesElemMap );
+pStylesElemTokenMap = o3tl::make_unique( aStylesElemMap 
);
 }
 return *pStylesElemTokenMap;
 }
@@ -517,7 +502,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleElemTokenMap()
 XML_TOKEN_MAP_END
 };
 
-pStyleElemTokenMap = new SvXMLTokenMap( aStyleElemMap );
+pStyleElemTokenMap = o3tl::make_unique( aStyleElemMap );
 }
 return *pStyleElemTokenMap;
 }
@@ -548,7 +533,7 @@ const SvXMLTokenMap& SvXMLNumImpData::GetStyleAttrTokenMap()
 XML_TOKEN_MAP_END
 };
 
-pStyleAttrTokenMap = new SvXMLTokenMap( aStyleAttrMap );
+pStyleAttrTokenMap = o3tl::make_unique( aStyleAttrMap );
 }
 return *pStyleAttrTokenMap;
 }
@@ -594,7 +579,7 @@ const SvXMLTokenMap& 
SvXMLNumImpData::GetStyleElemAttrTokenMap()
 XML_TOKEN_MAP_END
 };
 
-pStyleElemAttrTokenMap = new SvXMLT

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

[Caolán McNamara]

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

New commits:
commit 3d7d318914bd69262da647e0db23ec47d6550afe
Author: Caolán McNamara 
Date:   Fri Sep 9 10:50:37 2016 +0100

Resolves: tdf#101921 no tab navigation in style&formatting sidebar

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

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 15859ef..55909bd 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -343,7 +343,7 @@ VclPtr SfxActionListBox::CreateContextMenu()
 }
 
 SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, 
vcl::Window* pParentWindow)
-: Window(pParentWindow)
+: Window(pParentWindow, WB_DIALOGCONTROL)
 , pImpl(new SfxTemplateDialog_Impl(pBindings, this))
 , mpBindings(pBindings)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sfx2/source/dialog/templdlg.cxx |4 ++--
 sfx2/source/inc/templdgi.hxx|2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6744039f1becbc182445685a5cba3ed8a0be2705
Author: Caolán McNamara 
Date:   Fri Sep 9 10:52:25 2016 +0100

Related: tdf#101921 get taborder to match visual order

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

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 55909bd..9ba17a5 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -689,8 +689,8 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( 
SfxBindings* pB, vcl
 , m_pDeletionWatcher(nullptr)
 
 , aFmtLb( VclPtr::Create(this, WB_BORDER | WB_TABSTOP | 
WB_SORT | WB_QUICK_SEARCH) )
-, aFilterLb( VclPtr::Create(pW, WB_BORDER | WB_DROPDOWN | 
WB_TABSTOP) )
 , aPreviewCheckbox( VclPtr::Create( pW, WB_VCENTER ))
+, aFilterLb( VclPtr::Create(pW, WB_BORDER | WB_DROPDOWN | 
WB_TABSTOP) )
 
 , nActFamily(0x)
 , nActFilter(0)
@@ -917,8 +917,8 @@ 
SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
 if ( m_pDeletionWatcher )
 m_pDeletionWatcher->signal();
 aFmtLb.disposeAndClear();
-aFilterLb.disposeAndClear();
 aPreviewCheckbox.disposeAndClear();
+aFilterLb.disposeAndClear();
 }
 
 // Helper function: Access to the current family item
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 8300daa..d641b83 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -185,8 +185,8 @@ protected:
 DeletionWatcher* m_pDeletionWatcher;
 
 VclPtr aFmtLb;
-VclPtr aFilterLb;
 VclPtr aPreviewCheckbox;
+VclPtr aFilterLb;
 
 sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1
 sal_uInt16 nActFilter; // FilterIdx
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 sw/source/ui/config/optload.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 89d77f9d96bbdb8385a49812c731ebbd8e331912
Author: Andras Timar 
Date:   Fri Sep 9 10:19:47 2016 +0200

handle read-only state of wordcount settings

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

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index cde9a8b..214a961 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -345,10 +345,13 @@ void SwLoadOptPage::Reset( const SfxItemSet* rSet)
 m_pUseCharUnit->SaveValue();
 
 
m_pWordCountED->SetText(officecfg::Office::Writer::WordCount::AdditionalSeparators::get());
+
m_pWordCountED->Enable(!officecfg::Office::Writer::WordCount::AdditionalSeparators::isReadOnly());
 m_pWordCountED->SaveValue();
 
m_pShowStandardizedPageCount->Check(officecfg::Office::Writer::WordCount::ShowStandardizedPageCount::get());
+
m_pShowStandardizedPageCount->Enable(!officecfg::Office::Writer::WordCount::ShowStandardizedPageCount::isReadOnly());
 m_pShowStandardizedPageCount->SaveValue();
 
m_pStandardizedPageSizeNF->SetValue(officecfg::Office::Writer::WordCount::StandardizedPageSize::get());
+
m_pStandardizedPageSizeNF->Enable(!officecfg::Office::Writer::WordCount::StandardizedPageSize::isReadOnly());
 m_pStandardizedPageSizeNF->SaveValue();
 
m_pStandardizedPageSizeNF->Enable(m_pShowStandardizedPageCount->IsChecked());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 cui/source/options/optgdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f4fcec5f0802620192c31aad24db436ead1b2036
Author: Andras Timar 
Date:   Fri Sep 9 10:41:45 2016 +0200

handle read-only state of collect usage information setting

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

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 0058b32..0371321 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -401,6 +401,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet* rSet )
 }
 
 
m_pCollectUsageInfo->Check(officecfg::Office::Common::Misc::CollectUsageInformation::get());
+
m_pCollectUsageInfo->Enable(!officecfg::Office::Common::Misc::CollectUsageInformation::isReadOnly());
 m_pCollectUsageInfo->SaveValue();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/tdf44986.rtf |   35 +++
 sw/qa/extras/rtfimport/rtfimport.cxx |   10 ++
 writerfilter/source/rtftok/rtfdispatchsymbol.cxx |   10 ++
 writerfilter/source/rtftok/rtfdispatchvalue.cxx  |3 +
 writerfilter/source/rtftok/rtfdocumentimpl.cxx   |8 -
 writerfilter/source/rtftok/rtfdocumentimpl.hxx   |3 +
 6 files changed, 68 insertions(+), 1 deletion(-)

New commits:
commit 246df61b34e1ff5b5d7ecf7e46f04bb677548c9a
Author: Miklos Vajna 
Date:   Tue Sep 6 08:16:37 2016 +0200

tdf#44986 RTF import: handle \trwWidthA by faking cells

The DOCX import handles this at a tokenizer level, so let's do the same
in the RTF case as well.

(cherry picked from commit 0f2d5db38bac64b665c6e4a127bbbd63a7ed9af5)

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

diff --git a/sw/qa/extras/rtfimport/data/tdf44986.rtf 
b/sw/qa/extras/rtfimport/data/tdf44986.rtf
new file mode 100644
index 000..d255e10
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/tdf44986.rtf
@@ -0,0 +1,35 @@
+{\rtf1
+\pard\plain \ltrpar\ql 
\li0\ri0\widctlpar\wrapdefault\nooverflow\faroman\rin0\lin0\itap0\pararsid8937578
 \rtlch\fcs1
+\af0\afs20\alang1025 \ltrch\fcs0 
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid7962097 before}
+{\rtlch\fcs1 \ab\af0 \ltrch\fcs0 \b\insrsid11416584
+\par \ltrrow}
+\trowd 
\irow0\irowband0\ltrrow\ts11\trgaph70\trleft-144\trkeep\trbrdrt\brdrs\brdrw15 
\trbrdrl\brdrs\brdrw15 \trbrdrb\brdrs\brdrw15 \trbrdrr\brdrs\brdrw15
+\trftsWidth1\trftsWidthB3\trftsWidthA3\trwWidthA6237\trpaddl70\trpaddr70\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind-74\tblindtype3
 \clvertalt\clbrdrt\brdrs\brdrw15 \clbrdrl\brdrs\brdrw15 \clbrdrb\brdrnone 
\clbrdrr\brdrs\brdrw15
+\cltxlrtb\clftsWidth3\clwWidth3405\clshdrawnil \cellx3261\pard\plain 
\ltrpar\ql \li0\ri0\widctlpar\intbl\wrapdefault\nooverflow\faroman\rin0\lin0 
\rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031
+{
+\rtlch\fcs1 \af4\afs16 \ltrch\fcs0 
\fs16\loch\af4\hich\af4\dbch\af31505\insrsid15290907\charrsid14246932 
\hich\af4\dbch\af31505\loch\f4 A1}
+{\rtlch\fcs1 \af4 \ltrch\fcs0 
\loch\af4\hich\af4\dbch\af31505\insrsid11416584\charrsid14246932 \cell
+}
+\pard\plain \ltrpar\ql 
\li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031
+{\rtlch\fcs1 \af0 \ltrch\fcs0
+\insrsid11416584\charrsid14246932 \trowd 
\irow0\irowband0\ltrrow\ts11\trgaph70\trleft-144\trkeep\trbrdrt\brdrs\brdrw15 
\trbrdrl\brdrs\brdrw15 \trbrdrb\brdrs\brdrw15 \trbrdrr\brdrs\brdrw15
+\trftsWidth1\trftsWidthB3\trftsWidthA3\trwWidthA6237\trpaddl70\trpaddr70\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind-74\tblindtype3
 \clvertalt\clbrdrt\brdrs\brdrw15 \clbrdrl\brdrs\brdrw15 \clbrdrb\brdrnone 
\clbrdrr\brdrs\brdrw15
+\cltxlrtb\clftsWidth3\clwWidth3405\clshdrawnil \cellx3261\row \ltrrow}
+\trowd \irow1\irowband1\lastrow 
\ltrrow\ts11\trgaph70\trleft-144\trbrdrt\brdrs\brdrw15 \trbrdrl\brdrs\brdrw15 
\trbrdrb\brdrs\brdrw15 \trbrdrr\brdrs\brdrw15
+\trftsWidth1\trftsWidthB3\trpaddl70\trpaddr70\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind-74\tblindtype3
 \clvertalt\clbrdrt\brdrs\brdrw15 \clbrdrl\brdrs\brdrw15 \clbrdrb\brdrnone 
\clbrdrr\brdrs\brdrw15 \cltxlrtb\clftsWidth3\clwWidth9642\clshdrawnil
+\cellx9498\pard\plain \ltrpar\ql 
\li0\ri0\widctlpar\intbl\wrapdefault\nooverflow\faroman\rin0\lin0 \rtlch\fcs1 
\af0\afs20\alang1025 \ltrch\fcs0 
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031
+{\rtlch\fcs1 \af1\afs16 \ltrch\fcs0
+\fs16\loch\af1\hich\af1\dbch\af31505\insrsid15290907\charrsid14246932 
\hich\af1\dbch\af31505\loch\f1 A2}
+{\rtlch\fcs1 \af1\afs16 \ltrch\fcs0 
\fs16\loch\af1\hich\af1\dbch\af31505\insrsid11416584\charrsid14246932 \cell }
+\pard\plain \ltrpar
+\ql 
\li0\ri0\widctlpar\intbl\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0
 \rtlch\fcs1 \af0\afs20\alang1025 \ltrch\fcs0 
\fs20\lang1031\langfe1031\cgrid\langnp1031\langfenp1031
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid11416584\charrsid14246932
+\trowd \irow1\irowband1\lastrow 
\ltrrow\ts11\trgaph70\trleft-144\trbrdrt\brdrs\brdrw15 \trbrdrl\brdrs\brdrw15 
\trbrdrb\brdrs\brdrw15 \trbrdrr\brdrs\brdrw15
+\trftsWidth1\trftsWidthB3\trpaddl70\trpaddr70\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind-74\tblindtype3
 \clvertalt\clbrdrt\brdrs\brdrw15 \clbrdrl\brdrs\brdrw15 \clbrdrb\brdrnone 
\clbrdrr\brdrs\brdrw15 \cltxlrtb\clftsWidth3\clwWidth9642\clshdrawnil
+\cellx9498\row }
+\pard \ltrpar\ql 
\li0\ri0\widctlpar\wrapdefault\nooverflow\faroman\rin0\lin0\itap0\pararsid8937578
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid7962097 after}
+{\rtlch\fcs1 \af0 \ltrch\fcs0 \insrsid14

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

[Khaled Hosny]

 vcl/unx/generic/glyphs/gcach_layout.cxx |   23 +--
 1 file changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 69885cb07b7cc8290946c97d45f0b7379dcf77b1
Author: Khaled Hosny 
Date:   Wed Sep 7 17:11:17 2016 +0200

Fix not-so-newly introduced perf regression in vcl

Reverts f688acfdae00ebdd891737e533d54368810185e1 and the cluster
boundaries part of 1da9b4c24e806ad2447b4a656e2a7192755bb6a8, checking
the user of the GlyphItem::IS_IN_CLUSTER flag again, I think the old
code provides what they expect.

(cherry picked from commit 6323e6628668849438e6e19ba7ad2c6598263261)

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

diff --git a/vcl/unx/generic/glyphs/gcach_layout.cxx 
b/vcl/unx/generic/glyphs/gcach_layout.cxx
index dc9a84f..d8bf44b 100644
--- a/vcl/unx/generic/glyphs/gcach_layout.cxx
+++ b/vcl/unx/generic/glyphs/gcach_layout.cxx
@@ -326,7 +326,6 @@ private:
 hb_script_t maHbScript;
 hb_face_t*  mpHbFace;
 int mnUnitsPerEM;
-css::uno::Reference mxBreak;
 
 public:
 explicitHbLayoutEngine(ServerFont&);
@@ -513,12 +512,6 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 hb_glyph_info_t *pHbGlyphInfos = 
hb_buffer_get_glyph_infos(pHbBuffer, nullptr);
 hb_glyph_position_t *pHbPositions = 
hb_buffer_get_glyph_positions(pHbBuffer, nullptr);
 
-sal_Int32 nGraphemeStartPos = 
std::numeric_limits::max();
-sal_Int32 nGraphemeEndPos = std::numeric_limits::min();
-if (!mxBreak.is())
-mxBreak = vcl::unohelper::CreateBreakIterator();
-com::sun::star::lang::Locale 
aLocale(rArgs.maLanguageTag.getLocale());
-
 for (int i = 0; i < nRunGlyphCount; ++i) {
 int32_t nGlyphIndex = pHbGlyphInfos[i].codepoint;
 int32_t nCharPos = pHbGlyphInfos[i].cluster;
@@ -539,22 +532,8 @@ bool HbLayoutEngine::Layout(ServerFontLayout& rLayout, 
ImplLayoutArgs& rArgs)
 nGlyphIndex = rFont.FixupGlyphIndex(nGlyphIndex, aChar);
 
 bool bInCluster = false;
-if(bRightToLeft && (nCharPos < nGraphemeStartPos))
-{
-sal_Int32 nDone;
-nGraphemeStartPos = 
mxBreak->previousCharacters(rArgs.mrStr, nCharPos+1, aLocale,
-  
com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
-}
-else if(!bRightToLeft && (nCharPos >= nGraphemeEndPos))
-{
-sal_Int32 nDone;
-nGraphemeEndPos = mxBreak->nextCharacters(rArgs.mrStr, 
nCharPos, aLocale,
-  
com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
-}
-else
-{
+if (i > 0 && pHbGlyphInfos[i].cluster == pHbGlyphInfos[i - 
1].cluster)
 bInCluster = true;
-}
 
 long nGlyphFlags = 0;
 if (bRightToLeft)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/source include/sot include/store include/svl registry/source sd/source sot/source starmath/inc starmath/source stoc/source svl/source

[Noel Grandin]

 editeng/source/editeng/editeng.cxx  |2 +-
 include/sot/stg.hxx |6 +++---
 include/store/store.hxx |7 +++
 include/svl/grabbagitem.hxx |2 +-
 include/svl/ondemand.hxx|5 ++---
 include/svl/style.hxx   |2 +-
 registry/source/regimpl.cxx |2 +-
 registry/source/regimpl.hxx |2 --
 sd/source/ui/view/drawview.cxx  |2 +-
 sot/source/sdstor/stg.cxx   |5 +
 sot/source/sdstor/ucbstorage.cxx|8 +++-
 starmath/inc/caret.hxx  |5 ++---
 starmath/source/caret.cxx   |5 ++---
 stoc/source/corereflection/crefl.cxx|4 +---
 stoc/source/corereflection/lrucache.hxx |6 +++---
 svl/source/items/grabbagitem.cxx|4 +---
 svl/source/misc/strmadpt.cxx|   15 +--
 svl/source/numbers/zforlist.cxx |3 +--
 18 files changed, 32 insertions(+), 53 deletions(-)

New commits:
commit cb958bb5e0e81d343c91c08a8513006a7bf1d913
Author: Noel Grandin 
Date:   Fri Sep 9 11:06:42 2016 +0200

loplugin:constantparam in sot..svl

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

diff --git a/editeng/source/editeng/editeng.cxx 
b/editeng/source/editeng/editeng.cxx
index 596d471..65866a3 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1293,7 +1293,7 @@ bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, 
EditView* pEditView, v
 
pImpEditEngine->xLocaleDataWrapper.changeLocale( aLanguageTag);
 
 if 
(!pImpEditEngine->xTransliterationWrapper.isInitialized())
-
pImpEditEngine->xTransliterationWrapper.init( 
SvtSysLocale().GetLocaleData().getComponentContext(), eLang, 
i18n::TransliterationModules_IGNORE_CASE);
+
pImpEditEngine->xTransliterationWrapper.init( 
SvtSysLocale().GetLocaleData().getComponentContext(), eLang);
 else
 
pImpEditEngine->xTransliterationWrapper.changeLocale( eLang);
 
diff --git a/include/sot/stg.hxx b/include/sot/stg.hxx
index 2654fd7..9439c28 100644
--- a/include/sot/stg.hxx
+++ b/include/sot/stg.hxx
@@ -101,7 +101,7 @@ public:
 virtual boolRevert() = 0;
 virtual BaseStorageStream*  OpenStream( const OUString & rEleName,
 StreamMode = 
StreamMode::STD_READWRITE,
-bool bDirect = true, const 
OString* pKey=nullptr ) = 0;
+bool bDirect = true ) = 0;
 virtual BaseStorage*OpenStorage( const OUString & rEleName,
  StreamMode = 
StreamMode::STD_READWRITE,
  bool bDirect = false ) = 0;
@@ -189,7 +189,7 @@ public:
 virtual boolRevert() override;
 virtual BaseStorageStream*  OpenStream( const OUString & rEleName,
 StreamMode = 
StreamMode::STD_READWRITE,
-bool bDirect = true, const 
OString* pKey=nullptr ) override;
+bool bDirect = true ) override;
 virtual BaseStorage*OpenStorage( const OUString & rEleName,
  StreamMode = 
StreamMode::STD_READWRITE,
  bool bDirect = false ) override;
@@ -292,7 +292,7 @@ public:
 virtual boolRevert() override;
 virtual BaseStorageStream*  OpenStream( const OUString & rEleName,
 StreamMode = 
StreamMode::STD_READWRITE,
-bool bDirect = true, const 
OString* pKey=nullptr ) override;
+bool bDirect = true ) override;
 virtual BaseStorage*OpenStorage( const OUString & rEleName,
  StreamMode = 
StreamMode::STD_READWRITE,
  bool bDirect = false ) override;
diff --git a/include/store/store.hxx b/include/store/store.hxx
index 672b219..012afd1 100644
--- a/include/store/store.hxx
+++ b/include/store/store.hxx
@@ -299,17 +299,16 @@ public:
 /** Open the file.
 @see store_openFile()
  */
-inline storeError create (
+inline storeError create(
 rtl::OUString const & rFilename,
-storeAccessMode   eAccessMode,
-sal_uInt16nPageSize = STORE_DEFAULT_PAGESIZE)
+storeAccessMode   eAccessMode )
 {
 if (m_hImpl)
 {
 

[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - xmloff/source

[Eike Rathke]

 xmloff/source/style/xmlnumfi.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 7f037e2230d059320aff8610b6d24c0a44a71e41
Author: Eike Rathke 
Date:   Wed Sep 7 21:04:43 2016 +0200

Resolves: tdf#101963 loading zh-TW ROC calendar use EE|E instead of |YY

This still (unnecessarily) prefixes with [~ROC] but preserves the
intended "no leading zero" semantics.

Change-Id: I154be0978a8147ceddefcb546c257d44f770b5de
(cherry picked from commit 95c91f098e8974c41c8d403a351fe53db6822165)
Reviewed-on: https://gerrit.libreoffice.org/28732
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/xmloff/source/style/xmlnumfi.cxx b/xmloff/source/style/xmlnumfi.cxx
index 3120bea..bf9ab75 100644
--- a/xmloff/source/style/xmlnumfi.cxx
+++ b/xmloff/source/style/xmlnumfi.cxx
@@ -1135,11 +1135,17 @@ void SvXMLNumFmtElementContext::EndElement()
 case XML_TOK_STYLE_YEAR:
 rParent.UpdateCalendar( sCalendar );
 //! I18N doesn't provide SYSTEM or extended date information yet
-// Y after G (era) is replaced by E
-if ( rParent.HasEra() )
+// Y after G (era) is replaced by E, also if we're switching to the
+// other second known calendar for a locale.
+/* TODO: here only for zh-TW, handle for other locales as well. */
+if ( rParent.HasEra() ||
+(sCalendar.equalsIgnoreAsciiCaseAscii("ROC") &&
+ rParent.GetLocaleData().getLoadedLanguageTag().getBcp47() 
== "zh-TW"))
+{
 rParent.AddNfKeyword(
 sal::static_int_cast< sal_uInt16 >(
 bEffLong ? NF_KEY_EEC : NF_KEY_EC ) );
+}
 else
 rParent.AddNfKeyword(
 sal::static_int_cast< sal_uInt16 >(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/xmloff/xmlnumi.hxx  |2 ++
 xmloff/source/style/xmlnumi.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 9dc0f2b703d8fbc8698a3cf36949a981e55b68c6
Author: Stephan Bergmann 
Date:   Fri Sep 9 14:26:53 2016 +0200

Blind fix for MSVC

Change-Id: I1b3e21e9fdf1ac14e095df203cb48fdd1b4fd028

diff --git a/include/xmloff/xmlnumi.hxx b/include/xmloff/xmlnumi.hxx
index ee7913a..b1a0687 100644
--- a/include/xmloff/xmlnumi.hxx
+++ b/include/xmloff/xmlnumi.hxx
@@ -66,6 +66,8 @@ public:
 const css::uno::Reference< css::xml::sax::XAttributeList >& 
xAttrList,
 bool bOutl = false );
 
+~SvxXMLListStyleContext() override;
+
 virtual SvXMLImportContext *CreateChildContext(
 sal_uInt16 nPrefix,
 const OUString& rLocalName,
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index dbe28d7..ce964ba 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -1033,6 +1033,8 @@ SvxXMLListStyleContext::SvxXMLListStyleContext( 
SvXMLImport& rImport,
 {
 }
 
+SvxXMLListStyleContext::~SvxXMLListStyleContext() {}
+
 SvXMLImportContext *SvxXMLListStyleContext::CreateChildContext(
 sal_uInt16 nPrefix,
 const OUString& rLocalName,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/sfx2 sc/source sd/source sfx2/Library_sfx.mk sfx2/source shell/inc shell/source sw/source

[Noel Grandin]

 cui/source/factory/dlgfact.cxx|   49 ++
 cui/source/factory/dlgfact.hxx|8 --
 include/sfx2/basedlgs.hxx |4 -
 include/sfx2/bindings.hxx |   14 +---
 include/sfx2/dispatch.hxx |6 -
 include/sfx2/emojiview.hxx|2 
 include/sfx2/mailmodelapi.hxx |2 
 include/sfx2/saveastemplatedlg.hxx|2 
 include/sfx2/sfxdlg.hxx   |8 --
 include/sfx2/templatedlg.hxx  |2 
 include/sfx2/thumbnailview.hxx|2 
 include/sfx2/titledockwin.hxx |2 
 include/sfx2/tplpitem.hxx |3 
 sc/source/ui/pagedlg/tphf.cxx |8 +-
 sd/source/ui/dlg/PaneDockingWindow.cxx|2 
 sfx2/Library_sfx.mk   |2 
 sfx2/source/appl/appinit.cxx  |4 -
 sfx2/source/appl/appserv.cxx  |   13 +--
 sfx2/source/appl/sfxpicklist.cxx  |9 +-
 sfx2/source/control/bindings.cxx  |   14 +---
 sfx2/source/control/dispatch.cxx  |6 -
 sfx2/source/control/emojiview.cxx |4 -
 sfx2/source/control/templatesearchview.cxx|4 -
 sfx2/source/control/thumbnailview.cxx |4 -
 sfx2/source/dialog/basedlgs.cxx   |5 -
 sfx2/source/dialog/mailmodel.cxx  |   38 +-
 sfx2/source/dialog/splitwin.cxx   |4 -
 sfx2/source/dialog/titledockwin.cxx   |5 -
 sfx2/source/dialog/tplpitem.cxx   |5 -
 sfx2/source/doc/saveastemplatedlg.cxx |4 -
 sfx2/source/doc/sfxbasemodel.cxx  |4 -
 sfx2/source/doc/templatedlg.cxx   |4 -
 sfx2/source/inc/openurlhint.hxx   |   38 ++
 sfx2/source/inc/splitwin.hxx  |3 
 sfx2/source/inc/stringhint.hxx|   38 --
 sfx2/source/inc/templatesearchview.hxx|2 
 sfx2/source/notify/openurlhint.cxx|   34 +
 sfx2/source/notify/stringhint.cxx |   33 -
 sfx2/source/view/viewfrm.cxx  |2 
 sfx2/source/view/viewsh.cxx   |2 
 shell/inc/xml_parser.hxx  |2 
 shell/source/all/xml_parser.cxx   |4 -
 shell/source/sessioninstall/SyncDbusSessionHelper.cxx |8 +-
 shell/source/tools/lngconvex/lngconvex.cxx|5 -
 shell/source/unix/sysshell/recently_used_file_handler.cxx |6 -
 sw/source/uibase/app/docsh2.cxx   |6 -
 46 files changed, 170 insertions(+), 256 deletions(-)

New commits:
commit 20c14c812ccc00692d42d294d3b8dea1774e3511
Author: Noel Grandin 
Date:   Fri Sep 9 13:26:44 2016 +0200

loplugin:constantparam in sfx2

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

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 2dac025..e732c7b 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -861,54 +861,21 @@ VclAbstractDialog* 
AbstractDialogFactory_Impl::CreateFrameDialog( const Referenc
 }
 
 // TabDialog outside the drawing layer
-SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 
nResId,
-vcl::Window* pParent,
-const SfxItemSet* pAttrSet,
-SfxViewFrame* )
+SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateAutoCorrTabDialog( 
const SfxItemSet* pAttrSet )
 {
-SfxTabDialog* pDlg=nullptr;
-switch ( nResId )
-{
-case RID_OFA_AUTOCORR_DLG :
-pDlg = VclPtr::Create( pParent, pAttrSet );
-break;
-case RID_SVXDLG_CUSTOMIZE :
-pDlg = VclPtr::Create( pParent, pAttrSet );
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new CuiAbstractTabDialog_Impl( pDlg );
-return nullptr;
+VclPtrInstance pDlg( nullptr, pAttrSet );
+return new CuiAbstractTabDialog_Impl( pDlg );
 }
 
-SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabDialog( sal_uInt32 
nResId,
-vcl::Window* pP

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

[Justin Luth]

 sw/qa/extras/ooxmlexport/data/tdf86926_A3.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx  |7 +++
 writerfilter/source/dmapper/PropertyMap.cxx|2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit bdd4a238a1d8a0cbbebbd759011050659668f92b
Author: Justin Luth 
Date:   Fri Sep 9 12:42:55 2016 +0300

tdf#86926 writerfilter allow fallback if exceptions

The multiset routine was put in to increase the speed of applying
properties.  However, if one property causes an exception, the
remaining properties are never applied. There is already a fallback
routine (if the multiset can't be created), so use that instead
of returning in a failed state.

Change-Id: Iac53edd5fca8e8543d536609113a7b1109befd82
Reviewed-on: https://gerrit.libreoffice.org/28765
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf86926_A3.docx 
b/sw/qa/extras/ooxmlexport/data/tdf86926_A3.docx
new file mode 100644
index 000..a4392dc
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf86926_A3.docx 
differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 5da3ee2..03b77a7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -978,6 +978,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf96750_landscapeFollow, 
"tdf96750_landscapeFollow
 CPPUNIT_ASSERT_EQUAL(true, getProperty(xStyle, "IsLandscape"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf86926_A3, "tdf86926_A3.docx")
+{
+uno::Reference 
xStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(42000), getProperty(xStyle, 
"Height"));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(29700), getProperty(xStyle, 
"Width"));
+}
+
 
DECLARE_OOXMLEXPORT_TEST(testTdf64372_continuousBreaks,"tdf64372_continuousBreaks.docx")
 {
 //There are no page breaks, so everything should be on the first page.
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index c0e646c..2631fbc 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1485,12 +1485,12 @@ void SectionPropertyMap::ApplyProperties_(
 try
 {
 
xMultiSet->setPropertyValues(comphelper::containerToSequence(vNames), 
comphelper::containerToSequence(vValues));
+return;
 }
 catch( const uno::Exception& )
 {
 OSL_FAIL( "Exception in SectionPropertyMap::ApplyProperties_");
 }
-return;
 }
 for (size_t i = 0; i < vNames.size(); ++i)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 9 commits - editeng/source include/xmloff xmloff/inc xmloff/source

[David Tardon]

 editeng/source/items/xmlcnitm.cxx   |3 
 include/xmloff/XMLFontStylesContext.hxx |   12 -
 include/xmloff/XMLTextListAutoStylePool.hxx |3 
 include/xmloff/controlpropertyhdl.hxx   |   20 +-
 include/xmloff/unoatrcn.hxx |   11 -
 xmloff/inc/txtlists.hxx |   10 -
 xmloff/source/core/unoatrcn.cxx |   14 -
 xmloff/source/forms/controlpropertyhdl.cxx  |   48 +
 xmloff/source/forms/elementexport.cxx   |   27 +--
 xmloff/source/forms/elementexport.hxx   |6 
 xmloff/source/forms/propertyexport.cxx  |  208 +++-
 xmloff/source/style/XMLFontStylesContext.cxx|9 -
 xmloff/source/text/XMLTextFrameContext.cxx  |   13 -
 xmloff/source/text/XMLTextFrameContext.hxx  |5 
 xmloff/source/text/XMLTextListAutoStylePool.cxx |   11 -
 xmloff/source/text/txtlists.cxx |   68 ++-
 16 files changed, 196 insertions(+), 272 deletions(-)

New commits:
commit 8e11d353665242fc90ef485ff8f67a44206b6393
Author: David Tardon 
Date:   Fri Sep 9 14:55:12 2016 +0200

use std::unique_ptr

Change-Id: I8ba37267e8a7058ade54783ea0e117a8f8816c45

diff --git a/editeng/source/items/xmlcnitm.cxx 
b/editeng/source/items/xmlcnitm.cxx
index c1e397f..520b3b1 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -73,7 +74,7 @@ sal_uInt16 SvXMLAttrContainerItem::GetVersion( sal_uInt16 
/*nFileFormatVersion*/
 bool SvXMLAttrContainerItem::QueryValue( css::uno::Any& rVal, sal_uInt8 
/*nMemberId*/ ) const
 {
 Reference xContainer =
-new SvUnoAttributeContainer( new SvXMLAttrContainerData( *pImpl.get() 
) );
+new SvUnoAttributeContainer( 
o3tl::make_unique( *pImpl.get() ) );
 
 rVal <<= xContainer;
 return true;
diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index 1f81e91..7ba70ad 100644
--- a/include/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
@@ -21,6 +21,9 @@
 #define INCLUDED_XMLOFF_UNOATRCN_HXX
 
 #include 
+
+#include 
+
 #include 
 #include 
 #include 
@@ -41,16 +44,14 @@ class XMLOFF_DLLPUBLIC SvUnoAttributeContainer:
 css::container::XNameContainer >
 {
 private:
-SvXMLAttrContainerData* mpContainer;
+std::unique_ptr mpContainer;
 
 SAL_DLLPRIVATE sal_uInt16 getIndexByName(const OUString& aName )
 const;
 
 public:
-SvUnoAttributeContainer( SvXMLAttrContainerData* pContainer = nullptr );
-virtual ~SvUnoAttributeContainer();
-
-SvXMLAttrContainerData* GetContainerImpl() const { return mpContainer; }
+SvUnoAttributeContainer( std::unique_ptr 
pContainer = nullptr );
+SvXMLAttrContainerData* GetContainerImpl() const { return 
mpContainer.get(); }
 
 static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
 virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< 
sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) 
override;
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index 1fae778..fec3e48 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -38,16 +39,11 @@ uno::Reference< uno::XInterface >  
SvUnoAttributeContainer_CreateInstance()
 return *(new SvUnoAttributeContainer);
 }
 
-SvUnoAttributeContainer::SvUnoAttributeContainer( SvXMLAttrContainerData* 
pContainer)
-: mpContainer( pContainer )
+SvUnoAttributeContainer::SvUnoAttributeContainer( 
std::unique_ptr pContainer)
+: mpContainer( std::move( pContainer ) )
 {
-if( mpContainer == nullptr )
-mpContainer = new SvXMLAttrContainerData;
-}
-
-SvUnoAttributeContainer::~SvUnoAttributeContainer()
-{
-delete mpContainer;
+if( !mpContainer )
+mpContainer = o3tl::make_unique();
 }
 
 // container::XElementAccess
commit 8d458a24f79ed9ba321daa3db283eb22dbd7c27f
Author: David Tardon 
Date:   Fri Sep 9 14:13:49 2016 +0200

use std::unique_ptr

Change-Id: I642486578190ed5e74a917c60153cac084f35fe8

diff --git a/xmloff/inc/txtlists.hxx b/xmloff/inc/txtlists.hxx
index 68b9a61..f469671 100644
--- a/xmloff/inc/txtlists.hxx
+++ b/xmloff/inc/txtlists.hxx
@@ -22,6 +22,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -37,7 +38,6 @@ class XMLTextListsHelper
 {
 public:
 XMLTextListsHelper();
-~XMLTextListsHelper();
 XMLTextListsHelper(const XMLTextListsHelper&) = delete;
 XMLTextListsHelper& operator=(const XMLTextListsHelper&) = delete;
 
@@ -136,7 +136,7 @@ class XMLTextListsHelper
 // as value
 typedef ::std::map< OUString,
 ::std::pair< OUString, OUString > > tMapForLists;
-tMapForLists* mpProcessedLists;
+ 

Recommended build instructions ...

[Michael Meeks]

Hi there,

Quick sob-story, my laptop died (RIP), and I urgently needed a new 
one at the conference. So I bought a Windows 10 thing - new out of the 
box, and took advantage of the situation to read and follow the 
instructions from the wiki.


https://wiki.documentfoundation.org/Development/BuildingOnWindows

Which recommended lode:

https://wiki.documentfoundation.org/Development/lode

With remarkably little effort I did an impression of a clueless 
newbie ;-) here are my findings; and I believe we should take some swift 
action, and get some principles nailed down.



* I was excited about Chocolatey

I read the website, thought 'wow Windows is getting its act 
together', then I tried to use it. The downloads complained of not being 
signed, I ignored that, but still they refused to work - eventually I 
gave up, and moved on to manual installation.


*  Recommending a known-good Visual Studio

The LODE page for some reason recommends Visual Studio 2015 - three 
times, though there is 2013 in the small print. I was to discover many 
hours later that in fact LibreOffice x86 on the libreoffice-5-2 branch 
(at least) doesn't compile in this configuration. I was surprised to 
find out that this is a well known problem later. We should not be 
documenting and recommending a known-problematic configuration to 
beginners - even if everyone is rightly excited about moving to the new 
compiler =)


=> will propose at the ESC that we recommend to beginners only those
   configurations which we know build - ie. have a tinderbox, and CI
   support to keep them working all the time.

This is somewhat more problematic, since (apparently) installing 
first 2015 and then 2013 results in a truck-load of other odd behaviors, 
which are really hard to fix without re-instaling (so the paranoid meme 
goes ;-)


* Antivirus

I was broken by McAffe - it broke git - the simple clone failed 
with a permissions problem. We have a not-very-explicit "turn off AV" 
messaging but not in the LODE (or devcentral) pages, and we should do 
that earlier I think; step #1 ;-)


Anyhow - thought I'd provide my feedback; I hope the solutions are 
obvious and we can clean this up nicely at least until 2015 is 
guarenteed to work by CI etc. =)


HTH,

Michael.

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

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

[Khaled Hosny]

 vcl/source/gdi/sallayout.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 983e03a7d81c0ab24782b28ab899452fa6fd99ac
Author: Khaled Hosny 
Date:   Thu Sep 8 16:28:17 2016 +0200

Hack to make Arabic subtending marks work

E.g. in Amiri.

Change-Id: Ibdac6b02bdbae40786d7c2c4725641be5cbfb80d

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 8aaefbf..ea16f4f 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1031,6 +1031,10 @@ void GenericSalLayout::ApplyDXArray( ImplLayoutArgs& 
rArgs )
 nDelta += nDiff;
 }
 
+// Hack to make Arabic subtending marks work e.g. in Amiri.
+if (nNewClusterWidth != nOldClusterWidth && nNewClusterWidth == 0)
+m_GlyphItems[i].maLinearPos.X() += m_GlyphItems[i].mnXOffset;
+
 nNewPos += nNewClusterWidth;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/commonsallayout' - 140 commits - android/source chart2/source compilerplugins/clang config_host.mk.in configure.ac cppuhelper/qa cui/source cui/uiconfig

[Khaled Hosny]

Rebased ref, commits from common ancestor:
commit 044f956d279a87a34d26674b67bcfd631b4d7424
Author: Khaled Hosny 
Date:   Wed Sep 7 23:26:14 2016 +0200

Don’t check glyph class unnecessarily

Don’t call hb_ot_layout_get_glyph_class() unless the glyph advance width
is zero, as we really do not use its result otherwise.

Change-Id: Id02238abef91b9343931f1886d54d966d7157f25

diff --git a/vcl/source/gdi/CommonSalLayout.cxx 
b/vcl/source/gdi/CommonSalLayout.cxx
index 6ce42d2..71fc186 100755
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -439,9 +439,8 @@ bool CommonSalLayout::LayoutText(ImplLayoutArgs& rArgs)
 if (hb_ot_layout_has_glyph_classes(pHBFace))
 {
 // the font has GDEF table
-bool bMark = hb_ot_layout_get_glyph_class(pHBFace, 
nGlyphIndex) == HB_OT_LAYOUT_GLYPH_CLASS_MARK;
-if (bMark && pHbPositions[i].x_advance == 0)
-bDiacritic = true;
+if (pHbPositions[i].x_advance == 0)
+bDiacritic = hb_ot_layout_get_glyph_class(pHBFace, 
nGlyphIndex) == HB_OT_LAYOUT_GLYPH_CLASS_MARK;
 }
 else
 {
commit eb5b2a609578ff5e28ed27cf9a92e78538c945c7
Author: Khaled Hosny 
Date:   Wed Sep 7 19:40:11 2016 +0200

Cache HarfBuzz font

We now create it only once per physical font, saves us few percents from
the all over time spent on layout.

Change-Id: I8de582cb20a168c93d72921e539c2477fa97fb54

diff --git a/vcl/inc/CommonSalLayout.hxx b/vcl/inc/CommonSalLayout.hxx
index cd68c93..34cca79 100755
--- a/vcl/inc/CommonSalLayout.hxx
+++ b/vcl/inc/CommonSalLayout.hxx
@@ -35,7 +35,7 @@
 
 class CommonSalLayout : public GenericSalLayout
 {
-hb_face_t* mpHBFace;
+hb_font_t* mpHBFont;
 FontSelectPattern maFontSelData;
 css::uno::Reference mxBreak;
 #ifdef _WIN32
@@ -48,7 +48,6 @@ class CommonSalLayout : public GenericSalLayout
 ServerFont& mrServerFont;
 #endif
 
-hb_font_t*  GetHBFont();
 public:
 #if defined(_WIN32)
 explicitCommonSalLayout(WinSalGraphics*, WinFontInstance&, 
const WinFontFace&);
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index 0302203..a14b2d8 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -99,8 +99,8 @@ public:
 void   GetFontMetric( ImplFontMetricDataRef& ) const;
 bool   GetGlyphBoundRect( sal_GlyphId, Rectangle& ) const;
 bool   GetGlyphOutline( sal_GlyphId, basegfx::B2DPolyPolygon& ) const;
-hb_face_t* GetHBFace() const { return mpHBFace; }
-void   SetHBFace(hb_face_t* pHBFace) const { mpHBFace = pHBFace; }
+hb_font_t* GetHBFont() const { return mpHBFont; }
+void   SetHBFont(hb_font_t* pHBFont) const { mpHBFont = pHBFont; }
 
 const CoreTextFontFace*  mpFontData;
 /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0
@@ -112,7 +112,7 @@ public:
 private:
 /// CoreText text style object
 CFMutableDictionaryRef  mpStyleDict;
-mutable hb_face_t*  mpHBFace;
+mutable hb_font_t*  mpHBFont;
 
 friend class CTLayout;
 friend class AquaSalGraphics;
diff --git a/vcl/inc/unx/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index af21922..11f94d9 100644
--- a/vcl/inc/unx/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -182,8 +182,8 @@ public:
 sal_GlyphId FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 ) 
const;
 boolGetGlyphOutline( sal_GlyphId aGlyphId, 
basegfx::B2DPolyPolygon& ) const;
 boolGetAntialiasAdvice() const;
-hb_face_t*  GetHBFace() { return mpHBFace; }
-voidSetHBFace( hb_face_t* pHBFace ) { 
mpHBFace=pHBFace; }
+hb_font_t*  GetHBFont() { return mpHBFont; }
+voidSetHBFont( hb_font_t* pHBFont ) { mpHBFont = 
pHBFont; }
 
 private:
 friend class GlyphCache;
@@ -243,7 +243,7 @@ private:
 GlyphSubstitution   maGlyphSubstitution;
 
 ServerFontLayoutEngine* mpLayoutEngine;
-hb_face_t*  mpHBFace;
+hb_font_t*  mpHBFont;
 };
 
 // a class for cache entries for physical font instances that are based on 
serverfonts
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index 4e84b6f..b1b542e 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -142,12 +142,12 @@ private:
 
 mutable std::unordered_set  maGsubTable;
 mutable boolmbGsubRead;
-mutable hb_face_t*  mpHBFace;
+mutable hb_font_t*  mpHBFont;
 public:
 boolHasGSUBstitutions( HDC ) const;
 boolIsGSUBstituted( sal_UCS4 ) const;
-hb_face_t*  GetHBFace() const { return mpHBFace; }
-voidSetHBFace( hb_face_t* pHBFace ) const { mpHBFace = 
pHBFace; }
+hb_font_

(Нет темы)

[Темир Урокбаев]

Hello.  am a pupil but i want to help LibreOffice. What programming languages 
have i to start learning to help you in future? Thanks. 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/inc desktop/source

[Marco Cecchetti]

 desktop/inc/lib/init.hxx|6 -
 desktop/source/lib/init.cxx |  181 +---
 2 files changed, 108 insertions(+), 79 deletions(-)

New commits:
commit a6aca59db3503948a0611e421d81b104685a8677
Author: Marco Cecchetti 
Date:   Wed Sep 7 15:56:09 2016 +0200

LOK: tidy up `CallbackFlushHandler::queue`, improved cell view cursor

Rewritten the switch statement in `CallbackFlushHandler::queue`:

- Now, the new callback data is emplaced after removing all states
overridden by the new one.
- View callbacks are checked not only for the same type but even for
the same view id: that allowed to fix the following issue: starting
from the 3rd view for a spreadsheet it could occur that only the cell
cursor of the previous last view was displayed in the new view.

Change-Id: I2b63526deb4dca39e3a1f430443ebc5d0f61938d
Reviewed-on: https://gerrit.libreoffice.org/28787
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index da03cfa..0d01997 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -46,11 +46,13 @@ namespace desktop {
 void setPartTilePainting(const bool bPartPainting) { 
m_bPartTilePainting = bPartPainting; }
 bool isPartTilePainting() const { return m_bPartTilePainting; }
 
+typedef std::vector> queue_type;
+
 private:
 void flush();
-void removeAllButLast(const int type, const bool identical);
+void removeAll(const std::function& rTestFunc);
 
-std::vector> m_queue;
+queue_type m_queue;
 std::map m_states;
 LibreOfficeKitDocument* m_pDocument;
 LibreOfficeKitCallback m_pCallback;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 63e5e3d..8eb2d9d 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -525,7 +525,7 @@ void CallbackFlushHandler::callback(const int type, const 
char* payload, void* d
 
 void CallbackFlushHandler::queue(const int type, const char* data)
 {
-const std::string payload(data ? data : "(nil)");
+std::string payload(data ? data : "(nil)");
 if (m_bPartTilePainting)
 {
 // We drop notifications when this is set, except for important ones.
@@ -585,81 +585,126 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 m_states[LOK_CALLBACK_TEXT_SELECTION_END] = "";
 }
 
-m_queue.emplace_back(type, payload);
-
-// These are safe to use the latest state and ignore previous
-// ones (if any) since the last overrides previous ones.
-switch (type)
+// When payload is empty discards any previous state.
+if (payload.empty())
 {
-case LOK_CALLBACK_TEXT_SELECTION_START:
-case LOK_CALLBACK_TEXT_SELECTION_END:
-case LOK_CALLBACK_TEXT_SELECTION:
-case LOK_CALLBACK_GRAPHIC_SELECTION:
-case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
-case LOK_CALLBACK_MOUSE_POINTER:
-case LOK_CALLBACK_CELL_CURSOR:
-case LOK_CALLBACK_CELL_VIEW_CURSOR:
-case LOK_CALLBACK_CELL_FORMULA:
-case LOK_CALLBACK_CURSOR_VISIBLE:
-case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
-case LOK_CALLBACK_SET_PART:
-case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:
-case LOK_CALLBACK_TEXT_VIEW_SELECTION:
-removeAllButLast(type, false);
-break;
+switch (type)
+{
+case LOK_CALLBACK_TEXT_SELECTION_START:
+case LOK_CALLBACK_TEXT_SELECTION_END:
+case LOK_CALLBACK_TEXT_SELECTION:
+case LOK_CALLBACK_GRAPHIC_SELECTION:
+case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
+case LOK_CALLBACK_INVALIDATE_TILES:
+removeAll([type] (const queue_type::value_type& elem) { return 
(elem.first == type); });
+break;
+}
+}
+else
+{
+switch (type)
+{
+// These are safe to use the latest state and ignore previous
+// ones (if any) since the last overrides previous ones.
+case LOK_CALLBACK_TEXT_SELECTION_START:
+case LOK_CALLBACK_TEXT_SELECTION_END:
+case LOK_CALLBACK_TEXT_SELECTION:
+case LOK_CALLBACK_GRAPHIC_SELECTION:
+case LOK_CALLBACK_MOUSE_POINTER:
+case LOK_CALLBACK_CELL_CURSOR:
+case LOK_CALLBACK_CELL_FORMULA:
+case LOK_CALLBACK_CURSOR_VISIBLE:
+case LOK_CALLBACK_SET_PART:
+case LOK_CALLBACK_STATUS_INDICATOR_SET_VALUE:
+{
+removeAll([type] (const queue_type::value_type& elem) { return 
(elem.first == type); });
+}
+break;
 
-// These come with rects, so drop earlier
-// only when the latter includes former ones.
-case LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR:
-case LOK_CALLBACK_I

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - config_host/config_features.h.in editeng/source sfx2/source

[Marco Cecchetti]

 config_host/config_features.h.in |6 ++
 editeng/source/rtf/svxrtf.cxx|2 --
 sfx2/source/control/unoctitm.cxx |2 --
 3 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit e4ea53067c54698b0a8d68f4746cb3ae81b43e3d
Author: Marco Cecchetti 
Date:   Wed Sep 7 15:38:30 2016 +0200

Fixed several Werrors

Change-Id: I97617049830dbab0ff04640a2eaecfbe39cf8305
Reviewed-on: https://gerrit.libreoffice.org/28786
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index 77fea97..2a60b9e 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -146,4 +146,10 @@
  */
 #define HAVE_FEATURE_COLLADA 0
 
+/*
+ * Whether we support breakpad as crash reporting lib.
+ */
+#define HAVE_FEATURE_BREAKPAD 0
+
+
 #endif
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index dd2105f..4cd43b0 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -657,7 +657,6 @@ void SvxRTFParser::ReadInfo()
 DBG_ASSERT(m_xDocProps.is(),
 "SvxRTFParser::ReadInfo: no DocumentProperties");
 OUString sStr, sComment;
-long nVersNo = 0;
 
 while( _nOpenBrakets && IsParserWorking() )
 {
@@ -732,7 +731,6 @@ void SvxRTFParser::ReadInfo()
 break;
 
 case RTF_VERN:
-nVersNo = nTokenValue;
 break;
 
 case RTF_EDMINS:
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 77a86ba..44cfcb99 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -80,8 +80,6 @@
 #include 
 #include 
 
-#define USAGE "file:///~/.config/libreofficedev/4/user/usage.txt"
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/inc desktop/source

[Marco Cecchetti]

 desktop/inc/lib/init.hxx|5 +
 desktop/source/lib/init.cxx |  197 
 2 files changed, 168 insertions(+), 34 deletions(-)

New commits:
commit f40a986345e91dcb01c7da565615e19ff002043b
Author: Marco Cecchetti 
Date:   Fri Sep 9 21:55:12 2016 +0200

LOK: new callback dropping implementation

Now view callbacks have their own collection of last states where the
key is made up by both the view id and the callback type.

Callback dropping based on the last state is no more handled on
queueing but on flushing, since what really matters is the last
performed callback (for each callback type).
Anyway in order to not modify the order of callbacks, that could be
changed when an already queued callback is superseeded, dropping still
occurs on queuing too, just by looking for the last queued callback of
the same type.

The result is a substantial reduction of redundant callbacks and fix
the following problem in loleaflet: when there are more views for a
speadsheet and cell cursors for two view are placed on the same cell,
a continuos swapping between the two cell cursors can occur. That was
due to a sequence of "EMPTY" and coordinates messages or cell cursor
and cell view cursor messages which were sent in an alternating way.

Change-Id: I79e14d11d4e8590aff715181e3410ad88c4e6175
Reviewed-on: https://gerrit.libreoffice.org/28788
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx
index 0d01997..db28168 100644
--- a/desktop/inc/lib/init.hxx
+++ b/desktop/inc/lib/init.hxx
@@ -11,6 +11,7 @@
 #define INCLUDED_DESKTOP_INC_LIB_INIT_HXX
 
 #include 
+#include 
 #include 
 #include 
 
@@ -46,6 +47,9 @@ namespace desktop {
 void setPartTilePainting(const bool bPartPainting) { 
m_bPartTilePainting = bPartPainting; }
 bool isPartTilePainting() const { return m_bPartTilePainting; }
 
+void addViewStates(int viewId);
+void removeViewStates(int viewId);
+
 typedef std::vector> queue_type;
 
 private:
@@ -54,6 +58,7 @@ namespace desktop {
 
 queue_type m_queue;
 std::map m_states;
+std::unordered_map> 
m_viewStates;
 LibreOfficeKitDocument* m_pDocument;
 LibreOfficeKitCallback m_pCallback;
 void *m_pData;
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 8eb2d9d..cb86a63 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -325,6 +325,8 @@ static boost::property_tree::ptree 
unoAnyToPropertyTree(const uno::Any& anyItem)
 return aTree;
 }
 
+namespace {
+
 Rectangle lcl_ParseRect(const std::string& payload)
 {
 std::istringstream iss(payload);
@@ -335,6 +337,32 @@ Rectangle lcl_ParseRect(const std::string& payload)
 return rc;
 }
 
+bool lcl_isViewCallbackType(const int type)
+{
+switch (type)
+{
+case LOK_CALLBACK_CELL_VIEW_CURSOR:
+case LOK_CALLBACK_GRAPHIC_VIEW_SELECTION:
+case LOK_CALLBACK_INVALIDATE_VIEW_CURSOR:
+case LOK_CALLBACK_TEXT_VIEW_SELECTION:
+case LOK_CALLBACK_VIEW_CURSOR_VISIBLE:
+return true;
+
+default:
+return false;
+}
+}
+
+int lcl_getViewId(const std::string& payload)
+{
+boost::property_tree::ptree aTree;
+std::stringstream aStream(payload);
+boost::property_tree::read_json(aStream, aTree);
+return aTree.get("viewId");
+}
+
+}  // end anonymous namespace
+
 extern "C"
 {
 
@@ -488,18 +516,13 @@ 
CallbackFlushHandler::CallbackFlushHandler(LibreOfficeKitDocument* pDocument, Li
 m_states.emplace(LOK_CALLBACK_TEXT_SELECTION_END, "NIL");
 m_states.emplace(LOK_CALLBACK_TEXT_SELECTION, "NIL");
 m_states.emplace(LOK_CALLBACK_GRAPHIC_SELECTION, "NIL");
-m_states.emplace(LOK_CALLBACK_GRAPHIC_VIEW_SELECTION, "NIL");
 m_states.emplace(LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, "NIL");
-m_states.emplace(LOK_CALLBACK_INVALIDATE_VIEW_CURSOR , "NIL");
 m_states.emplace(LOK_CALLBACK_STATE_CHANGED, "NIL");
 m_states.emplace(LOK_CALLBACK_MOUSE_POINTER, "NIL");
 m_states.emplace(LOK_CALLBACK_CELL_CURSOR, "NIL");
-m_states.emplace(LOK_CALLBACK_CELL_VIEW_CURSOR, "NIL");
 m_states.emplace(LOK_CALLBACK_CELL_FORMULA, "NIL");
 m_states.emplace(LOK_CALLBACK_CURSOR_VISIBLE, "NIL");
-m_states.emplace(LOK_CALLBACK_VIEW_CURSOR_VISIBLE, "NIL");
 m_states.emplace(LOK_CALLBACK_SET_PART, "NIL");
-m_states.emplace(LOK_CALLBACK_TEXT_VIEW_SELECTION, "NIL");
 
 Start();
 }
@@ -565,24 +588,49 @@ void CallbackFlushHandler::queue(const int type, const 
char* data)
 
 std::unique_lock lock(m_mutex);
 
-const auto stateIt = m_states.find(type);
-if (stateIt != m_states.end())
+// drop duplicate callbacks for the listed types
+switch (type)
 {
-// If the state didn't change, it's safe to ignore.
-   

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - desktop/qa desktop/source include/LibreOfficeKit libreofficekit/source

[Marco Cecchetti]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   22 +++---
 desktop/source/lib/init.cxx |   24 +---
 include/LibreOfficeKit/LibreOfficeKit.h |7 ++-
 include/LibreOfficeKit/LibreOfficeKit.hxx   |   16 ++--
 libreofficekit/source/gtk/lokdocview.cxx|4 ++--
 5 files changed, 54 insertions(+), 19 deletions(-)

New commits:
commit 404feac7e9212c57124a1e6219b6d6125c2bbd14
Author: Marco Cecchetti 
Date:   Fri Sep 9 22:21:07 2016 +0200

LOK: we use callbacks latch for not missing messages sent very early

- lok::Document::setCallbackLatch: used by a child session for
set/unset the latch

- lok::Document::registerCallback has a new boolean parameter used for
setting the latch state just before the callback is actually
registered for a (new) view

- now cell cursors of other views are correctly notified to the new
view

Change-Id: I80ae5556f61b1a41e703688491cca1faa8621a43
Reviewed-on: https://gerrit.libreoffice.org/28789
Reviewed-by: Marco Cecchetti 
Tested-by: Marco Cecchetti 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 5485da3..9080f4a 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -365,7 +365,7 @@ void DesktopLOKTest::testSearchCalc()
 comphelper::LibreOfficeKit::setActive();
 LibLODocument_Impl* pDocument = loadDoc("search.ods");
 pDocument->pClass->initializeForRendering(pDocument, nullptr);
-pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
+pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this, /*callback latch*/ false);
 
 uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence(
 {
@@ -400,7 +400,7 @@ void DesktopLOKTest::testSearchAllNotificationsCalc()
 comphelper::LibreOfficeKit::setActive();
 LibLODocument_Impl* pDocument = loadDoc("search.ods");
 pDocument->pClass->initializeForRendering(pDocument, nullptr);
-pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
+pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this, /*callback latch*/ false);
 
 uno::Sequence 
aPropertyValues(comphelper::InitPropertySequence(
 {
@@ -684,7 +684,7 @@ void DesktopLOKTest::testCommandResult()
 CPPUNIT_ASSERT(m_aCommandResult.isEmpty());
 
 // but we get some real values when the callback is set up
-pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
+pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this, /*callback latch*/ false);
 
 m_aCommandResultCondition.reset();
 pDocument->pClass->postUnoCommand(pDocument, ".uno:Bold", nullptr, true);
@@ -703,7 +703,7 @@ void DesktopLOKTest::testWriterComments()
 {
 comphelper::LibreOfficeKit::setActive();
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
-pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
+pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this, /*callback latch*/ false);
 uno::Reference 
xToolkit(com::sun::star::awt::Toolkit::create(comphelper::getProcessComponentContext()),
 uno::UNO_QUERY);
 
 // Insert a comment at the beginning of the document and wait till the main
@@ -747,7 +747,7 @@ void DesktopLOKTest::testModifiedStatus()
 comphelper::LibreOfficeKit::setActive();
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
 pDocument->pClass->initializeForRendering(pDocument, nullptr);
-pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
+pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this, /*callback latch*/ false);
 
 // Type "t" and check that the document was set as modified
 m_bModified = false;
@@ -811,10 +811,10 @@ void DesktopLOKTest::testTrackChanges()
 comphelper::LibreOfficeKit::setActive();
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
 pDocument->pClass->initializeForRendering(pDocument, nullptr);
-pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
+pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this, /*callback latch*/ false);
 pDocument->pClass->createView(pDocument);
 pDocument->pClass->initializeForRendering(pDocument, nullptr);
-pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this);
+pDocument->pClass->registerCallback(pDocument, &DesktopLOKTest::callback, 
this, /*callback latch*/ false);
 Scheduler::ProcessEventsToIdle();
 
 // Enable trak changes and assert that both views get notified.
@@ -864,7 +864,7 @@ void DesktopLOKTest::testSheetSelections()
 comphelper::LibreOfficeKit::setActive();
 L

[Libreoffice-commits] online.git: loolwsd/bundled loolwsd/ChildSession.cpp loolwsd/LibreOfficeKit.hpp loolwsd/LOKitClient.cpp loolwsd/LOOLKit.cpp

[Marco Cecchetti]

 loolwsd/ChildSession.cpp|2 ++
 loolwsd/LOKitClient.cpp |2 +-
 loolwsd/LOOLKit.cpp |2 +-
 loolwsd/LibreOfficeKit.hpp  |   16 ++--
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h |7 ++-
 5 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit f2106157f31801d96ac8fdf5e74956455ebbf778
Author: Marco Cecchetti 
Date:   Fri Sep 9 22:23:51 2016 +0200

loolwsd: we use callbacks latch for not missing messages sent very early

- lok::Document::setCallbackLatch: used by a child session for
set/unset the latch

- lok::Document::registerCallback has a new boolean parameter used for
setting the latch state just before the callback is actually
registered for a (new) view

- now cell cursors of other views are correctly notified to the new
view

diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 93a2312..93c4cf6 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -357,6 +357,8 @@ bool ChildSession::loadDocument(const char * /*buffer*/, 
int /*length*/, StringT
 // Inform this view of other views
 _docManager.notifyCurrentViewOfOtherViews(getId());
 
+_loKitDocument->setCallbackLatch(false);
+
 Log::info("Loaded session " + getId());
 return true;
 }
diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index b882b79..13a180e 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -112,7 +112,7 @@ protected:
 return Application::EXIT_UNAVAILABLE;
 }
 
-loKitDocument->pClass->registerCallback(loKitDocument, myCallback, 
nullptr);
+loKitDocument->pClass->registerCallback(loKitDocument, myCallback, 
nullptr, /*callback latch*/ false);
 
 loKitDocument->pClass->initializeForRendering(loKitDocument, nullptr);
 
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 94c0846..261821b 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1138,7 +1138,7 @@ private:
 viewId = _loKitDocument->getView();
 _viewIdToCallbackDescr.emplace(viewId,

std::unique_ptr(new CallbackDescriptor({ this, viewId })));
-_loKitDocument->registerCallback(ViewCallback, 
_viewIdToCallbackDescr[viewId].get());
+_loKitDocument->registerCallback(ViewCallback, 
_viewIdToCallbackDescr[viewId].get(), /*callback latch*/ true);
 
 Log::info() << "Document [" << _url << "] view ["
 << viewId << "] loaded, leaving "
diff --git a/loolwsd/LibreOfficeKit.hpp b/loolwsd/LibreOfficeKit.hpp
index 5881c77..700db4b 100644
--- a/loolwsd/LibreOfficeKit.hpp
+++ b/loolwsd/LibreOfficeKit.hpp
@@ -214,15 +214,27 @@ public:
 }
 
 /**
+ * Enable/disable callbacks latch. LOK will set the latch when it wants to
+ * queue new callbacks but not flush them.
+ *
+ * @param bCallbackLatch: true enables the latch, false disables it.
+ */
+inline void setCallbackLatch(bool bCallbackLatch)
+{
+_pDoc->pClass->setCallbackLatch(_pDoc, bCallbackLatch);
+}
+
+/**
  * Registers a callback. LOK will invoke this function when it wants to
  * inform the client about events.
  *
  * @param pCallback the callback to invoke
  * @param pData the user data, will be passed to the callback on invocation
+ * @param bCallbackLatch the event latch status to be set before the 
callback is registered
  */
-inline void registerCallback(LibreOfficeKitCallback pCallback, void* pData)
+inline void registerCallback(LibreOfficeKitCallback pCallback, void* 
pData, bool bCallbackLatch = false)
 {
-_pDoc->pClass->registerCallback(_pDoc, pCallback, pData);
+_pDoc->pClass->registerCallback(_pDoc, pCallback, pData, 
bCallbackLatch);
 }
 
 /**
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 81d65c1..e03163f 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -147,10 +147,15 @@ struct _LibreOfficeKitDocumentClass
 void (*initializeForRendering) (LibreOfficeKitDocument* pThis,
 const char* pArguments);
 
+/// @see lok::Document::setCallbackLatch().
+void (*setCallbackLatch) (LibreOfficeKitDocument* pThis,
+  bool bCallbackLatch);
+
 /// @see lok::Document::registerCallback().
 void (*registerCallback) (LibreOfficeKitDocument* pThis,
   LibreOfficeKitCallback pCallback,
-  void* pData);
+  void* pData,
+  bool bCallbackLatch);
 
 /// @see lok::Document::postKeyEven

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

[Markus Mohrhard]

 include/xmloff/unoatrcn.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9f0bf2c32ae5adde6ec73a3eecdb108ab1457049
Author: Markus Mohrhard 
Date:   Sat Sep 10 00:15:04 2016 +0200

fix the build

Change-Id: I600d1820d95ecbd428bbda18b3a07ec225bd2db0

diff --git a/include/xmloff/unoatrcn.hxx b/include/xmloff/unoatrcn.hxx
index 7ba70ad..dc9e343 100644
--- a/include/xmloff/unoatrcn.hxx
+++ b/include/xmloff/unoatrcn.hxx
@@ -31,12 +31,12 @@
 #include 
 #include 
 
+#include 
+
 #include 
 
 extern css::uno::Reference< css::uno::XInterface >  
SvUnoAttributeContainer_CreateInstance();
 
-class SvXMLAttrContainerData;
-
 class XMLOFF_DLLPUBLIC SvUnoAttributeContainer:
 public ::cppu::WeakAggImplHelper3<
 css::lang::XServiceInfo,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Recommended build instructions ...

[slacka]

Michael Meeks-5 wrote
> * I was excited about Chocolatey ... eventually I gave up, and moved on to
> manual installation.

As did I. If you look at the history all of the Chocolatey info was recently
added. It seems to cause more problems than it solves. Should we should move
it off into it's own section at the end until it offers a smooth experience?


Michael Meeks-5 wrote
> *  Recommending a known-good Visual Studio
> 
>  The LODE page for some reason recommends Visual Studio 2015 - three 
> times, though there is 2013 in the small print. 

Again, the VS2015 info was all added with Chocolatey. The  old LODE wiki
page recommend 2013.

  
Also the main Windows dev page also makes it clear that 2013 is the
preferred version. 

That said I'd rather see a VS2015 Jenkins or Tinderbox rather than steer
people away from it. I've been building both 32/64 VS2015 builds regularly
all year long.


Michael Meeks-5 wrote
>  * Antivirus 

The main  Windows dev pages covers this topic thoroughly.

  

Since you've verified it's a problem, please add McAffe to the list that's
already there.






--
View this message in context: 
http://nabble.documentfoundation.org/Recommended-build-instructions-tp4193014p4193053.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: uitest/execute.sh

[Markus Mohrhard]

 uitest/execute.sh |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4fb6ce2b46c30f73472c699b5ad58a4dd5e3912d
Author: Markus Mohrhard 
Date:   Sat Sep 10 06:14:24 2016 +0200

add demo script to execute test with UI

we should add this feature to the makefiles at some point.

diff --git a/uitest/execute.sh b/uitest/execute.sh
new file mode 100755
index 000..6fe09a5
--- /dev/null
+++ b/uitest/execute.sh
@@ -0,0 +1 @@
+/home/moggi/devel/libo9/instdir/program/python 
/home/moggi/devel/libo9/uitest/test_main.py --debug 
--soffice=path:/home/moggi/devel/libo9/instdir/program/soffice 
--userdir=file:///tmp/libreoffice_$dir_name/4 
--file=/home/moggi/devel/libo9/uitest/calc_tests/create_range_name.py
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: download.lst external/more_fonts

[Andras Timar]

 download.lst  |2 +-
 external/more_fonts/ExternalPackage_dejavu.mk |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit d83925c38b809ce4c7a40cd8f839364d57a390dd
Author: Andras Timar 
Date:   Fri Sep 9 17:44:38 2016 +0200

DejaVu fonts version 2.37

Change-Id: I86ed4ce1683e572c497dd5170f2e15b8bb20d501
Reviewed-on: https://gerrit.libreoffice.org/28778
Tested-by: Jenkins 
Reviewed-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 55057f6..0b49a58 100644
--- a/download.lst
+++ b/download.lst
@@ -40,7 +40,7 @@ export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
 export FONTCONFIG_TARBALL := 
77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz
 export FONT_CALADEA_TARBALL := 
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
 export FONT_CARLITO_TARBALL := 
c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
-export FONT_DEJAVU_TARBALL := 
7b28beb2f2de912b3a616ccfc7ceda34-dejavu-fonts-ttf-2.36.zip
+export FONT_DEJAVU_TARBALL := 
33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
 export FONT_GENTIUM_TARBALL := 
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
 export FONT_LIBERATION_NARROW_TARBALL := 
134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz
 export FONT_LIBERATION_TARBALL := 
5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
diff --git a/external/more_fonts/ExternalPackage_dejavu.mk 
b/external/more_fonts/ExternalPackage_dejavu.mk
index 22e7f6c4..981875c 100644
--- a/external/more_fonts/ExternalPackage_dejavu.mk
+++ b/external/more_fonts/ExternalPackage_dejavu.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu))
 
 $(eval $(call 
gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
+   ttf/DejaVuMathTeXGyre.ttf \
ttf/DejaVuSans-Bold.ttf \
ttf/DejaVuSans-BoldOblique.ttf \
ttf/DejaVuSans-ExtraLight.ttf \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Andras Timar]

 framework/source/fwe/classes/addonsoptions.cxx |2 +-
 svtools/source/config/miscopt.cxx  |2 +-
 svtools/source/config/slidesorterbaropt.cxx|2 +-
 svtools/source/config/toolpanelopt.cxx |2 +-
 unotools/source/config/cmdoptions.cxx  |2 +-
 unotools/source/config/dynamicmenuoptions.cxx  |2 +-
 unotools/source/config/extendedsecurityoptions.cxx |2 +-
 unotools/source/config/fontoptions.cxx |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 822209e28238088d3a63cbfa6826bba3634f418f
Author: Andras Timar 
Date:   Fri Sep 9 14:46:47 2016 +0200

typo fix: oue -> our

Change-Id: I4c592f467017cc88cd7deb124f9859e0ff515009
Reviewed-on: https://gerrit.libreoffice.org/28775
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/framework/source/fwe/classes/addonsoptions.cxx 
b/framework/source/fwe/classes/addonsoptions.cxx
index 054dc95..1e5e385 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -234,7 +234,7 @@ class AddonsOptions_Impl : public ConfigItem
 typedef std::unordered_map< OUString, 
MergeToolbarInstructionContainer, OUStringHash > ToolbarMergingInstructions;
 
 
/*-
-@short  return list of key names of our configuration 
management which represent oue module tree
+@short  return list of key names of our configuration 
management which represent our module tree
 @descr  These methods return the current list of key names! We 
need it to get needed values from our
 configuration management!
 @param  "nCount" ,   returns count of menu entries for 
"new"
diff --git a/svtools/source/config/miscopt.cxx 
b/svtools/source/config/miscopt.cxx
index 8b7eb7d..356b5cf 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -222,7 +222,7 @@ public:
 private:
 
 
/*-
-@short  return list of key names of our configuration 
management which represent oue module tree
+@short  return list of key names of our configuration 
management which represent our module tree
 @descr  These methods return a static const list of key names. 
We need it to get needed values from our
 configuration management.
 @return A list of needed configuration keys is returned.
diff --git a/svtools/source/config/slidesorterbaropt.cxx 
b/svtools/source/config/slidesorterbaropt.cxx
index 00028af..ab89080 100644
--- a/svtools/source/config/slidesorterbaropt.cxx
+++ b/svtools/source/config/slidesorterbaropt.cxx
@@ -85,7 +85,7 @@ class SvtSlideSorterBarOptions_Impl : public ConfigItem
 private:
 virtual void ImplCommit() final override;
 
-/** return list of key names of our configuration management which 
represent oue module tree
+/** return list of key names of our configuration management which 
represent our module tree
 
 These methods return a static const list of key names. We need it 
to get needed values from our
 configuration management.
diff --git a/svtools/source/config/toolpanelopt.cxx 
b/svtools/source/config/toolpanelopt.cxx
index 1b8929b..07aa435 100644
--- a/svtools/source/config/toolpanelopt.cxx
+++ b/svtools/source/config/toolpanelopt.cxx
@@ -89,7 +89,7 @@ class SvtToolPanelOptions_Impl : public ConfigItem
 
 virtual void ImplCommit() override;
 
-/** return list of key names of our configuration management which 
represent oue module tree
+/** return list of key names of our configuration management which 
represent our module tree
 
 These methods return a static const list of key names. We need it 
to get needed values from our
 configuration management.
diff --git a/unotools/source/config/cmdoptions.cxx 
b/unotools/source/config/cmdoptions.cxx
index 50f816c..6279a03 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -122,7 +122,7 @@ class SvtCommandOptions_Impl : public ConfigItem
 virtual void ImplCommit() override;
 
 
/*-
-@short  return list of key names of our configuration 
management which represent oue module tree
+@short  return list of key names of our configuration 
management which represent our module tree
 @descr  These methods return the current list of key names! We 
need it to get needed values from our
 configuration management and supp

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

[Stephan Bergmann]

 include/xmloff/XMLFontStylesContext.hxx  |2 ++
 xmloff/source/style/XMLFontStylesContext.cxx |2 ++
 2 files changed, 4 insertions(+)

New commits:
commit 7ed3e749f7b525bdbbbd353f85c765becb90daa6
Author: Stephan Bergmann 
Date:   Sat Sep 10 07:49:02 2016 +0200

Blind fix for MSVC

Change-Id: I53e01f3c76cf1e52fbf5f95f525cfc3b643b9e77

diff --git a/include/xmloff/XMLFontStylesContext.hxx 
b/include/xmloff/XMLFontStylesContext.hxx
index d671e65..cc6a2a7 100644
--- a/include/xmloff/XMLFontStylesContext.hxx
+++ b/include/xmloff/XMLFontStylesContext.hxx
@@ -59,6 +59,8 @@ public:
 const css::uno::Reference< css::xml::sax::XAttributeList > & 
xAttrList,
 rtl_TextEncoding eDfltEnc );
 
+~XMLFontStylesContext() override;
+
 const SvXMLTokenMap& GetFontStyleAttrTokenMap() const
 {
 return *pFontStyleAttrTokenMap;
diff --git a/xmloff/source/style/XMLFontStylesContext.cxx 
b/xmloff/source/style/XMLFontStylesContext.cxx
index 28fb855..e6c1b66 100644
--- a/xmloff/source/style/XMLFontStylesContext.cxx
+++ b/xmloff/source/style/XMLFontStylesContext.cxx
@@ -377,6 +377,8 @@ XMLFontStylesContext::XMLFontStylesContext( SvXMLImport& 
rImport,
 {
 }
 
+XMLFontStylesContext::~XMLFontStylesContext() {}
+
 bool XMLFontStylesContext::FillProperties( const OUString& rName,
  ::std::vector< XMLPropertyState > &rProps,
  sal_Int32 nFamilyNameIdx,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 extras/source/autocorr/emoji/emoji.ulf |   24 ++---
 extras/source/autocorr/lang/bg/DocumentList.xml|   12 --
 extras/source/autocorr/lang/ca/DocumentList.xml|   12 --
 extras/source/autocorr/lang/cs/DocumentList.xml|   12 --
 extras/source/autocorr/lang/da/DocumentList.xml|   24 -
 extras/source/autocorr/lang/en-AU/DocumentList.xml |   12 --
 extras/source/autocorr/lang/en-GB/DocumentList.xml |   24 -
 extras/source/autocorr/lang/en-US/DocumentList.xml |   12 --
 extras/source/autocorr/lang/es/DocumentList.xml|   12 --
 extras/source/autocorr/lang/fi/DocumentList.xml|   12 --
 extras/source/autocorr/lang/fr/DocumentList.xml|   24 -
 extras/source/autocorr/lang/hr/DocumentList.xml|   12 --
 extras/source/autocorr/lang/hu/DocumentList.xml|   12 --
 extras/source/autocorr/lang/is/DocumentList.xml|   12 --
 extras/source/autocorr/lang/it/DocumentList.xml|   12 --
 extras/source/autocorr/lang/ja/DocumentList.xml|   12 --
 extras/source/autocorr/lang/ko/DocumentList.xml|   24 -
 extras/source/autocorr/lang/lt/DocumentList.xml|   24 -
 extras/source/autocorr/lang/nl-BE/DocumentList.xml |   24 -
 extras/source/autocorr/lang/nl/DocumentList.xml|   24 -
 extras/source/autocorr/lang/pt-BR/DocumentList.xml |   12 --
 extras/source/autocorr/lang/pt-PT/DocumentList.xml |   12 --
 extras/source/autocorr/lang/pt/DocumentList.xml|   12 --
 extras/source/autocorr/lang/ro/DocumentList.xml|   24 -
 extras/source/autocorr/lang/sk/DocumentList.xml|   24 -
 extras/source/autocorr/lang/sl/DocumentList.xml|   12 --
 extras/source/autocorr/lang/sv/DocumentList.xml|   24 -
 extras/source/autocorr/lang/tr/DocumentList.xml|   24 -
 extras/source/autocorr/lang/zh-CN/DocumentList.xml |   12 --
 29 files changed, 12 insertions(+), 480 deletions(-)

New commits:
commit 681d5fd37e469491268d40147c621187dc6f4b95
Author: László Németh 
Date:   Fri Sep 9 15:52:23 2016 +0200

tdf#97191 fix emoji correction conflict with time format

by removing the bad patterns from DocumentList.xmls, and
adding "h" to the end of the bad en-US emoji short names,
(separated by a space according to the orthography):

:1 h: instead of :1:, :10 h: instead of :10: etc.

Also complete the fix for tdf#93233, removing the :1:30:-like
(never working) patterns.

Change-Id: Ia39e1f0d5fdbf686713c6deacf2a56e0beb8b42b
Reviewed-on: https://gerrit.libreoffice.org/28756
Tested-by: Jenkins 
Reviewed-by: László Németh 

diff --git a/extras/source/autocorr/emoji/emoji.ulf 
b/extras/source/autocorr/emoji/emoji.ulf
index 268ae34..f06b2e0 100644
--- a/extras/source/autocorr/emoji/emoji.ulf
+++ b/extras/source/autocorr/emoji/emoji.ulf
@@ -3501,51 +3501,51 @@ en-US = "button"
 
 [CLOCK_FACE_ONE_OCLOCK]
 x-comment = "🕐 (U+1F550), see http://wiki.documentfoundation.org/Emoji";
-en-US = "1"
+en-US = "1 h"
 
 [CLOCK_FACE_TWO_OCLOCK]
 x-comment = "🕑 (U+1F551), see http://wiki.documentfoundation.org/Emoji";
-en-US = "2"
+en-US = "2 h"
 
 [CLOCK_FACE_THREE_OCLOCK]
 x-comment = "🕒 (U+1F552), see http://wiki.documentfoundation.org/Emoji";
-en-US = "3"
+en-US = "3 h"
 
 [CLOCK_FACE_FOUR_OCLOCK]
 x-comment = "🕓 (U+1F553), see http://wiki.documentfoundation.org/Emoji";
-en-US = "4"
+en-US = "4 h"
 
 [CLOCK_FACE_FIVE_OCLOCK]
 x-comment = "🕔 (U+1F554), see http://wiki.documentfoundation.org/Emoji";
-en-US = "5"
+en-US = "5 h"
 
 [CLOCK_FACE_SIX_OCLOCK]
 x-comment = "🕕 (U+1F555), see http://wiki.documentfoundation.org/Emoji";
-en-US = "6"
+en-US = "6 h"
 
 [CLOCK_FACE_SEVEN_OCLOCK]
 x-comment = "🕖 (U+1F556), see http://wiki.documentfoundation.org/Emoji";
-en-US = "7"
+en-US = "7 h"
 
 [CLOCK_FACE_EIGHT_OCLOCK]
 x-comment = "🕗 (U+1F557), see http://wiki.documentfoundation.org/Emoji";
-en-US = "8"
+en-US = "8 h"
 
 [CLOCK_FACE_NINE_OCLOCK]
 x-comment = "🕘 (U+1F558), see http://wiki.documentfoundation.org/Emoji";
-en-US = "9"
+en-US = "9 h"
 
 [CLOCK_FACE_TEN_OCLOCK]
 x-comment = "🕙 (U+1F559), see http://wiki.documentfoundation.org/Emoji";
-en-US = "10"
+en-US = "10 h"
 
 [CLOCK_FACE_ELEVEN_OCLOCK]
 x-comment = "🕚 (U+1F55A), see http://wiki.documentfoundation.org/Emoji";
-en-US = "11"
+en-US = "11 h"
 
 [CLOCK_FACE_TWELVE_OCLOCK]
 x-comment = "🕛 (U+1F55B), see http://wiki.documentfoundation.org/Emoji";
-en-US = "12"
+en-US = "12 h"
 
 [CLOCK_FACE_ONE-THIRTY]
 x-comment = "🕜 (U+1F55C), see http://wiki.documentfoundation.org/Emoji";
diff --git a/extras/source/autocorr/lang/bg/DocumentList.xml 
b/extras/source/autocorr/lang/bg/DocumentList.xm