[Libreoffice-commits] dev-tools.git: gerritbot/send-daily-digest
gerritbot/send-daily-digest | 46 +++-
1 file changed, 33 insertions(+), 13 deletions(-)
New commits:
commit b5807dd80ff79305bb01dbd2a5101cef3a2a7864
Author: Mathias Michel m...@gmx.fr
Date: Sun Nov 24 02:19:38 2013 +0100
fdo#71911 : show the top level dir of a new change
use the gerrit query to get the info since gerrit does not really create
refs
And then we don't have patches in the repo.
(see
http://gerrit-documentation.googlecode.com/svn/Documentation/2.3/user-upload.html#_gritty_details)
restore mail for other repos
small format on long lines
Change-Id: Iccce0eb3c1a2c7e17fc6716d61917944ec05d6cf
Reviewed-on: https://gerrit.libreoffice.org/6793
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com
diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
old mode 100644
new mode 100755
index 899fe2e..cf31f98
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -26,24 +26,40 @@ def get_daily_query(status, project):
def get_digest(query):
digest = ''
freshers = ''
+do_module = []
+about = ''
# we want first time contributors on new changes for core
-do_fresh = query.split(':')[1].split(' ')[0] == 'core' and \
- query.split(':')[3].split(' ')[0] == 'open' and \
- query.split(':')[3].split(' ')[1] == '-age'
+do_fresh = (query.split(':')[1].split(' ')[0] == 'core' and
+query.split(':')[3].split(' ')[0] == 'open' and
+query.split(':')[3].split(' ')[1] == '-age' )
-if do_fresh: all_users = init_freshers()
+if do_fresh:
+all_users = init_freshers()
+do_module = ['--files', '--patch-sets']
-for line in sh.ssh(args['gerrit'], 'gerrit query --format=JSON -- \'%s\''
% query).encode('utf8').strip().split('\n'):
+for line in subprocess.check_output(['ssh', args['gerrit'], 'gerrit',
'query'] + do_module +
+['--format=JSON','--', ' + query
+']).strip().splitlines():
change = json.loads(line)
if 'url' in change.keys():
+if do_fresh: # we are in new changes
+fpaths = (set([fileobj['file'] for pset in change['patchSets']
+for fileobj in pset['files']]))
+fpaths.remove('/COMMIT_MSG')
+# we assume gerrit replies with no leading slash
+# if no subfolder, module is build
+about = '\n about module ' + ',
'.join(sorted(set([p.split('/')[0]
+if '/' in p else 'build' for p in
fpaths])))
+
if do_fresh and change['owner']['name'].encode('utf8') not in
all_users:
-freshers += '+ %s\n in %s from %s\n' %
(change['subject'][:73], change['url'], change['owner']['name'])
+freshers += '+ %s\n in %s from %s%s\n' %
(change['subject'][:73],
+change['url'], change['owner']['name'], about)
else:
-digest += '+ %s\n in %s from %s\n' % (change['subject'][:73],
change['url'], change['owner']['name'])
+digest += '+ %s\n in %s from %s%s\n' %
(change['subject'][:73],
+change['url'], change['owner']['name'], about)
if freshers != '':
-digest = ' First time contributors doing great things ! \n' +
freshers + \
- End of freshness \n\n + digest
+digest = (' First time contributors doing great things ! \n' +
freshers +
+ End of freshness \n\n + digest )
if digest == '':
digest = 'None'
return digest
@@ -64,17 +80,20 @@ def init_freshers():
def get_project_body(project):
none = True
-body = '* Open changes on master for project %s changed in the last %d
hours:\n\n' % (project, args['age'])
+body = ('* Open changes on master for project %s changed in the last %d
hours:\n\n'
+% (project, args['age']))
dig = get_digest(get_daily_query('open', project))
if dig != 'None': none = False
body += dig
-body += '\n\n* Merged changes on master for project %s changed in the last
%d hours:\n\n' % (project, args['age'])
+body += ('\n\n* Merged changes on master for project %s changed in the
last %d hours:\n\n'
+% (project, args['age']))
dig = get_digest(get_daily_query('merged', project))
if dig != 'None': none = False
body += dig
-body += '\n\n* Abandoned changes on master for project %s changed in the
last %d hours:\n\n' % (project, args['age'])
+body += ('\n\n* Abandoned changes on master for project %s changed in the
last %d hours:\n\n'
+% (project, args['age']))
dig = get_digest(get_daily_query('abandoned', project))
if dig != 'None': none = False
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDRContentCollector.cpp | 31 +++
src/lib/CDRContentCollector.h |3 +++
2 files changed, 30 insertions(+), 4 deletions(-)
New commits:
commit 00dea16c89b68668ea1ced9601fe33b728db4234
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 10:35:11 2013 +0100
Emit start/endDocument calls
Change-Id: Ic8413c9f24a0fa06ed6bbb24d1be8dd638b176aa
diff --git a/src/lib/CDRContentCollector.cpp b/src/lib/CDRContentCollector.cpp
index 0ce93f2..5884f51 100644
--- a/src/lib/CDRContentCollector.cpp
+++ b/src/lib/CDRContentCollector.cpp
@@ -48,7 +48,7 @@
#endif
libcdr::CDRContentCollector::CDRContentCollector(libcdr::CDRParserState ps,
librevenge::RVNGDrawingInterface *painter) :
- m_painter(painter),
+ m_painter(painter), m_isDocumentStarted(false),
m_isPageProperties(false), m_isPageStarted(false), m_ignorePage(false),
m_page(ps.m_pages[0]), m_pageIndex(0), m_currentFillStyle(),
m_currentLineStyle(), m_spnd(0),
m_currentObjectLevel(0), m_currentGroupLevel(0), m_currentVectLevel(0),
m_currentPageLevel(0),
@@ -64,20 +64,43 @@ libcdr::CDRContentCollector::~CDRContentCollector()
{
if (m_isPageStarted)
_endPage();
+ if (m_isDocumentStarted)
+_endDocument();
+}
+
+void libcdr::CDRContentCollector::_startDocument()
+{
+ if (m_isDocumentStarted)
+return;
+ librevenge::RVNGPropertyList propList;
+ if (m_painter)
+m_painter-startDocument(propList);
+ m_isDocumentStarted = true;
+}
+
+void libcdr::CDRContentCollector::_endDocument()
+{
+ if (!m_isDocumentStarted)
+return;
+ if (m_isPageStarted)
+_endPage();
+ if (m_painter)
+m_painter-endDocument();
+ m_isDocumentStarted = false;
}
void libcdr::CDRContentCollector::_startPage(double width, double height)
{
if (m_ignorePage)
return;
+ if (!m_isDocumentStarted)
+_startDocument();
librevenge::RVNGPropertyList propList;
propList.insert(svg:width, width);
propList.insert(svg:height, height);
if (m_painter)
- {
m_painter-startPage(propList);
-m_isPageStarted = true;
- }
+ m_isPageStarted = true;
}
void libcdr::CDRContentCollector::_endPage()
diff --git a/src/lib/CDRContentCollector.h b/src/lib/CDRContentCollector.h
index b84f84b..eca0b93 100644
--- a/src/lib/CDRContentCollector.h
+++ b/src/lib/CDRContentCollector.h
@@ -91,6 +91,8 @@ private:
CDRContentCollector operator=(const CDRContentCollector );
// helper functions
+ void _startDocument();
+ void _endDocument();
void _startPage(double width, double height);
void _endPage();
void _flushCurrentPath();
@@ -101,6 +103,7 @@ private:
librevenge::RVNGDrawingInterface *m_painter;
+ bool m_isDocumentStarted;
bool m_isPageProperties;
bool m_isPageStarted;
bool m_ignorePage;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - starmath/inc starmath/source
starmath/inc/ElementsDockingWindow.hxx|2 starmath/inc/starmath.hrc | 86 starmath/source/ElementsDockingWindow.cxx | 42 -- starmath/source/commands.src | 90 -- 4 files changed, 1 insertion(+), 219 deletions(-) New commits: commit a2b0ab0be7632a00ac59b778bd1108d1cdc48dc5 Author: Thomas Arnhold tho...@arnhold.org Date: Sun Dec 1 10:53:36 2013 +0100 Revert fdo#67862: Add greek symbols to docking window This partially reverts commit e9a7ff1a5ba9d5ba34eeca9d622d8a3a9c68ade8. Leave the SAL_N_ELEMENTS changes in. I forgot about the translation of those symbol names. The en-US %alpha is %alfa in pt-br. See starmath/source/symbol.src. One list get's translated, the other not. For UI purpose GetUiSymbolName gives the tranlated one and for export GetExportSymbolName gives the untranslated english string. Feel free to implement this or maybe drop the translation of those symbols. Conflicts: starmath/inc/starmath.hrc Change-Id: I74d667a727536e1caf35f32af6a5c9cc64ca7015 Reviewed-on: https://gerrit.libreoffice.org/6885 Reviewed-by: Thorsten Behrens t...@documentfoundation.org Tested-by: Thorsten Behrens t...@documentfoundation.org diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index a3a692e..ac2f3b4 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -76,8 +76,6 @@ class SmElementsControl : public Control static const sal_uInt16 aAttributes[][2]; static const sal_uInt16 aBrackets[][2]; static const sal_uInt16 aFormats[][2]; -static const sal_uInt16 aGreek[][2]; -static const sal_uInt16 aSymbols[][2]; static const sal_uInt16 aOthers[][2]; Link aSelectHdlLink; diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 636a5ec..cb3ad6b 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -496,7 +496,6 @@ #define RID_CATEGORY_FORMATS(RID_APP_START + 4008) #define RID_CATEGORY_OTHERS (RID_APP_START + 4009) #define RID_CATEGORY_EXAMPLES (RID_APP_START + 4010) -#define RID_CATEGORY_SYMBOLS(RID_APP_START + 2173) // more tooptips help texts #define RID_XEQY_HELP (RID_APP_START + 4011) @@ -679,91 +678,6 @@ #define RID_LLINT_FROMTOX_HELP (RID_APP_START + 4189) #define RID_LLLINT_FROMTOX_HELP (RID_APP_START + 4190) -#define RID_GRC_ALPHA (RID_APP_START + 4191) -#define RID_GRC_ALPHA_HELP(RID_APP_START + 4192) -#define RID_GRC_BETA (RID_APP_START + 4193) -#define RID_GRC_BETA_HELP (RID_APP_START + 4194) -#define RID_GRC_CHI (RID_APP_START + 4195) -#define RID_GRC_CHI_HELP (RID_APP_START + 4196) -#define RID_GRC_DELTA (RID_APP_START + 4197) -#define RID_GRC_DELTA_HELP(RID_APP_START + 4198) -#define RID_GRC_EPSILON (RID_APP_START + 4199) -#define RID_GRC_EPSILON_HELP (RID_APP_START + 4200) -#define RID_GRC_ETA (RID_APP_START + 4201) -#define RID_GRC_ETA_HELP (RID_APP_START + 4202) -#define RID_GRC_GAMMA (RID_APP_START + 4203) -#define RID_GRC_GAMMA_HELP(RID_APP_START + 4204) -#define RID_GRC_IOTA (RID_APP_START + 4205) -#define RID_GRC_IOTA_HELP (RID_APP_START + 4206) -#define RID_GRC_KAPPA (RID_APP_START + 4207) -#define RID_GRC_KAPPA_HELP(RID_APP_START + 4208) -#define RID_GRC_LAMBDA(RID_APP_START + 4209) -#define RID_GRC_LAMBDA_HELP (RID_APP_START + 4210) -#define RID_GRC_MU(RID_APP_START + 4211) -#define RID_GRC_MU_HELP (RID_APP_START + 4212) -#define RID_GRC_NU(RID_APP_START + 4213) -#define RID_GRC_NU_HELP (RID_APP_START + 4214) -#define RID_GRC_OMEGA (RID_APP_START + 4215) -#define RID_GRC_OMEGA_HELP(RID_APP_START + 4216) -#define RID_GRC_OMICRON (RID_APP_START + 4217) -#define RID_GRC_OMICRON_HELP (RID_APP_START + 4218) -#define RID_GRC_PHI (RID_APP_START + 4219) -#define RID_GRC_PHI_HELP (RID_APP_START + 4220) -#define RID_GRC_PI(RID_APP_START + 4221) -#define RID_GRC_PI_HELP (RID_APP_START + 4222) -#define RID_GRC_PSI (RID_APP_START + 4223) -#define RID_GRC_PSI_HELP (RID_APP_START + 4224) -#define RID_GRC_RHO (RID_APP_START + 4225) -#define RID_GRC_RHO_HELP (RID_APP_START + 4226) -#define
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/ElementsDockingWindow.hxx|2 starmath/inc/starmath.hrc | 86 starmath/source/ElementsDockingWindow.cxx | 42 -- starmath/source/commands.src | 90 -- 4 files changed, 1 insertion(+), 219 deletions(-) New commits: commit f5e2d31331839fd8c6039bec057a9c28ed3c7396 Author: Thomas Arnhold tho...@arnhold.org Date: Sun Dec 1 10:53:36 2013 +0100 Revert fdo#67862: Add greek symbols to docking window This partially reverts commit e9a7ff1a5ba9d5ba34eeca9d622d8a3a9c68ade8. Leave the SAL_N_ELEMENTS changes in. I forgot about the translation of those symbol names. The en-US %alpha is %alfa in pt-br. See starmath/source/symbol.src. One list get's translated, the other not. For UI purpose GetUiSymbolName gives the tranlated one and for export GetExportSymbolName gives the untranslated english string. Feel free to implement this or maybe drop the translation of those symbols. Conflicts: starmath/inc/starmath.hrc Change-Id: I74d667a727536e1caf35f32af6a5c9cc64ca7015 Reviewed-on: https://gerrit.libreoffice.org/6884 Reviewed-by: Thorsten Behrens t...@documentfoundation.org Tested-by: Thorsten Behrens t...@documentfoundation.org diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index a3a692e..ac2f3b4 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -76,8 +76,6 @@ class SmElementsControl : public Control static const sal_uInt16 aAttributes[][2]; static const sal_uInt16 aBrackets[][2]; static const sal_uInt16 aFormats[][2]; -static const sal_uInt16 aGreek[][2]; -static const sal_uInt16 aSymbols[][2]; static const sal_uInt16 aOthers[][2]; Link aSelectHdlLink; diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 636a5ec..cb3ad6b 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -496,7 +496,6 @@ #define RID_CATEGORY_FORMATS(RID_APP_START + 4008) #define RID_CATEGORY_OTHERS (RID_APP_START + 4009) #define RID_CATEGORY_EXAMPLES (RID_APP_START + 4010) -#define RID_CATEGORY_SYMBOLS(RID_APP_START + 2173) // more tooptips help texts #define RID_XEQY_HELP (RID_APP_START + 4011) @@ -679,91 +678,6 @@ #define RID_LLINT_FROMTOX_HELP (RID_APP_START + 4189) #define RID_LLLINT_FROMTOX_HELP (RID_APP_START + 4190) -#define RID_GRC_ALPHA (RID_APP_START + 4191) -#define RID_GRC_ALPHA_HELP(RID_APP_START + 4192) -#define RID_GRC_BETA (RID_APP_START + 4193) -#define RID_GRC_BETA_HELP (RID_APP_START + 4194) -#define RID_GRC_CHI (RID_APP_START + 4195) -#define RID_GRC_CHI_HELP (RID_APP_START + 4196) -#define RID_GRC_DELTA (RID_APP_START + 4197) -#define RID_GRC_DELTA_HELP(RID_APP_START + 4198) -#define RID_GRC_EPSILON (RID_APP_START + 4199) -#define RID_GRC_EPSILON_HELP (RID_APP_START + 4200) -#define RID_GRC_ETA (RID_APP_START + 4201) -#define RID_GRC_ETA_HELP (RID_APP_START + 4202) -#define RID_GRC_GAMMA (RID_APP_START + 4203) -#define RID_GRC_GAMMA_HELP(RID_APP_START + 4204) -#define RID_GRC_IOTA (RID_APP_START + 4205) -#define RID_GRC_IOTA_HELP (RID_APP_START + 4206) -#define RID_GRC_KAPPA (RID_APP_START + 4207) -#define RID_GRC_KAPPA_HELP(RID_APP_START + 4208) -#define RID_GRC_LAMBDA(RID_APP_START + 4209) -#define RID_GRC_LAMBDA_HELP (RID_APP_START + 4210) -#define RID_GRC_MU(RID_APP_START + 4211) -#define RID_GRC_MU_HELP (RID_APP_START + 4212) -#define RID_GRC_NU(RID_APP_START + 4213) -#define RID_GRC_NU_HELP (RID_APP_START + 4214) -#define RID_GRC_OMEGA (RID_APP_START + 4215) -#define RID_GRC_OMEGA_HELP(RID_APP_START + 4216) -#define RID_GRC_OMICRON (RID_APP_START + 4217) -#define RID_GRC_OMICRON_HELP (RID_APP_START + 4218) -#define RID_GRC_PHI (RID_APP_START + 4219) -#define RID_GRC_PHI_HELP (RID_APP_START + 4220) -#define RID_GRC_PI(RID_APP_START + 4221) -#define RID_GRC_PI_HELP (RID_APP_START + 4222) -#define RID_GRC_PSI (RID_APP_START + 4223) -#define RID_GRC_PSI_HELP (RID_APP_START + 4224) -#define RID_GRC_RHO (RID_APP_START + 4225) -#define RID_GRC_RHO_HELP (RID_APP_START + 4226) -#define
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - oox/source
oox/source/ppt/pptgraphicshapecontext.cxx | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
New commits:
commit 0f4a452be3342d0206d6724faf170fa2786a
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Tue Nov 26 22:31:51 2013 +0700
fdo#71434: don't show master text if PlaceHolder types defined
I've added all of valid PlaceHolder types from
http://www.schemacentral.com/sc/ooxml/t-p_ST_PlaceholderType.html
(cherry picked from commit bb1213a740b3b3b2b1967639939dd7a72c6d4237)
Change-Id: I038fe43ff83699f92ff5eb9945bce12540058478
Reviewed-on: https://gerrit.libreoffice.org/6821
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Tested-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx
b/oox/source/ppt/pptgraphicshapecontext.cxx
index e21b9a1..fec7785 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -149,9 +149,26 @@ Reference XFastContextHandler
PPTGraphicShapeContext::createFastChildContext(
if ( pPlaceholder.get() )
{
bool bUseText = true;
-// TODO: Check if pPlaceholder-getSubType is none (i.e.
none explicitly specified)
-if( pPlaceholder-getSubType() == XML_obj )
-bUseText = false;
+switch( pPlaceholder-getSubType() )
+{
+case XML_title :
+case XML_body :
+case XML_ctrTitle :
+case XML_subTitle :
+case XML_dt :
+case XML_sldNum :
+case XML_ftr :
+case XML_hdr :
+case XML_obj :
+case XML_chart :
+case XML_tbl :
+case XML_clipArt :
+case XML_dgm :
+case XML_media :
+case XML_sldImg :
+case XML_pic :
+bUseText = false;
+}
mpShapePtr-applyShapeReference( *pPlaceholder.get(),
bUseText );
PPTShape* pPPTShape = dynamic_cast PPTShape* (
pPlaceholder.get() );
if ( pPPTShape )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - oox/source
oox/source/ppt/pptgraphicshapecontext.cxx | 23 ---
1 file changed, 20 insertions(+), 3 deletions(-)
New commits:
commit a06bc4102934c47e1aebe53ea24415fafb7c506a
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Tue Nov 26 22:45:07 2013 +0700
fdo#71434: don't show master text if PlaceHolder types defined
I've added all of valid PlaceHolder types from
http://www.schemacentral.com/sc/ooxml/t-p_ST_PlaceholderType.html
(cherry picked from commit bb1213a740b3b3b2b1967639939dd7a72c6d4237)
Change-Id: I038fe43ff83699f92ff5eb9945bce12540058478
Reviewed-on: https://gerrit.libreoffice.org/6822
Reviewed-by: Muthu Subramanian K muthus...@gmail.com
Tested-by: Muthu Subramanian K muthus...@gmail.com
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org
diff --git a/oox/source/ppt/pptgraphicshapecontext.cxx
b/oox/source/ppt/pptgraphicshapecontext.cxx
index 99c7328..730ce23 100644
--- a/oox/source/ppt/pptgraphicshapecontext.cxx
+++ b/oox/source/ppt/pptgraphicshapecontext.cxx
@@ -147,9 +147,26 @@ ContextHandlerRef PPTGraphicShapeContext::onCreateContext(
sal_Int32 aElementTok
if ( pPlaceholder.get() )
{
bool bUseText = true;
-// TODO: Check if pPlaceholder-getSubType is none (i.e.
none explicitly specified)
-if( pPlaceholder-getSubType() == XML_obj )
-bUseText = false;
+switch( pPlaceholder-getSubType() )
+{
+case XML_title :
+case XML_body :
+case XML_ctrTitle :
+case XML_subTitle :
+case XML_dt :
+case XML_sldNum :
+case XML_ftr :
+case XML_hdr :
+case XML_obj :
+case XML_chart :
+case XML_tbl :
+case XML_clipArt :
+case XML_dgm :
+case XML_media :
+case XML_sldImg :
+case XML_pic :
+bUseText = false;
+}
mpShapePtr-applyShapeReference( *pPlaceholder.get(),
bUseText );
PPTShape* pPPTShape = dynamic_cast PPTShape* (
pPlaceholder.get() );
if ( pPPTShape )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBCollector.cpp |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 614a0f673bb0b74265992e53595d5b7013de49c0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 10:55:18 2013 +0100
Add startDocument and endDocument calls
Change-Id: Iebf9a13d01f2d1e167345c6339fe3b97fc2b4381
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index ff16298..b961c6e 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -1430,6 +1430,7 @@ bool libmspub::MSPUBCollector::go()
{
addBlackToPaletteIfNecessary();
assignShapesToPages();
+ m_painter-startDocument(librevenge::RVNGPropertyList());
if (m_pageSeqNumsOrdered.empty())
{
for (std::mapunsigned, PageInfo::const_iterator i =
m_pagesBySeqNum.begin();
@@ -1453,6 +1454,7 @@ bool libmspub::MSPUBCollector::go()
}
}
}
+ m_painter-endDocument();
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9549c1c665bad9799021a8fcb3edb0f9adcff8b0
Author: Oliver-Rainer Wittmann o...@apache.org
Date: Tue Dec 3 08:46:43 2013 +
123797: correct typo for *.docx import - remove additional empty paragraph
at imported footnote resp. endnote
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index c6ca332..03be68c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1267,7 +1267,7 @@ void DomainMapper_Impl::PushAnnotation()
---*/
void DomainMapper_Impl::PopFootOrEndnote()
{
-RemoveLastParagraph;
+RemoveLastParagraph();
m_aTextAppendStack.pop();
}
/*-- 22.12.2008 13:45:15---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDOutputElementList.cpp | 85 ++-
1 file changed, 84 insertions(+), 1 deletion(-)
New commits:
commit 979cdc21f3dd6313906a5508b7877a513e4b1eea
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 11:07:57 2013 +0100
Split tabs, spaces and lineBreaks from the text to insert
Change-Id: Ie454326a42e403bef88606b729827966df07edc6
diff --git a/src/lib/VSDOutputElementList.cpp b/src/lib/VSDOutputElementList.cpp
index d09e9e3..2fbac5b 100644
--- a/src/lib/VSDOutputElementList.cpp
+++ b/src/lib/VSDOutputElementList.cpp
@@ -33,6 +33,89 @@
namespace libvisio
{
+namespace
+{
+
+static void separateTabsAndInsertText(librevenge::RVNGDrawingInterface *iface,
const librevenge::RVNGString text)
+{
+ if (!iface || text.empty())
+return;
+ bool isLineBreakDeferred(false);
+ librevenge::RVNGString tmpText;
+ librevenge::RVNGString::Iter i(text);
+ for (i.rewind(); i.next();)
+ {
+if (isLineBreakDeferred iface)
+ iface-insertLineBreak();
+isLineBreakDeferred = false;
+
+if (*(i()) == '\t')
+{
+ if (!tmpText.empty())
+ {
+if (iface)
+ iface-insertText(tmpText);
+tmpText.clear();
+ }
+
+ if (iface)
+iface-insertTab();
+}
+else if (*(i()) == '\n')
+{
+ if (!tmpText.empty())
+ {
+if (iface)
+ iface-insertText(tmpText);
+tmpText.clear();
+ }
+
+ isLineBreakDeferred = true;
+}
+else
+{
+ tmpText.append(i());
+}
+ }
+ if (iface !tmpText.empty())
+iface-insertText(tmpText);
+}
+
+static void separateSpacesAndInsertText(librevenge::RVNGDrawingInterface
*iface, const librevenge::RVNGString text)
+{
+ if (!iface || text.empty())
+return;
+ librevenge::RVNGString tmpText;
+ int numConsecutiveSpaces = 0;
+ librevenge::RVNGString::Iter i(text);
+ for (i.rewind(); i.next();)
+ {
+if (*(i()) == ' ')
+ numConsecutiveSpaces++;
+else
+ numConsecutiveSpaces = 0;
+
+if (numConsecutiveSpaces 1)
+{
+ if (!tmpText.empty())
+ {
+separateTabsAndInsertText(iface, tmpText);
+tmpText.clear();
+ }
+
+ if (iface)
+iface-insertSpace();
+}
+else
+{
+ tmpText.append(i());
+}
+ }
+ separateTabsAndInsertText(iface, tmpText);
+}
+
+} // anonymous namespace
+
class VSDOutputElement
{
public:
@@ -300,7 +383,7 @@
libvisio::VSDInsertTextOutputElement::VSDInsertTextOutputElement(const libreveng
void
libvisio::VSDInsertTextOutputElement::draw(librevenge::RVNGDrawingInterface
*painter)
{
if (painter)
-painter-insertText(m_text);
+separateSpacesAndInsertText(painter, m_text);
}
libvisio::VSDCloseSpanOutputElement::VSDCloseSpanOutputElement() {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDOutputElementList.cpp |8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
New commits:
commit aa4d0f097bd31a24642dbe0ae4681d79940ffc0d
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 11:15:26 2013 +0100
Emit all lineBreaks, since several runs can be following
Change-Id: Ief01851bd6545b7fa38152cd332eb4a2a8409b3f
diff --git a/src/lib/VSDOutputElementList.cpp b/src/lib/VSDOutputElementList.cpp
index 2fbac5b..187aa67 100644
--- a/src/lib/VSDOutputElementList.cpp
+++ b/src/lib/VSDOutputElementList.cpp
@@ -40,15 +40,10 @@ static void
separateTabsAndInsertText(librevenge::RVNGDrawingInterface *iface, c
{
if (!iface || text.empty())
return;
- bool isLineBreakDeferred(false);
librevenge::RVNGString tmpText;
librevenge::RVNGString::Iter i(text);
for (i.rewind(); i.next();)
{
-if (isLineBreakDeferred iface)
- iface-insertLineBreak();
-isLineBreakDeferred = false;
-
if (*(i()) == '\t')
{
if (!tmpText.empty())
@@ -70,7 +65,8 @@ static void
separateTabsAndInsertText(librevenge::RVNGDrawingInterface *iface, c
tmpText.clear();
}
- isLineBreakDeferred = true;
+ if (iface)
+iface-insertLineBreak();
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDROutputElementList.cpp | 81 ++-
1 file changed, 80 insertions(+), 1 deletion(-)
New commits:
commit 1ac63edbf85f72590b4601aa16e8fd75702c2530
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 11:16:18 2013 +0100
Split spaces, tabs and lineBreaks from the text
Change-Id: I6d7284b9a2b629f6ea609ebd726a4d421e571603
diff --git a/src/lib/CDROutputElementList.cpp b/src/lib/CDROutputElementList.cpp
index 0491b8f..cfda29a 100644
--- a/src/lib/CDROutputElementList.cpp
+++ b/src/lib/CDROutputElementList.cpp
@@ -32,6 +32,85 @@
namespace libcdr
{
+namespace
+{
+
+static void separateTabsAndInsertText(librevenge::RVNGDrawingInterface *iface,
const librevenge::RVNGString text)
+{
+ if (!iface || text.empty())
+return;
+ librevenge::RVNGString tmpText;
+ librevenge::RVNGString::Iter i(text);
+ for (i.rewind(); i.next();)
+ {
+if (*(i()) == '\t')
+{
+ if (!tmpText.empty())
+ {
+if (iface)
+ iface-insertText(tmpText);
+tmpText.clear();
+ }
+
+ if (iface)
+iface-insertTab();
+}
+else if (*(i()) == '\n')
+{
+ if (!tmpText.empty())
+ {
+if (iface)
+ iface-insertText(tmpText);
+tmpText.clear();
+ }
+
+ if (iface)
+iface-insertLineBreak();
+}
+else
+{
+ tmpText.append(i());
+}
+ }
+ if (iface !tmpText.empty())
+iface-insertText(tmpText);
+}
+
+static void separateSpacesAndInsertText(librevenge::RVNGDrawingInterface
*iface, const librevenge::RVNGString text)
+{
+ if (!iface || text.empty())
+return;
+ librevenge::RVNGString tmpText;
+ int numConsecutiveSpaces = 0;
+ librevenge::RVNGString::Iter i(text);
+ for (i.rewind(); i.next();)
+ {
+if (*(i()) == ' ')
+ numConsecutiveSpaces++;
+else
+ numConsecutiveSpaces = 0;
+
+if (numConsecutiveSpaces 1)
+{
+ if (!tmpText.empty())
+ {
+separateTabsAndInsertText(iface, tmpText);
+tmpText.clear();
+ }
+
+ if (iface)
+iface-insertSpace();
+}
+else
+{
+ tmpText.append(i());
+}
+ }
+ separateTabsAndInsertText(iface, tmpText);
+}
+
+} // anonymous namespace
+
class CDROutputElement
{
public:
@@ -278,7 +357,7 @@
libcdr::CDRInsertTextOutputElement::CDRInsertTextOutputElement(const librevenge:
void libcdr::CDRInsertTextOutputElement::draw(librevenge::RVNGDrawingInterface
*painter)
{
if (painter)
-painter-insertText(m_text);
+separateSpacesAndInsertText(painter, m_text);
}
libcdr::CDRCloseSpanOutputElement::CDRCloseSpanOutputElement() {}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: I have some questions for libreoffice development.
Hi,
On Tue, Dec 03, 2013 at 06:41:20PM +0800, 刘先洋 rend...@gmail.com wrote:
Hi.I saw your patch:
-
-
commit 8d9991c97a3e9574d7424aa3d295e5b6b2830bda
Author: Miklos Vajna vmik...@suse.cz
Date: Thu Jul 19 12:49:37 2012 +0200
TextFieldmark::ReleaseDoc: properly remove text fieldmarks from SwDoc
Change-Id: I7b11cf78f106807561be77c51641796319aaf636
I want to know the function of TextFieldmark.
Or Fieldmark ,
Or SwXFieldmark,
Or {com.sun.star.text.Fieldmark,
SW_SERVICE_TYPE_FIELDMARK }
A fieldmark is an object that is both a field and a mark (as in
bookmark) at the same time. The above commit is part of the commented
text ranges work in Writer, where such a range is also a fieldmark, and
there were some problem with removing them.
HTH,
Miklos
signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source include/filter oox/source sw/qa
filter/source/msfilter/escherex.cxx | 23 ++
filter/source/msfilter/eschesdo.cxx | 17 +++-
filter/source/msfilter/eschesdo.hxx |4 ++-
include/filter/msfilter/escherex.hxx |6 +++--
oox/source/export/vmlexport.cxx |2 -
sw/qa/extras/ooxmlexport/data/ooxml-triangle.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |7 ++
7 files changed, 46 insertions(+), 13 deletions(-)
New commits:
commit a44e42b9cd08d1ac8438ed2944cf174ffd68b80e
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Dec 3 10:50:44 2013 +0100
filter: handle ooxml shapes in EscherPropertyContainer::GetCustomShapeType()
The problem was that the shapes produced by the drawingML import had
types like ooxml-triangle, and EnhancedCustomShapeTypeNames::Get() only
handles VML/binary MSO shapes (e.g. isosceles-triangle). Add an OOXML
mode, and in that case use msfilter::util::GETVMLShapeType() instead,
and only fall back to EnhancedCustomShapeTypeNames::Get() if necessary.
Change-Id: Ic93ba4719133dd3e96c17d2562642a03e559fefa
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 320c1b5..4f94859 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -22,6 +22,7 @@
#include svx/svdomedia.hxx
#include svx/xflftrit.hxx
#include filter/msfilter/escherex.hxx
+#include filter/msfilter/util.hxx
#include svx/unoapi.hxx
#include svx/svdobj.hxx
#include svx/svdoashp.hxx
@@ -3761,7 +3762,7 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
}
}
-MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference
drawing::XShape rXShape, sal_uInt32 nMirrorFlags, OUString rShapeType )
+MSO_SPT EscherPropertyContainer::GetCustomShapeType( const uno::Reference
drawing::XShape rXShape, sal_uInt32 nMirrorFlags, OUString rShapeType,
bool bOOXML )
{
MSO_SPT eShapeType = mso_sptNil;
nMirrorFlags = 0;
@@ -3782,7 +3783,20 @@ MSO_SPT EscherPropertyContainer::GetCustomShapeType(
const uno::Reference drawi
if ( rProp.Name == Type )
{
if ( rProp.Value = rShapeType )
-eShapeType = EnhancedCustomShapeTypeNames::Get(
rShapeType );
+{
+if (bOOXML)
+{
+// In case of VML export, try to handle the
+// ooxml- prefix in rShapeType. If that fails,
+// just do the same as the binary export.
+OString aType = OUStringToOString(rShapeType,
RTL_TEXTENCODING_UTF8);
+eShapeType =
msfilter::util::GETVMLShapeType(aType);
+if (eShapeType == mso_sptNil)
+eShapeType =
EnhancedCustomShapeTypeNames::Get(rShapeType);
+}
+else
+eShapeType =
EnhancedCustomShapeTypeNames::Get( rShapeType );
+}
}
else if ( rProp.Name == MirroredX )
{
@@ -4933,7 +4947,7 @@ public:
virtual ~SvNullStream() {}
};
-EscherEx::EscherEx( const EscherExGlobalRef rxGlobal, SvStream* pOutStrm ) :
+EscherEx::EscherEx( const EscherExGlobalRef rxGlobal, SvStream* pOutStrm,
bool bOOXML ) :
mxGlobal( rxGlobal ),
mpOutStrm ( pOutStrm ),
mbOwnsStrm ( false ),
@@ -4944,7 +4958,8 @@ EscherEx::EscherEx( const EscherExGlobalRef rxGlobal,
SvStream* pOutStrm ) :
mnHellLayerId ( USHRT_MAX ),
mbEscherSpgr( sal_False ),
-mbEscherDg ( sal_False )
+mbEscherDg ( sal_False ),
+mbOOXML(bOOXML)
{
if (!mpOutStrm)
{
diff --git a/filter/source/msfilter/eschesdo.cxx
b/filter/source/msfilter/eschesdo.cxx
index 1a6e33d..af2a954 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -254,7 +254,7 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape(
ImplEESdrObject rObj,
sal_uInt32 nMirrorFlags;
OUString sCustomShapeType;
-MSO_SPT eShapeType = aPropOpt.GetCustomShapeType(
rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType );
+MSO_SPT eShapeType = aPropOpt.GetCustomShapeType(
rObj.GetShapeRef(), nMirrorFlags, sCustomShapeType, rObj.GetOOXML() );
if ( sCustomShapeType == col-502ad400 || sCustomShapeType ==
col-60da8460 )
{
ADD_SHAPE( ESCHER_ShpInst_PictureFrame, 0xa00 );
@@ -953,7 +953,7 @@ void EscherEx::AddUnoShapes( const Reference XShapes
rxShapes )
sal_uInt32
[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/source sd/uiconfig sd/UIConfig_simpress.mk
sd/AllLangResTarget_sd.mk|1
sd/UIConfig_simpress.mk |2
sd/source/ui/dlg/tpaction.cxx| 334 --
sd/source/ui/dlg/tpaction.src| 175 -
sd/source/ui/inc/tpaction.hrc| 40 ---
sd/source/ui/inc/tpaction.hxx| 40 +--
sd/uiconfig/simpress/ui/interactiondialog.ui | 81 ++
sd/uiconfig/simpress/ui/interactionpage.ui | 346 +++
8 files changed, 611 insertions(+), 408 deletions(-)
New commits:
commit 00a3143b31b4f60cafcf5dcd94f4891bb920671a
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 3 10:25:09 2013 +
convert the last tabpage in sd to .ui
Change-Id: I49eb93ec73d0783ab62eab5ce469526dd069e0b0
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 642d460..4ac1707 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -47,7 +47,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/dlg/LayerDialog.src \
sd/source/ui/dlg/navigatr.src \
sd/source/ui/dlg/PaneDockingWindow.src \
-sd/source/ui/dlg/tpaction.src \
sd/source/ui/slideshow/slideshow.src \
sd/source/ui/view/DocumentRenderer.src \
))
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index 30b8aa3..eb93c03 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -83,6 +83,8 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/headerfooterdialog \
sd/uiconfig/simpress/ui/headerfootertab \
sd/uiconfig/simpress/ui/insertslides \
+ sd/uiconfig/simpress/ui/interactiondialog \
+ sd/uiconfig/simpress/ui/interactionpage \
sd/uiconfig/simpress/ui/masterlayoutdlg \
sd/uiconfig/simpress/ui/optimpressgeneralpage \
sd/uiconfig/simpress/ui/photoalbum \
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 225d01c..64d34be 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -56,7 +56,6 @@
#include View.hxx
#include sdresid.hxx
#include tpaction.hxx
-#include tpaction.hrc
#include strmname.h
#include ViewShell.hxx
#include drawdoc.hxx
@@ -77,71 +76,66 @@ using namespace com::sun::star::lang;
* Constructor of the Tab dialog: appends the pages to the dialog
*/
SdActionDlg::SdActionDlg (
-::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView ) :
-SfxNoLayoutSingleTabDialog ( pParent, *pAttr, TP_ANIMATION_ACTION ),
-rOutAttrs ( *pAttr )
+::Window* pParent, const SfxItemSet* pAttr, ::sd::View* pView )
+: SfxSingleTabDialog(pParent, *pAttr, InteractionDialog,
+modules/simpress/ui/interactiondialog.ui)
+, rOutAttrs(*pAttr)
{
// FreeResource();
-SfxTabPage* pNewPage = SdTPAction::Create( this, rOutAttrs );
-DBG_ASSERT( pNewPage, Unable to create page);
+SfxTabPage* pNewPage = SdTPAction::Create(get_content_area(), rOutAttrs);
+assert(pNewPage); //Unable to create page
// formerly in PageCreated
( (SdTPAction*) pNewPage )-SetView( pView );
( (SdTPAction*) pNewPage )-Construct();
-SetTabPage( pNewPage );
-
-OUString aStr( pNewPage-GetText() );
-if( !aStr.isEmpty() )
-SetText( aStr );
+setTabPage( pNewPage );
}
/**
* Action-TabPage
*/
-SdTPAction::SdTPAction( Window* pWindow, const SfxItemSet rInAttrs ) :
-SfxTabPage ( pWindow, SdResId( TP_ANIMATION ), rInAttrs ),
-
-aFtAction ( this, SdResId( FT_ACTION ) ),
-aLbAction ( this, SdResId( LB_ACTION ) ),
-aFtTree ( this, SdResId( FT_TREE ) ),
-aLbTree ( this, SdResId( LB_TREE ) ),
-aLbTreeDocument ( this, SdResId( LB_TREE_DOCUMENT ) ),
-aLbOLEAction( this, SdResId( LB_OLE_ACTION ) ),
-aFlSeparator( this, SdResId( FL_SEPARATOR ) ),
-aEdtSound ( this, SdResId( EDT_SOUND ) ),
-aEdtBookmark( this, SdResId( EDT_BOOKMARK ) ),
-aEdtDocument( this, SdResId( EDT_DOCUMENT ) ),
-aEdtProgram ( this, SdResId( EDT_PROGRAM ) ),
-aEdtMacro ( this, SdResId( EDT_MACRO ) ),
-aBtnSearch ( this, SdResId( BTN_SEARCH ) ),
-aBtnSeek( this, SdResId( BTN_SEEK ) ),
-
-rOutAttrs ( rInAttrs ),
-mpView ( NULL ),
-mpDoc ( NULL ),
-bTreeUpdated( sal_False )
+SdTPAction::SdTPAction(Window* pWindow, const SfxItemSet rInAttrs)
+: SfxTabPage(pWindow, InteractionPage,
+modules/simpress/ui/interactionpage.ui, rInAttrs)
+, rOutAttrs(rInAttrs)
+, mpView(NULL)
+, mpDoc(NULL)
+, bTreeUpdated(false)
{
-aEdtSound.SetAccessibleName(SD_RESSTR(STR_PATHNAME));
-aBtnSeek.SetAccessibleRelationMemberOf( aFlSeparator );
-
-FreeResource();
-
-aBtnSearch.SetClickHdl( LINK( this,
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 95/49c1c665bad9799021a8fcb3edb0f9adcff8b0
95/49c1c665bad9799021a8fcb3edb0f9adcff8b0 |1 + 1 file changed, 1 insertion(+) New commits: commit a10c55e8b09c85d5d3ba09ac7184336f06f6f45d Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 3 11:32:57 2013 + Notes added by 'git notes add' diff --git a/95/49c1c665bad9799021a8fcb3edb0f9adcff8b0 b/95/49c1c665bad9799021a8fcb3edb0f9adcff8b0 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/95/49c1c665bad9799021a8fcb3edb0f9adcff8b0 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 39593] copy/paste code detector / fixing
https://bugs.freedesktop.org/show_bug.cgi?id=39593 Shreyansh gandhish...@gmail.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |gandhish...@gmail.com |desktop.org | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libvisio.git: src/lib
src/lib/VSDOutputElementList.cpp |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 79f15858b2ccfcf87aa5dcd52a18a5bdf0a9bbd4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 12:37:53 2013 +0100
Insert only single empty text
Change-Id: Ic2ef7a1f9694de48a2295cec7269410020f8cb06
diff --git a/src/lib/VSDOutputElementList.cpp b/src/lib/VSDOutputElementList.cpp
index 187aa67..4e94b38 100644
--- a/src/lib/VSDOutputElementList.cpp
+++ b/src/lib/VSDOutputElementList.cpp
@@ -79,8 +79,13 @@ static void
separateTabsAndInsertText(librevenge::RVNGDrawingInterface *iface, c
static void separateSpacesAndInsertText(librevenge::RVNGDrawingInterface
*iface, const librevenge::RVNGString text)
{
- if (!iface || text.empty())
+ if (!iface)
+return;
+ if (text.empty())
+ {
+iface-insertText(text);
return;
+ }
librevenge::RVNGString tmpText;
int numConsecutiveSpaces = 0;
librevenge::RVNGString::Iter i(text);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Para Crear extensiones
Hola, necesito toda la documentación que tengan de como crear extensiones para LibreOffice, pues pretendo desarrollar una Guía para la creación de extensiones, para aquellos usuarios que deseen empezar de cero, como yo. Por favor cualquier ayuda es válida, gracias de ante mano. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 5 commits - svtools/source toolkit/source winaccessibility/inc winaccessibility/source
svtools/source/inc/filectrl.hrc|6 +++--- toolkit/source/awt/vclxwindow1.cxx |2 -- winaccessibility/inc/AccComponentEventListener.hxx |6 +++--- winaccessibility/inc/AccContainerEventListener.hxx |6 +++--- winaccessibility/inc/AccDescendantManagerEventListener.hxx |6 +++--- winaccessibility/inc/AccDialogEventListener.hxx|6 +++--- winaccessibility/inc/AccEventListener.hxx |6 +++--- winaccessibility/inc/AccFrameEventListener.hxx |6 +++--- winaccessibility/inc/AccListEventListener.hxx |6 +++--- winaccessibility/inc/AccMenuEventListener.hxx |6 +++--- winaccessibility/inc/AccObject.hxx |6 +++--- winaccessibility/inc/AccObjectContainerEventListener.hxx |4 ++-- winaccessibility/inc/AccObjectManagerAgent.hxx |4 ++-- winaccessibility/inc/AccObjectWinManager.hxx |6 +++--- winaccessibility/inc/AccParagraphEventListener.hxx |6 +++--- winaccessibility/inc/AccResource.hxx |9 +++-- winaccessibility/inc/AccTableEventListener.hxx |6 +++--- winaccessibility/inc/AccTextComponentEventListener.hxx |6 +++--- winaccessibility/inc/AccTopWindowListener.hxx |6 +++--- winaccessibility/inc/AccTreeEventListener.hxx |6 +++--- winaccessibility/inc/AccWindowEventListener.hxx|6 +++--- winaccessibility/inc/ResIDGenerator.hxx|6 +++--- winaccessibility/inc/accHelper.hxx |6 +++--- winaccessibility/inc/unomsaaevent.hxx |6 +++--- winaccessibility/source/UAccCOM/AccAction.h|6 +++--- winaccessibility/source/UAccCOM/AccRelation.h |6 +++--- winaccessibility/source/UAccCOM/AccTable.h |6 +++--- winaccessibility/source/UAccCOM/AccessibleKeyStroke.h |6 +++--- winaccessibility/source/UAccCOM/CheckEnableAccessible.h|6 +++--- winaccessibility/source/UAccCOM/EnumVariant.h |6 +++--- winaccessibility/source/UAccCOM/MAccessible.h |6 +++--- winaccessibility/source/UAccCOM/UNOXWrapper.h |6 +++--- winaccessibility/source/service/AccObjectWinManager.cxx|2 -- 33 files changed, 91 insertions(+), 98 deletions(-) New commits: commit a718fef09489fdcd2908af49b0c35cfebbbfb388 Author: Tor Lillqvist t...@collabora.com Date: Tue Dec 3 11:25:33 2013 +0200 Use our header guard convention Using identifiers starting with underscores is questionable even if they don't happen to clash with anything used by the language implementation. Change-Id: I0af605d40d85ea7e47e1047572fbe180270e08ac diff --git a/winaccessibility/inc/AccComponentEventListener.hxx b/winaccessibility/inc/AccComponentEventListener.hxx index 6cfb317..d05aa64 100644 --- a/winaccessibility/inc/AccComponentEventListener.hxx +++ b/winaccessibility/inc/AccComponentEventListener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __ACCCOMPONENTEVENTLISTENER_HXX -#define __ACCCOMPONENTEVENTLISTENER_HXX +#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX +#define INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX #include stdio.h #include AccEventListener.hxx @@ -69,6 +69,6 @@ public: void HandleTextSelectionChangedEvent(); }; -#endif +#endif // INCLUDED_WINACCESSIBILITY_INC_ACCCOMPONENTEVENTLISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/inc/AccContainerEventListener.hxx b/winaccessibility/inc/AccContainerEventListener.hxx index 5cc4eb6..5f556ee 100644 --- a/winaccessibility/inc/AccContainerEventListener.hxx +++ b/winaccessibility/inc/AccContainerEventListener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef __ACCCONTAINEREVENTLISTENERHXX -#define __ACCCONTAINEREVENTLISTENERHXX +#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCCONTAINEREVENTLISTENER_HXX +#define INCLUDED_WINACCESSIBILITY_INC_ACCCONTAINEREVENTLISTENER_HXX #include stdio.h #include AccEventListener.hxx @@ -97,6 +97,6 @@ public: virtual void HandleNameChangedEvent(css::uno::Any name) SAL_OVERRIDE; }; -#endif +#endif // INCLUDED_WINACCESSIBILITY_INC_ACCCONTAINEREVENTLISTENER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/winaccessibility/inc/AccDescendantManagerEventListener.hxx b/winaccessibility/inc/AccDescendantManagerEventListener.hxx index c21364f..1157a52 100644 --- a/winaccessibility/inc/AccDescendantManagerEventListener.hxx +++ b/winaccessibility/inc/AccDescendantManagerEventListener.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 27c024800732b607281088a74e253447c9392149 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 3 11:39:29 2013 + Updated core Project: help 669b94349794029c207147d7d3702540a44f8444 diff --git a/helpcontent2 b/helpcontent2 index 9e37f60..669b943 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 9e37f604ff7f1da03d9ed1d69b9f01f98d48b46c +Subproject commit 669b94349794029c207147d7d3702540a44f8444 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst |9 --- source/text/simpress/01/0607.xhp | 42 +-- 2 files changed, 21 insertions(+), 30 deletions(-) New commits: commit 669b94349794029c207147d7d3702540a44f8444 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 3 11:39:29 2013 + update help ids for interaction page/dialog .ui conversion Change-Id: I678ade264f88b19f8316abbe8620f17b91d2d90c diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 63be02c..8ea4855 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -6286,11 +6286,6 @@ sd_Edit_DLG_PUBLISHING_PAGE2_URL,1085851694, sd_Edit_DLG_PUBLISHING_PAGE4_AUTHOR,1085851716, sd_Edit_DLG_PUBLISHING_PAGE4_EMAIL_EDIT,1085851718, sd_Edit_DLG_PUBLISHING_PAGE4_WWW_EDIT,1085851720, -sd_Edit_TP_ANIMATION_EDT_BOOKMARK,549767170, -sd_Edit_TP_ANIMATION_EDT_DOCUMENT,549767171, -sd_Edit_TP_ANIMATION_EDT_MACRO,549767173, -sd_Edit_TP_ANIMATION_EDT_PROGRAM,549767172, -sd_Edit_TP_ANIMATION_EDT_SOUND,549767169, sd_ImageButton_FLT_WIN_ANIMATION_BTN_FIRST,3231378945, sd_ImageButton_FLT_WIN_ANIMATION_BTN_GET_ALL_OBJECTS,3231378951, sd_ImageButton_FLT_WIN_ANIMATION_BTN_GET_ONE_OBJECT,3231378950, @@ -6308,8 +6303,6 @@ sd_ListBox_DLG_PRINTDIALOG_CB_SLIDESPERPAGE,1104006661, sd_ListBox_DLG_PUBLISHING_PAGE1_DESIGNS,1085853189, sd_ListBox_FLT_WIN_ANIMATION_LB_ADJUSTMENT,3231370754, sd_ListBox_FLT_WIN_ANIMATION_LB_LOOP_COUNT,3231370755, -sd_ListBox_TP_ANIMATION_LB_ACTION,549768707, -sd_ListBox_TP_ANIMATION_LB_OLE_ACTION,549768708, sd_ModalDialog_DLG_CUSTOMANIMATION_SCHEMES_PANE,1415741440, sd_ModalDialog_DLG_INSERT_PASTE,1084850176, sd_ModalDialog_DLG_PRINTDIALOG,1104003072, @@ -6333,8 +6326,6 @@ sd_PushButton_DLG_PUBLISHING_PAGE6_LINK,1085854314, sd_PushButton_DLG_PUBLISHING_PAGE6_TEXT,1085854313, sd_PushButton_DLG_PUBLISHING_PAGE6_VLINK,1085854315, sd_PushButton_FLT_WIN_ANIMATION_BTN_CREATE_GROUP,3231371786, -sd_PushButton_TP_ANIMATION_BTN_SEARCH,549769729, -sd_PushButton_TP_ANIMATION_BTN_SEEK,549769730, sd_RadioButton_DLG_ASS_RB_PAGE1_EMPTY,1088487947, sd_RadioButton_DLG_ASS_RB_PAGE1_OPEN,1088487951, sd_RadioButton_DLG_ASS_RB_PAGE1_TEMPLATE,1088487948, diff --git a/source/text/simpress/01/0607.xhp b/source/text/simpress/01/0607.xhp index 4fbcfa9..eb2598d 100644 --- a/source/text/simpress/01/0607.xhp +++ b/source/text/simpress/01/0607.xhp @@ -37,14 +37,14 @@ bookmark_valueexiting;by clicking objects/bookmark_value /bookmarkcommentmw made exiting... a two level entry/comment bookmark xml-lang=en-US branch=hid/.uno:AnimationEffects id=bm_id3555838 localize=false/ -bookmark xml-lang=en-US branch=hid/.uno:AnimationEffects id=bm_id3152874 localize=false/paragraph role=heading id=hd_id3153246 xml-lang=en-US level=1 l10n=U oldref=1Interaction/paragraph +bookmark xml-lang=en-US branch=hid/modules/simpress/ui/interactionpage/InteractionPage id=bm_id3152874 localize=false/paragraph role=heading id=hd_id3153246 xml-lang=en-US level=1 l10n=U oldref=1Interaction/paragraph paragraph role=paragraph id=par_id3154762 xml-lang=en-US l10n=U oldref=2variable id=interaktiontextahelp hid=.uno:AnimationEffectsDefines how the selected object behaves when you click on it during a slide show./ahelp /variablecommentUFI: Deleted many paras, see #60550/comment/paragraph section id=howtoget embed href=text/simpress/00/0407.xhp#interaktion/ /section -bookmark xml-lang=en-US branch=hid/sd:ListBox:TP_ANIMATION:LB_ACTION id=bm_id3150432 localize=false/paragraph role=heading id=hd_id3145116 xml-lang=en-US level=2 l10n=U oldref=3Action at mouse click/paragraph -paragraph role=paragraph id=par_id3153955 xml-lang=en-US l10n=U oldref=44ahelp hid=SD:LISTBOX:TP_ANIMATION:LB_ACTIONSpecifies the action that will run when you click the selected object during a slide show./ahelp You can also assign actions to grouped objects./paragraph +bookmark xml-lang=en-US branch=hid/modules/simpress/ui/interactionpage/listbox id=bm_id3150432 localize=false/paragraph role=heading id=hd_id3145116 xml-lang=en-US level=2 l10n=U oldref=3Action at mouse click/paragraph +paragraph role=paragraph id=par_id3153955 xml-lang=en-US l10n=U oldref=44ahelp hid=modules/simpress/ui/interactionpage/listboxSpecifies the action that will run when you click the selected object during a slide show./ahelp You can also assign actions to grouped objects./paragraph paragraph role=heading id=hd_id3150397 xml-lang=en-US level=2 l10n=U oldref=4No action/paragraph paragraph role=paragraph id=par_id3147405 xml-lang=en-US l10n=U oldref=45No action occurs./paragraph paragraph role=heading id=hd_id3145237 xml-lang=en-US level=2 l10n=U oldref=5Go to previous slide/paragraph @@ -57,26 +57,26 @@ paragraph role=paragraph id=par_id3149891 xml-lang=en-US l10n=U oldref=49Jumps to the last slide in the slide show./paragraph paragraph role=heading id=hd_id3155258 xml-lang=en-US level=2 l10n=U oldref=9Go to page or
[Libreoffice-commits] core.git: sd/inc
sd/inc/helpids.h |3 --- 1 file changed, 3 deletions(-) New commits: commit bb8d288bdb1e432f203e80fedebe854b194d776c Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 3 11:40:18 2013 + drop now unused helpids Change-Id: Ic72252c359e231cad4e3a28591883f6adde1bb79 diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index ff67035..2641b1a 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -71,9 +71,6 @@ #define HID_SD_WIN_PRESENTATION SD_HID_SD_WIN_PRESENTATION -#define HID_CTL_ACTION_DLG_1 SD_HID_CTL_ACTION_DLG_1 -#define HID_CTL_ACTION_DLG_2 SD_HID_CTL_ACTION_DLG_2 - #define HID_SD_BTN_PRESENTATION SD_HID_SD_BTN_PRESENTATION #define HID_SD_HTMLEXPORT_PAGE1 SD_HID_SD_HTMLEXPORT_PAGE1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/inc/SlideSorterChildWindow.hrc | 24 ---
sd/source/ui/slidesorter/shell/SlideSorter.cxx|1
sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src | 46 --
3 files changed, 71 deletions(-)
New commits:
commit 1ef873db6e5d38fd24e71cbdb61556f9d39cac73
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 3 11:46:52 2013 +
unused .src file
Change-Id: Icf396b255fa9a8dda7e1d990da7e0a8a27869157
diff --git a/sd/source/ui/inc/SlideSorterChildWindow.hrc
b/sd/source/ui/inc/SlideSorterChildWindow.hrc
deleted file mode 100644
index 7efeef9..000
--- a/sd/source/ui/inc/SlideSorterChildWindow.hrc
+++ /dev/null
@@ -1,24 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#define FLT_WIN_SLIDE_BROWSER 789
-
-#define TOOLPANEL 1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index 134e68e..88321d7 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -20,7 +20,6 @@
#include SlideSorter.hxx
-#include SlideSorterChildWindow.hrc
#include SlideSorterViewShell.hxx
#include controller/SlideSorterController.hxx
#include controller/SlsScrollBarManager.hxx
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src
b/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src
deleted file mode 100644
index 4dc87b8..000
--- a/sd/source/ui/slidesorter/shell/SlideSorterChildWindow.src
+++ /dev/null
@@ -1,46 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the License); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include app.hrc
-#include SlideSorterChildWindow.hrc
-
-DockingWindow FLT_WIN_SLIDE_BROWSER
-{
-HelpID = SID_SLIDE_BROWSER;
-Border = TRUE ;
-Hide = FALSE ;
-SVLook = TRUE ;
-Sizeable = TRUE ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-Zoomable = TRUE ;
-Dockable = TRUE ;
-EnableResizing = TRUE ;
-Size = MAP_APPFONT ( 140 , 120 ) ;
-Text = Slide Browser ;
-
-Control TOOLPANEL
-{
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( 69, 150 ) ;
-Border = FALSE;
-};
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sd/source
sd/source/ui/dlg/PaneDockingWindow.src | 16
sd/source/ui/inc/PaneDockingWindow.hrc |1 -
2 files changed, 17 deletions(-)
New commits:
commit a13c56fbafd930a5a8e117a57d7a8234cf49c4f1
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 3 11:52:15 2013 +
FLT_TOOL_PANEL_DOCKING_WINDOW unused
Change-Id: I825cdefc5aef92d271ded4a35a21a441bc7325c6
diff --git a/sd/source/ui/dlg/PaneDockingWindow.src
b/sd/source/ui/dlg/PaneDockingWindow.src
index a1bf935..f69b3c1 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.src
+++ b/sd/source/ui/dlg/PaneDockingWindow.src
@@ -51,20 +51,4 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW
Text [ en-US ] = Page Pane ;
};
-DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW
-{
-HelpID = sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW;
-Border = TRUE ;
-Hide = TRUE ;
-SVLook = TRUE ;
-Sizeable = TRUE ;
-Moveable = TRUE ;
-Closeable = TRUE ;
-Zoomable = TRUE ;
-Dockable = TRUE ;
-EnableResizing = TRUE ;
-Size = MAP_APPFONT (100,200) ;
-Text [ en-US ] = Task Pane ;
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/PaneDockingWindow.hrc
b/sd/source/ui/inc/PaneDockingWindow.hrc
index 3e26741..9bf5474 100644
--- a/sd/source/ui/inc/PaneDockingWindow.hrc
+++ b/sd/source/ui/inc/PaneDockingWindow.hrc
@@ -19,6 +19,5 @@
#define FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW792
#define FLT_LEFT_PANE_DRAW_DOCKING_WINDOW 793
-#define FLT_TOOL_PANEL_DOCKING_WINDOW 794
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libcdr.git: src/lib
src/lib/CDROutputElementList.cpp |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 5ca4ddf38f1248908697e0b6bc301a940929f925
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 12:54:51 2013 +0100
Insert only single empty text
Change-Id: Ifa5823e5f6ba588b84858e8b0b987bb54349af46
diff --git a/src/lib/CDROutputElementList.cpp b/src/lib/CDROutputElementList.cpp
index cfda29a..2ca67ea 100644
--- a/src/lib/CDROutputElementList.cpp
+++ b/src/lib/CDROutputElementList.cpp
@@ -78,8 +78,13 @@ static void
separateTabsAndInsertText(librevenge::RVNGDrawingInterface *iface, c
static void separateSpacesAndInsertText(librevenge::RVNGDrawingInterface
*iface, const librevenge::RVNGString text)
{
- if (!iface || text.empty())
+ if (!iface)
+return;
+ if (text.empty())
+ {
+iface-insertText(text);
return;
+ }
librevenge::RVNGString tmpText;
int numConsecutiveSpaces = 0;
librevenge::RVNGString::Iter i(text);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 30 arguments in functions (?)
Hi Olivier, On Friday, 2013-11-29 19:57:00 -0200, Olivier Hallot wrote: Most of the translation I have about Calc functions such as SUM, SUMIF, COUNT states that arg1, arg1... arg30 are 30 arguments for the function Some people here are discorvering that, in fact, you can have up to 255 arguments in your function. So, what should we put in our translation? Is this a unlisted feature? The functions' number of possible parameters is 255, but the FunctionWizard UI currently is limited to 30 arguments, if you have a function with more arguments the remaining arguments and separators get squeezed into the last parameter's UI edit field, which looks odd but still works. That's why you encounter the magic number 30 in the FunctionWizard descriptions that maybe also made it into the help text. So in translations of the current FunctionWizard function descriptions I'd stick with the 30 (saying 255 there but not actually supporting it in the UI would be weird), but not mention that number elsewhere. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgprXsIlbtFOe.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - include/sax sax/Library_fastsax.mk sax/source sw/source
include/sax/fastparser.hxx |7 --
include/sax/fastsaxdllapi.h | 33 +++
sax/Library_fastsax.mk |2 -
sax/source/fastparser/fastparser.cxx |2 -
sw/source/core/access/accnotextframe.cxx |2 +
sw/source/core/doc/docnew.cxx|1
6 files changed, 43 insertions(+), 4 deletions(-)
New commits:
commit b6785eb5952b23748abb2ff56f004747648920d1
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 3 13:16:24 2013 +0100
sax: stop using SAX_DLLIMPLEMENTATION for both sax and fastsax
Change-Id: I243ec20015beec6b98ee0af55eb7c387008f32f1
diff --git a/include/sax/fastparser.hxx b/include/sax/fastparser.hxx
index 578b114..afd5add 100644
--- a/include/sax/fastparser.hxx
+++ b/include/sax/fastparser.hxx
@@ -24,7 +24,7 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include cppuhelper/implbase2.hxx
-#include saxdllapi.h
+#include sax/fastsaxdllapi.h
namespace com { namespace sun { namespace star { namespace xml { namespace sax
{
@@ -41,7 +41,10 @@ namespace sax_fastparser {
class FastSaxParserImpl;
// This class implements the external Parser interface
-class SAX_DLLPUBLIC FastSaxParser : public ::cppu::WeakImplHelper2
::com::sun::star::xml::sax::XFastParser, ::com::sun::star::lang::XServiceInfo
+class FASTSAX_DLLPUBLIC FastSaxParser
+: public ::cppu::WeakImplHelper2
+::com::sun::star::xml::sax::XFastParser,
+::com::sun::star::lang::XServiceInfo
{
FastSaxParserImpl* mpImpl;
diff --git a/include/sax/fastsaxdllapi.h b/include/sax/fastsaxdllapi.h
new file mode 100644
index 000..e532dd2
--- /dev/null
+++ b/include/sax/fastsaxdllapi.h
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the License); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SAX_FASTSAXDLLAPI_H
+#define INCLUDED_SAX_FASTSAXDLLAPI_H
+
+#include sal/types.h
+
+#if defined FASTSAX_DLLIMPLEMENTATION
+#define FASTSAX_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#define FASTSAX_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 4f98820..1fcb503 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Library_set_include,fastsax,\
))
$(eval $(call gb_Library_add_defs,fastsax,\
--DSAX_DLLIMPLEMENTATION \
+-DFASTSAX_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_use_sdk_api,fastsax))
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 3bff430..4f835d5 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -83,7 +83,7 @@ struct Event
CallbackType maType;
};
-struct SAX_DLLPUBLIC NameWithToken
+struct NameWithToken
{
OUString msName;
sal_Int32 mnToken;
commit 4c9ddd594e26c517b8515f77206bfeb2fb063e03
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 3 12:28:42 2013 +0100
SwAccessibleFrameBase::Modify(): avoid accessing deleted mpFrm
In ~SwDoc when a SwFmt is deleted,
SwAccessibleNoTextFrame::GetNoTxtNode() would access the mpFrm which
at that point was already deleted too; avoid that by returning early.
This can be reproduced by closing the bugdoc from fdo#71450.
Change-Id: Ide4d42511ccad116fa0362c23ced299d8430d08a
diff --git a/sw/source/core/access/accnotextframe.cxx
b/sw/source/core/access/accnotextframe.cxx
index f50b19d..f9c6dac 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -98,6 +98,8 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem*
pOld, const SfxPoolItem
msTitle.isEmpty() )
{
SwAccessibleFrameBase::Modify( pOld, pNew );
+if (!GetRegisteredIn())
+return; // probably was deleted - avoid doing anything
}
const SwNoTxtNode *pNd = GetNoTxtNode();
commit c6f3d909f8e5c64b6bc36a13dfd0d46eb0e1d88d
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 3 00:32:30 2013 +0100
sw: valgrind complains about
Re: ODF OpenFormula implementer notes for new spreadsheet functions
Hi Winfried, On Monday, 2013-12-02 12:15:33 +0100, Winfried Donkers wrote: I updated our ODF OpenFormula extensions table https://wiki.documentfoundation.org/Development/ODF_Implementer_Notes#List_of_LibreOffice_OpenFormula_extensions with the new spreadsheet functions for Excel support. I can't find the page when browsing https://wiki.documentfoundation.org/Development . Well, yes, not every page under .../Development/... is actually listed on the .../Development entry page, that would be a tad too much ;-) But it's categorized and listed at https://wiki.documentfoundation.org/Category:Development Could you add little details to the 'Code pointer' and maybe 'Notes' columns similar to the other functions? Would be nice. Will do so, though not all at once. Thanks Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgp9goepyqdl3.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: 30 arguments in functions (?)
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Em 03-12-2013 10:13, Eike Rathke escreveu: Hi Olivier, On Friday, 2013-11-29 19:57:00 -0200, Olivier Hallot wrote: Most of the translation I have about Calc functions such as SUM, SUMIF, COUNT states that arg1, arg1... arg30 are 30 arguments for the function Some people here are discorvering that, in fact, you can have up to 255 arguments in your function. So, what should we put in our translation? Is this a unlisted feature? The functions' number of possible parameters is 255, but the FunctionWizard UI currently is limited to 30 arguments, if you have a function with more arguments the remaining arguments and separators get squeezed into the last parameter's UI edit field, which looks odd but still works. That's why you encounter the magic number 30 in the FunctionWizard descriptions that maybe also made it into the help text. So in translations of the current FunctionWizard function descriptions I'd stick with the 30 (saying 255 there but not actually supporting it in the UI would be weird), but not mention that number elsewhere. Eike Thanks Eike for the explanation. Although it is a limit almost never reached, do you think this limit can be lifted through an easy-hack? (maybe there is just no demand for that...) Regards - -- Olivier Hallot Founder, Board of Directors Member - The Document Foundation The Document Foundation, Kurfürstendamm 188, 10707 - Berlin, Germany Gemeinnützige rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint LibreOffice translation leader for Brazilian Portuguese +55-21-8822-8812 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBAgAGBQJSndC+AAoJEJp3R7nH3vLxMl8H/37IOC0tMwFR/zm0dILyZb+l 8Cq6y6UV2yT2dn9rczb8RKmJ1TexVPPia59/dO+g5mhzju5yKyC7zFmg4nTb6No2 WSybrYaEedri2DyVizAJHwdWoZh2z8bPhIY7RsJKbwDANXvVobK9/G203MCApfnN JSt7DzCkq+dFXdyg2Ob7zHhfetk6gGMie40o/l60ZdQn5vvm8rxPUQKZdSxvCl2P +1VrijHBtUsPJlDIdZYfX46uau96ds6hPkR4UeQYfJTNrbG3fGTsa8cta5K7WCNT 2uTm3NBrU+osnzwWm8ZrfhiBOD5TwOKWMsGRBUcd1imOBORHAjZ0SbureX/pC9U= =GguQ -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - sw/source
sw/source/core/access/accnotextframe.cxx |2 ++
sw/source/core/doc/docnew.cxx|1 +
2 files changed, 3 insertions(+)
New commits:
commit f995ccc3d5d39f382ad278434ff0fc30de8b0ccb
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 3 12:28:42 2013 +0100
SwAccessibleFrameBase::Modify(): avoid accessing deleted mpFrm
In ~SwDoc when a SwFmt is deleted,
SwAccessibleNoTextFrame::GetNoTxtNode() would access the mpFrm which
at that point was already deleted too; avoid that by returning early.
This can be reproduced by closing the bugdoc from fdo#71450.
Change-Id: Ide4d42511ccad116fa0362c23ced299d8430d08a
(cherry picked from commit 4c9ddd594e26c517b8515f77206bfeb2fb063e03)
diff --git a/sw/source/core/access/accnotextframe.cxx
b/sw/source/core/access/accnotextframe.cxx
index d0a0de9..35f969f 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -86,6 +86,8 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem*
pOld, const SfxPoolItem
msTitle.isEmpty() )
{
SwAccessibleFrameBase::Modify( pOld, pNew );
+if (!GetRegisteredIn())
+return; // probably was deleted - avoid doing anything
}
const SwNoTxtNode *pNd = GetNoTxtNode();
commit eeca244139eec880f0eb0141243de98c3d85be9a
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 3 00:32:30 2013 +0100
sw: valgrind complains about uninitialized mbIsPrepareSelAll
Change-Id: I5405a6818fc63c3e29bb189858fd0abc73f67e43
(cherry picked from commit c6f3d909f8e5c64b6bc36a13dfd0d46eb0e1d88d)
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 5385509..b9fcfb6 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -277,6 +277,7 @@ SwDoc::SwDoc()
mbLinksUpdated( false ), //#i38810#
mbClipBoard( false ),
mbColumnSelection( false ),
+mbIsPrepareSelAll(false),
#ifdef DBG_UTIL
mbXMLExport(false),
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/source
sw/source/core/doc/docnew.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 3dbe28273f963b1b20312eb27869bb3f5cccae7c Author: Michael Stahl mst...@redhat.com Date: Tue Dec 3 13:43:33 2013 +0100 Revert sw: valgrind complains about uninitialized mbIsPrepareSelAll Oops, that one is master-only. This reverts commit eeca244139eec880f0eb0141243de98c3d85be9a. Change-Id: Ibb65fb17304cbd405096afbbdde7fff11a91c4f6 diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index b9fcfb6..5385509 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -277,7 +277,6 @@ SwDoc::SwDoc() mbLinksUpdated( false ), //#i38810# mbClipBoard( false ), mbColumnSelection( false ), -mbIsPrepareSelAll(false), #ifdef DBG_UTIL mbXMLExport(false), #endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: fdo69552 backward compatibility with optional arguments in calc functions
Hi Winfried,
On Tuesday, 2013-12-03 09:52:04 +0100, Winfried Donkers wrote:
I shall have a look at the code and see if your stepped approach is easy to
apply. Also, I shall have a look if and how this has effect on the Excel 2010
functions
CEILING.PRECISE, ISO.CEILING and FLOOR.PRECISE.
It might in future if we want to map those (or some) to their ODFF
equivalent.
Where would be a good place to put the 'to Do list' (planned changes per
release per function)?
In the code, in a wiki, which file/page?
Wiki would be best, as a subpage of .../Development/Calc/ and categorize
it as [[Category:Calc|{{SUBPAGENAME}}]]
Maybe also as a subpage of .../Development/Calc/Spreadsheet_Functions/
Eike
--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack
pgpvCWuXw9DZ3.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] libmspub.git: src/lib
src/lib/MSPUBCollector.cpp | 86 -
1 file changed, 85 insertions(+), 1 deletion(-)
New commits:
commit 3e9dfdccfa58447677d8e6404933229282bd6ae4
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 13:52:48 2013 +0100
Separate tabs, spaces and line-breaks from text
Change-Id: I11a1405914fcc38400c5ce28cb37e4330e72b0aa
diff --git a/src/lib/MSPUBCollector.cpp b/src/lib/MSPUBCollector.cpp
index b961c6e..fa28b0e 100644
--- a/src/lib/MSPUBCollector.cpp
+++ b/src/lib/MSPUBCollector.cpp
@@ -39,6 +39,90 @@
#include PolygonUtils.h
#include Coordinate.h
+namespace
+{
+
+static void separateTabsAndInsertText(librevenge::RVNGDrawingInterface *iface,
const librevenge::RVNGString text)
+{
+ if (!iface || text.empty())
+return;
+ librevenge::RVNGString tmpText;
+ librevenge::RVNGString::Iter i(text);
+ for (i.rewind(); i.next();)
+ {
+if (*(i()) == '\t')
+{
+ if (!tmpText.empty())
+ {
+if (iface)
+ iface-insertText(tmpText);
+tmpText.clear();
+ }
+
+ if (iface)
+iface-insertTab();
+}
+else if (*(i()) == '\n')
+{
+ if (!tmpText.empty())
+ {
+if (iface)
+ iface-insertText(tmpText);
+tmpText.clear();
+ }
+
+ if (iface)
+iface-insertLineBreak();
+}
+else
+{
+ tmpText.append(i());
+}
+ }
+ if (iface !tmpText.empty())
+iface-insertText(tmpText);
+}
+
+static void separateSpacesAndInsertText(librevenge::RVNGDrawingInterface
*iface, const librevenge::RVNGString text)
+{
+ if (!iface)
+return;
+ if (text.empty())
+ {
+iface-insertText(text);
+return;
+ }
+ librevenge::RVNGString tmpText;
+ int numConsecutiveSpaces = 0;
+ librevenge::RVNGString::Iter i(text);
+ for (i.rewind(); i.next();)
+ {
+if (*(i()) == ' ')
+ numConsecutiveSpaces++;
+else
+ numConsecutiveSpaces = 0;
+
+if (numConsecutiveSpaces 1)
+{
+ if (!tmpText.empty())
+ {
+separateTabsAndInsertText(iface, tmpText);
+tmpText.clear();
+ }
+
+ if (iface)
+iface-insertSpace();
+}
+else
+{
+ tmpText.append(i());
+}
+ }
+ separateTabsAndInsertText(iface, tmpText);
+}
+
+} // anonymous namespace
+
librevenge::RVNGBinaryData libmspub::MSPUBCollector::addEOTFont(const
librevenge::RVNGString name)
{
m_embeddedFonts.push_back(EmbeddedFontInfo(name));
@@ -843,7 +927,7 @@ boost::functionvoid(void)
libmspub::MSPUBCollector::paintShape(const ShapeInfo
getCalculatedEncoding());
librevenge::RVNGPropertyList charProps =
getCharStyleProps(text[i_lines].spans[i_spans].style,
text[i_lines].style.m_defaultCharStyleIndex);
m_painter-openSpan(charProps);
-m_painter-insertText(textString);
+separateSpacesAndInsertText(m_painter, textString);
m_painter-closeSpan();
}
m_painter-closeParagraph();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Labels generation: CTR+A does not work
Hi everyone,I've noticed 2 points when generating labels: - With LO 3.x generation = Opening result document in LO 4.x versions lets you select all labels by pressing CTR+A. - With LO 4.x generation = Opening result document in LO 4.x versions does not allow you to select all labels by pressing CTR+A.It seems we have a problem with L0 4.x in labels generation.Any ideas about how to fix the bug ? -- View this message in context: http://nabble.documentfoundation.org/Labels-generation-CTR-A-does-not-work-tp4086248.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/opencl/openclwrapper.cxx |3 +++
1 file changed, 3 insertions(+)
New commits:
commit 48dad589e319c3545d9764b101a9834d55a09e43
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Dec 3 16:25:51 2013 +0100
fix crash when no platform is available
Change-Id: I730cd231ab6fe4626fefc1ddab67c1b9d77ecd0a
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index cf74a4be..5925440 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -922,6 +922,9 @@ void findDeviceInfoFromDeviceId(cl_device_id aDeviceId,
size_t rDeviceId, size_
bool switchOpenclDevice(const OUString* pDevice, bool bAutoSelect, bool
bForceEvaluation)
{
+if(fillOpenCLInfo().empty())
+return false;
+
cl_device_id pDeviceId = NULL;
if(pDevice)
pDeviceId = findDeviceIdByDeviceString(*pDevice, fillOpenCLInfo());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/jni_uno/jni_data.cxx | 26 --
1 file changed, 26 deletions(-)
New commits:
commit ddbeaada1c7abb0fee88e709f3d6d824f06b39e0
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 3 14:36:18 2013 +0100
BRIDGES_JNI_UNO_FORCE_BOXED_ANY is undefined
...ever since its inception in 4afcc7135e0bef66e7a218141bc93a6aa6128fd8
MWS_SRX644: migrate branch mws_srx644 - HEAD.
Change-Id: I82d3158b813fec89567fd94ed9ccc05944228161
diff --git a/bridges/source/jni_uno/jni_data.cxx
b/bridges/source/jni_uno/jni_data.cxx
index 2a24f58..cece43a 100644
--- a/bridges/source/jni_uno/jni_data.cxx
+++ b/bridges/source/jni_uno/jni_data.cxx
@@ -1618,31 +1618,6 @@ void Bridge::map_to_java(
if (in_param)
{
uno_Any const * pAny = (uno_Any const *)uno_data;
-
-#if defined BRIDGES_JNI_UNO_FORCE_BOXED_ANY
-if (typelib_TypeClass_VOID == pAny-pType-eTypeClass)
-{
-jo_any.reset(
-jni-NewLocalRef( m_jni_info-m_object_Any_VOID ) );
-}
-else
-{
-jvalue args[ 2 ];
-map_to_java(
-jni, args[ 1 ], pAny-pData, pAny-pType, 0,
-true /* in */, false /* no out */,
-true /* create integral wrappers */ );
-jo_any.reset( args[ 1 ].l );
-// build up com.sun.star.uno.Any
-JLocalAutoRef jo_type( jni, create_type( jni, pAny-pType ) );
-args[ 0 ].l = jo_type.get();
-jo_any.reset(
-jni-NewObjectA(
-m_jni_info-m_class_Any,
-m_jni_info-m_ctor_Any_with_Type_Object, args ) );
-jni.ensure_no_exception();
-}
-#else
switch (pAny-pType-eTypeClass)
{
case typelib_TypeClass_VOID:
@@ -1832,7 +1807,6 @@ void Bridge::map_to_java(
break;
}
}
-#endif
}
if (out_param)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 30 arguments in functions (?)
Hi Olivier, On Tuesday, 2013-12-03 10:38:25 -0200, Olivier Hallot wrote: Thanks Eike for the explanation. Although it is a limit almost never reached, do you think this limit can be lifted through an easy-hack? (maybe there is just no demand for that...) Probably users that have a demand for more than 30 arguments don't use the FunctionWizard because they know what they are doing ;-P But yes, from a first glance that looks like a quite easy EasyHack.. it's redefining VAR_ARGS from 30 to 255 at two places, formula/source/ui/dlg/parawin.cxx and sc/inc/sc.hrc, and check that everywhere where VAR_ARGS+x or PAIRED_VAR_ARGS are used the variable type is of at least sal_uInt16 and not sal_uInt8. As always, hidden details might be lurking to jump on you, for example the PAIRED_VAR_ARGS cases may need special attention. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpufl6liFEI_.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
threaded progress bar deadlock ...
Hi there,
Turns out the silly deadlock we see on XLSX loading is a result of the
windows' Yield implementation being simply awful[1] ;-) The progress
bar will deadlock vs. the main-loop in this case.
So - what can we do ? :-) interestingly the 'Yield' drops the solar
mutex all over the place inside our filters at random places already
today - so I'm no longer concerned about that: which is encouraging.
Separately - we wanted to put the progress bar updates into a thread -
and we should do that in the main thread I think.
That's actually not that hard to do IMHO; so instead of
(sc/source/filter/oox/workbookfragment.cxx):
{
// Ideally no-one else but our worker threads can re-acquire that.
// potentially if that causes a problem we might want to extend
// the SolarMutex functionality to allow passing it around.
SolarMutexReleaser aReleaser;
aPool.waitUntilWorkersDone();
}
We can drop the comment - there is no new risk here. And instead of the
'SolarMutexReleaser' we should just run an inferior main-loop and we
don't even need any explicit locking - the SolarMutex should do that for
us ;-)
ProgressBarTimer aTimer;
while (mnWorkingThreads 0) {
Application::Yield();
}
aPool.waitUntilWorkersdone();
And the ProgressBarTimer - should just update and re-render the timer
every 500ms or so.
As a side-effect / bonus this should let other LibreOffice applications
continue working while long sheet loading is occurring ;-) which might
be nice - but is no more risky than the current scattering of 'Yield's
we have everywhere.
Oh - and of course, in this mode - we need to tweak the
WorksheetGlobals::setRowModel() thing to not fiddle with the global oox
SubSegment::setPosition thing - but do that in the main loop. Instead I
guess we should have some atomically written sal_Int32 nStepsDone;
variable or something that the threads update and continue working ASAP
- without rendering anything - the 500ms timeout in the main thread will
handle that.
The mnWorkingThreads should be updated by the ThreadWorker when they
exit I guess.
How does that sound ?
hopefully it kills our windows deadlock without having to de-bong the
craziness in[1] for 4.2 :-)
At least that's one idea,
ATB,
Michael.
[1] -
http://cgit.freedesktop.org/libreoffice/core/tree/vcl/win/source/app/salinst.cxx#n681
is reasonably amazing, not only the 'sleep (1);' but also the assumption
that the main thread is not (eg.) doing a thread.join(); on a thread trying
to do something with the GUI = will never return.
--
michael.me...@collabora.com , Pseudo Engineer, itinerant idiot
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/mce.docx|binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx |6 ++
sw/qa/extras/ooxmlimport/data/textbox-wpg-only.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx |8
writerfilter/source/dmapper/GraphicImport.cxx | 11 +--
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |4
6 files changed, 23 insertions(+), 6 deletions(-)
New commits:
commit 197ec9cf1b7f50e0221c12e05dbc3e0064a82352
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Dec 3 15:19:56 2013 +0100
DOCX drawingML groupshape import: fix relative position
Change-Id: Ice07f423707b48a013a9b6325b11f88206c38e60
diff --git a/sw/qa/extras/ooxmlimport/data/textbox-wpg-only.docx
b/sw/qa/extras/ooxmlimport/data/textbox-wpg-only.docx
new file mode 100644
index 000..cd853f9
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/textbox-wpg-only.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 853c316..b0903b6 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1555,6 +1555,14 @@ DECLARE_OOXMLIMPORT_TEST(testWpgOnly, wpg-only.docx)
CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(548005)),
xShape-getPosition().X);
}
+DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly, textbox-wpg-only.docx)
+{
+uno::Referencedrawing::XShape xShape = getShape(1);
+// The relativeFrom attribute was ignored for groupshapes, i.e. these were
text::RelOrientation::FRAME.
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xShape, HoriOrientRelation));
+CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME,
getPropertysal_Int16(xShape, VertOrientRelation));
+}
+
DECLARE_OOXMLIMPORT_TEST(testFdo70457, fdo70457.docx)
{
// The document contains a rotated bitmap
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index f1c161b..8962f39 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -360,14 +360,19 @@ public:
PropertyNameSupplier rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_HORI_ORIENT ),
uno::makeAny(nHoriOrient));
+xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_VERT_ORIENT ),
+uno::makeAny(nVertOrient));
+}
+
+void applyRelativePosition(uno::Reference beans::XPropertySet
xGraphicObjectProperties) const
+{
+PropertyNameSupplier rPropNameSupplier =
PropertyNameSupplier::GetPropertyNameSupplier();
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_HORI_ORIENT_POSITION),
uno::makeAny(nLeftPosition));
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_HORI_ORIENT_RELATION ),
uno::makeAny(nHoriRelation));
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_PAGE_TOGGLE ),
uno::makeAny(bPageToggle));
-xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_VERT_ORIENT ),
-uno::makeAny(nVertOrient));
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_VERT_ORIENT_POSITION),
uno::makeAny(nTopPosition));
xGraphicObjectProperties-setPropertyValue(rPropNameSupplier.GetName(
PROP_VERT_ORIENT_RELATION ),
@@ -1034,6 +1039,7 @@ void GraphicImport::lcl_attribute(Id nName, Value val)
// Position of the groupshape should be set after
children have been added.
m_xShape-setPosition(awt::Point(m_pImpl-nLeftPosition,
m_pImpl-nTopPosition));
}
+m_pImpl-applyRelativePosition(xShapeProps);
m_pImpl-applyMargins(xShapeProps);
bool bOpaque = m_pImpl-bOpaque
!m_pImpl-rDomainMapper.IsInHeaderFooter();
@@ -1517,6 +1523,7 @@ uno::Reference text::XTextContent
GraphicImport::createGraphicObject( const b
}
m_pImpl-applyPosition(xGraphicObjectProperties);
+m_pImpl-applyRelativePosition(xGraphicObjectProperties);
bool bOpaque = m_pImpl-bOpaque
!m_pImpl-rDomainMapper.IsInHeaderFooter( );
if( !bOpaque )
{
commit 57450afb768c085df0ba2344aa94b5f843060178
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Tue Dec 3 11:59:42 2013 +0100
DOCX import: declare wps as a supported feature
This means in case we hit an mc:AlternateContent element, we will read
the mc:Choice branch of it, in case wps is the required feature, not
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - .gitreview
.gitreview |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7d245a0731ce12af49ff76b3777395a7ce034386 Author: Eike Rathke er...@redhat.com Date: Tue Dec 3 15:59:39 2013 +0100 defaultbranch=libreoffice-4-1-4 Change-Id: Ia9a57309a317567df076b6d78d8920b91071063d diff --git a/.gitreview b/.gitreview index 1fa62ad..b25ea45 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=logerrit port=29418 project=core defaultremote=logerrit -defaultbranch=libreoffice-4-1 +defaultbranch=libreoffice-4-1-4 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 70652] Merge bibisect repositories to one big one ...
https://bugs.freedesktop.org/show_bug.cgi?id=70652 --- Comment #6 from Qubit qu...@runcibility.com --- Repo created and pushed up to test server. For (test) access, email me a public ssh key. More details on the QA list -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Wizard use in Calc changes format
Hi julien2412, On Saturday, 2013-11-30 10:24:07 -0800, julien2412 wrote: On pc Debian x86-64 with master sources updated today, I noticed that if I use wizard (with any function) on Calc for a cell, the format of cell is: - font Times New Roman - size 6.8 (instead of Arial/10) If I directly put the formula without using wizard, no problem. Indeed, I reproduced that. Even if the FunctionWizard is invoked on an already existing formula, some modifications are done inside the wizard but it is left with Cancel so the changes are not applied, then also the font settings are modified. Before filling a bug, I wanted to know if it was already known and taken into account (I know that there a lot of changes in Calc part) I'm not aware of an existing bug filed. Eike -- LibreOffice Calc developer. Number formatter stricken i18n transpositionizer. GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A Support the FSFE, care about Free Software! https://fsfe.org/support/?erack pgpwRoOjS9rgS.pgp Description: PGP signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/source
sc/inc/queryparam.hxx |1
sc/source/core/data/dociter.cxx| 62 -
sc/source/core/data/table3.cxx | 42 +
sc/source/core/tool/queryparam.cxx |5 +-
4 files changed, 107 insertions(+), 3 deletions(-)
New commits:
commit 2259f4a6a93a0dd14e961aa6eb33f49752fc86dc
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 27 23:43:09 2013 +0100
resolved fdo#71589 reimplemented horizontal range lookup
Regression introduced with ebdd9c300718bce454ef56a31d5d8fb699fc1822
(first eaea417bfdf8d06df2b7f2e42c904c32ce77e871) that removed the
bMixedComparison member from ScQueryParam under the false assumption
that is was only used to emulate a legacy Excel behavior. In fact it was
also needed to do the at least horizontal range lookup in sorted mixed
data, though didn't evaluate exactly the same conditions as Excel and
defined in ODFF.
Reimplemented a similar behavior for the new code structures but this
time also checking for the additional condtion that a query ByString
does not return the last numeric result and vice versa, which previously
was missing.
(cherry picked from commit f0701470858f57a855ba57c0c2283e52953db327)
Conflicts:
sc/source/core/data/dociter.cxx
Backported.
Change-Id: I46061777879ba5301bfcaca2d50cf87a994f93f2
Reviewed-on: https://gerrit.libreoffice.org/6839
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 26d2d1b..445c23c 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -36,6 +36,7 @@ struct ScQueryParamBase
boolbCaseSens;
boolbRegExp;
boolbDuplicate;
+boolmbRangeLookup; /// for spreadsheet functions like
MATCH, LOOKUP, HLOOKUP, VLOOKUP
virtual ~ScQueryParamBase();
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f8ba16f..e050e58 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1325,6 +1325,17 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange(
SCCOL nFoundCol,
SCROW nFoundRow, bool bSearchForEqualAfterMismatch,
bool bIgnoreMismatchOnLeadingStringsP )
{
+// Set and automatically reset mpParam-mbRangeLookup when returning. We
+// could use comphelper::FlagRestorationGuard, but really, that one is
+// overengineered for this simple purpose here.
+struct BoolResetter
+{
+bool mr;
+bool mb;
+BoolResetter( bool r, bool b ) : mr(r), mb(r) { r = b; }
+~BoolResetter() { mr = mb; }
+} aRangeLookupResetter( mpParam-mbRangeLookup, true);
+
nFoundCol = MAXCOL+1;
nFoundRow = MAXROW+1;
SetStopOnMismatch( true ); // assume sorted keys
@@ -1333,7 +1344,22 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange(
SCCOL nFoundCol,
bool bRegExp = mpParam-bRegExp
mpParam-GetEntry(0).GetQueryItem().meType == ScQueryEntry::ByString;
bool bBinary = !bRegExp mpParam-bByRow (mpParam-GetEntry(0).eOp ==
SC_LESS_EQUAL || mpParam-GetEntry(0).eOp == SC_GREATER_EQUAL);
-if (bBinary ? (BinarySearch() ? GetThis() : 0) : GetFirst())
+bool bFound = false;
+if (bBinary)
+{
+if (BinarySearch())
+{
+// BinarySearch() already positions correctly and only needs real
+// query comparisons afterwards, skip the verification check below.
+mpParam-mbRangeLookup = false;
+bFound = GetThis();
+}
+}
+else
+{
+bFound = GetFirst();
+}
+if (bFound)
{
// First equal entry or last smaller than (greater than) entry.
SCSIZE nColRowSave;
@@ -1351,9 +1377,43 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange(
SCCOL nFoundCol,
{
// Step back to last in range and adjust position markers for
// GetNumberFormat() or similar.
+SCCOL nColDiff = nCol - nFoundCol;
nCol = nFoundCol;
nRow = nFoundRow;
nColRow = nColRowSave;
+if (mpParam-mbRangeLookup)
+{
+// Verify that the found entry does not only fulfill the range
+// lookup but also the real query, i.e. not numeric was found
+// if query is ByString and vice versa.
+mpParam-mbRangeLookup = false;
+// Step back the last field advance if GetNext() did one.
+if (bAdvanceQuery nColDiff)
+{
+SCSIZE nEntries = mpParam-GetEntryCount();
+for (SCSIZE j=0; j nEntries; ++j)
+{
+ScQueryEntry rEntry = mpParam-GetEntry( j );
+if (rEntry.bDoQuery)
+
[Libreoffice-commits] core.git: 3 commits - include/vcl sw/source vcl/aqua vcl/coretext vcl/inc vcl/source vcl/win
include/vcl/outdev.hxx |6 +--
sw/source/core/inc/swfont.hxx |2 -
sw/source/core/txtnode/fntcache.cxx| 47 +++--
sw/source/core/txtnode/fntcap.cxx | 33 ++---
vcl/aqua/source/gdi/atsui/salatslayout.cxx | 16
vcl/coretext/ctlayout.cxx |8 ++--
vcl/inc/textlayout.hxx |4 +-
vcl/source/edit/texteng.cxx|4 +-
vcl/source/gdi/outdev3.cxx | 54 +
vcl/source/gdi/sallayout.cxx | 12 +++---
vcl/source/gdi/textlayout.cxx |6 +--
vcl/source/glyphs/graphite_layout.cxx | 10 +++--
vcl/win/source/gdi/winlayout.cxx | 10 ++---
13 files changed, 100 insertions(+), 112 deletions(-)
New commits:
commit d83328b233f51d4a70bfeaae90129a68dccf825b
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 3 12:27:44 2013 +
longparas: convert GetTextBreak to sal_Int32
Change-Id: I693e4c9916e1968c33ebd922829662f6efc27bfb
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c922872..52b3cde 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -593,10 +593,10 @@ public:
voidDrawStretchText( const Point rStartPt, sal_uLong
nWidth,
const OUString rStr,
xub_StrLen nIndex = 0, xub_StrLen
nLen = STRING_LEN );
-xub_StrLen GetTextBreak( const OUString rStr, long nTextWidth,
+sal_Int32 GetTextBreak( const OUString rStr, long nTextWidth,
sal_Int32 nIndex = 0, sal_Int32 nLen =
-1,
long nCharExtra = 0 ) const;
-xub_StrLen GetTextBreak( const OUString rStr, long nTextWidth,
+sal_Int32 GetTextBreak( const OUString rStr, long nTextWidth,
sal_Unicode nExtraChar, sal_Int32
rExtraCharPos,
sal_Int32 nIndex, sal_Int32 nLen,
long nCharExtra = 0 ) const;
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index fb3849d..6f17a43 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -338,7 +338,7 @@ public:
Size GetCapitalSize( SwDrawTextInfo rInf )
{ return aSub[nActual].GetCapitalSize( rInf ); }
-xub_StrLen GetCapitalBreak( SwViewShell* pSh, const OutputDevice* pOut,
+sal_Int32 GetCapitalBreak( SwViewShell* pSh, const OutputDevice* pOut,
const SwScriptInfo* pScript, const OUString rTxt,
long nTextWidth, const xub_StrLen nIdx,
const xub_StrLen nLen );
diff --git a/sw/source/core/txtnode/fntcache.cxx
b/sw/source/core/txtnode/fntcache.cxx
index 781023f..3ea5be7 100644
--- a/sw/source/core/txtnode/fntcache.cxx
+++ b/sw/source/core/txtnode/fntcache.cxx
@@ -2357,7 +2357,7 @@ xub_StrLen SwFont::GetTxtBreak( SwDrawTextInfo rInf,
long nTextWidth )
OSL_ENSURE( !bCompress || ( rInf.GetScriptInfo() rInf.GetScriptInfo()-
CountCompChg()), Compression without info );
-xub_StrLen nTxtBreak = 0;
+sal_Int32 nTxtBreak = 0;
long nKern = 0;
sal_uInt16 nLn = ( rInf.GetLen() == STRING_LEN ? rInf.GetText().getLength()
@@ -2477,24 +2477,19 @@ xub_StrLen SwFont::GetTxtBreak( SwDrawTextInfo rInf,
long nTextWidth )
bTextReplaced = true;
}
-OUString sTmpText(*pTmpText); // only needed until *pTmpText is
OUString
-sal_Int32 nTmpIdx2 = nTmpIdx; // ditto
-sal_Int32 nTmpLen2 = nTmpLen; // ditto
if( rInf.GetHyphPos() ) {
sal_Int32 nHyphPos = *rInf.GetHyphPos();
-nTxtBreak = rInf.GetOut().GetTextBreak( sTmpText, nTextWidth,
+nTxtBreak = rInf.GetOut().GetTextBreak( *pTmpText, nTextWidth,
static_castsal_Unicode('-'), nHyphPos,
- nTmpIdx2, nTmpLen2, nKern );
+ nTmpIdx, nTmpLen, nKern );
*rInf.GetHyphPos() = (nHyphPos == -1)
? STRING_LEN : static_castxub_StrLen(nHyphPos);
}
else
-nTxtBreak = rInf.GetOut().GetTextBreak( sTmpText, nTextWidth,
-nTmpIdx2, nTmpLen2, nKern
);
+nTxtBreak = rInf.GetOut().GetTextBreak( *pTmpText, nTextWidth,
+nTmpIdx, nTmpLen, nKern );
-nTmpIdx = nTmpIdx2; // ditto
-nTmpLen = nTmpLen2; // ditto
-if ( bTextReplaced STRING_LEN != nTxtBreak )
+if ( bTextReplaced nTxtBreak != -1 )
{
if ( nTmpLen != nLn )
nTxtBreak = sw_CalcCaseMap( *this, rInf.GetText(),
@@ -2504,17 +2499,19 @@ xub_StrLen SwFont::GetTxtBreak( SwDrawTextInfo
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - oox/source
oox/source/export/drawingml.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 626fc7de513f689faacde93a3a51252950cdcb79
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Thu Nov 21 09:43:46 2013 -0500
Compiler warning.
Change-Id: I66b16e9767369fd54611f92d66cd1b43f4e8c5a8
(cherry picked from commit 5db19a417952381fc6349b9691c581090d7d2679)
Signed-off-by: Eike Rathke er...@redhat.com
(cherry picked from commit e4056b6b8194d89f617286a52652dd12584eeebc)
Signed-off-by: Eike Rathke er...@redhat.com
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 2abc67a..eae46e0 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -789,7 +789,7 @@ void DrawingML::WriteRunProperties( Reference XPropertySet
rRun, sal_Bool bIs
mAny = nCharEscapement;
if( nCharEscapement GETAD( CharEscapementHeight ) ) {
-sal_uInt32 nCharEscapementHeight;
+sal_uInt32 nCharEscapementHeight = 0;
mAny = nCharEscapementHeight;
nSize = (nSize * nCharEscapementHeight) / 100;
// MSO uses default ~58% size
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [libreoffice-dev] - libreoffice 4.2 extension - waiting on multiple sockets
On Mon, 2013-12-02 at 22:19 -0500, Neeraj Rai wrote: It doesn't seem to work You need to specify what exactly doesn't seem to work here. Kohei ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bridges/source
bridges/source/jni_uno/jni_uno2java.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b40dcdf4f5a03b71fe9e45f8f24fcaf25fd2febf Author: Stephan Bergmann sberg...@redhat.com Date: Tue Dec 3 18:04:20 2013 +0100 -Werror=unused-parameter Change-Id: I4dfa96b8ea2684969d9eeecfd88136742ce2d4a1 diff --git a/bridges/source/jni_uno/jni_uno2java.cxx b/bridges/source/jni_uno/jni_uno2java.cxx index 6ca7741..2465df3 100644 --- a/bridges/source/jni_uno/jni_uno2java.cxx +++ b/bridges/source/jni_uno/jni_uno2java.cxx @@ -527,7 +527,7 @@ void SAL_CALL UNO_proxy_free( uno_ExtEnvironment * env, void * proxy ) UNO_proxy const * that = reinterpret_cast UNO_proxy const * ( proxy ); Bridge const * bridge = that-m_bridge; -assert(env == bridge-m_uno_env); +assert(env == bridge-m_uno_env); (void) env; SAL_INFO(bridges, freeing binary uno proxy: that-m_oid); try ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/inc/interpre.hxx |1 +
sc/source/core/tool/interpr3.cxx | 24
sc/source/core/tool/interpr4.cxx |4 ++--
sc/source/ui/src/scfuncs.src |2 +-
4 files changed, 28 insertions(+), 3 deletions(-)
New commits:
commit c3760e9099db9cf1be696347e2a0743a3cae1b20
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date: Tue Dec 3 18:03:29 2013 +0100
fdo#70797 fix incorrect argument handling of CHISQ.DIST
Change-Id: I6187aa673034e6dc18f48f7b6b7ac88989ab55ec
Reviewed-on: https://gerrit.libreoffice.org/6914
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 4f60718..5171f30 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -754,6 +754,7 @@ void ScFDist();
void ScFDist_LT();
void ScChiDist(); // for LEGACY.CHIDIST, returns right tail
void ScChiSqDist(); // returns left tail or density
+void ScChiSqDist_MS();
void ScChiSqInv(); //invers to CHISQDIST
void ScWeibull();
void ScBetaDist();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 9f5aa00..79934e6 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -721,6 +721,30 @@ void ScInterpreter::ScChiSqDist()
}
}
+void ScInterpreter::ScChiSqDist_MS()
+{
+sal_uInt8 nParamCount = GetByte();
+if ( !MustHaveParamCount( nParamCount, 3, 3 ) )
+return;
+bool bCumulative = GetBool();
+double fDF = ::rtl::math::approxFloor( GetDouble() );
+if ( fDF 1.0 || fDF 1E10 )
+PushIllegalArgument();
+else
+{
+double fX = GetDouble();
+if ( fX 0 )
+PushIllegalArgument();
+else
+{
+if ( bCumulative )
+PushDouble( GetChiSqDistCDF( fX, fDF ) );
+else
+PushDouble( GetChiSqDistPDF( fX, fDF ) );
+}
+}
+}
+
void ScInterpreter::ScGamma()
{
double x = GetDouble();
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 2a92252..b341eaa 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4118,8 +4118,8 @@ StackVar ScInterpreter::Interpret()
case ocFDist_LT : ScFDist_LT(); break;
case ocChiDist :
case ocChiDist_MS : ScChiDist(); break;
-case ocChiSqDist:
-case ocChiSqDist_MS : ScChiSqDist();break;
+case ocChiSqDist: ScChiSqDist();break;
+case ocChiSqDist_MS : ScChiSqDist_MS(); break;
case ocStandard : ScStandard(); break;
case ocAveDev : ScAveDev(); break;
case ocDevSq: ScDevSq();break;
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index d761adec..960177b 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -7793,7 +7793,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 7 // Description of Parameter 3
{
-Text [ en-US ] = 0 or FALSE calculates the probability density
function. Any other value or TRUE or omitted calculates the cumulative
distribution function. ;
+Text [ en-US ] = 0 or FALSE calculates the probability density
function. Any other value or TRUE calculates the cumulative distribution
function. ;
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/inc/interpre.hxx |1 +
sc/source/core/tool/interpr3.cxx | 24
sc/source/core/tool/interpr4.cxx |4 ++--
sc/source/ui/src/scfuncs.src |2 +-
4 files changed, 28 insertions(+), 3 deletions(-)
New commits:
commit a4332ca8536242d7975146bcd700ecb0acb88f31
Author: Winfried Donkers winfrieddonk...@libreoffice.org
Date: Tue Dec 3 18:03:29 2013 +0100
fdo#70797 fix incorrect argument handling of CHISQ.DIST
Change-Id: I6187aa673034e6dc18f48f7b6b7ac88989ab55ec
Reviewed-on: https://gerrit.libreoffice.org/6914
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
(cherry picked from commit c3760e9099db9cf1be696347e2a0743a3cae1b20)
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index e8eefa3..f8fc0e9 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -754,6 +754,7 @@ void ScFDist();
void ScFDist_LT();
void ScChiDist(); // for LEGACY.CHIDIST, returns right tail
void ScChiSqDist(); // returns left tail or density
+void ScChiSqDist_MS();
void ScChiSqInv(); //invers to CHISQDIST
void ScWeibull();
void ScBetaDist();
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 0cb0cc8..8fa0a0e 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -721,6 +721,30 @@ void ScInterpreter::ScChiSqDist()
}
}
+void ScInterpreter::ScChiSqDist_MS()
+{
+sal_uInt8 nParamCount = GetByte();
+if ( !MustHaveParamCount( nParamCount, 3, 3 ) )
+return;
+bool bCumulative = GetBool();
+double fDF = ::rtl::math::approxFloor( GetDouble() );
+if ( fDF 1.0 || fDF 1E10 )
+PushIllegalArgument();
+else
+{
+double fX = GetDouble();
+if ( fX 0 )
+PushIllegalArgument();
+else
+{
+if ( bCumulative )
+PushDouble( GetChiSqDistCDF( fX, fDF ) );
+else
+PushDouble( GetChiSqDistPDF( fX, fDF ) );
+}
+}
+}
+
void ScInterpreter::ScGamma()
{
double x = GetDouble();
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index d230ac8..c70fdf4 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4118,8 +4118,8 @@ StackVar ScInterpreter::Interpret()
case ocFDist_LT : ScFDist_LT(); break;
case ocChiDist :
case ocChiDist_MS : ScChiDist(); break;
-case ocChiSqDist:
-case ocChiSqDist_MS : ScChiSqDist();break;
+case ocChiSqDist: ScChiSqDist();break;
+case ocChiSqDist_MS : ScChiSqDist_MS(); break;
case ocStandard : ScStandard(); break;
case ocAveDev : ScAveDev(); break;
case ocDevSq: ScDevSq();break;
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index ba670a4..314355c 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -7681,7 +7681,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 7 // Description of Parameter 3
{
-Text [ en-US ] = 0 or FALSE calculates the probability density
function. Any other value or TRUE or omitted calculates the cumulative
distribution function. ;
+Text [ en-US ] = 0 or FALSE calculates the probability density
function. Any other value or TRUE calculates the cumulative distribution
function. ;
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: QA Call Reminder: Monday @ 19:30 UTC
On Mon, 02 Dec 2013 02:15:18 +0100, Robinson Tryon bishop.robin...@gmail.com wrote: Hi all, The QA Team is having another one of our marvelous bi-weekly calls tomorrow. All are welcome! The agendum for the meeting and information on how to join via your phone or browser are available here: https://wiki.documentfoundation.org/QA/Meetings/2013/December_02 If you're new to the project and would like to get more involved, we'd love to see you on the call! Cheers, --R sorry, I missed that because of work issues. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 5 commits - oox/source sc/inc sc/source sw/qa sw/source writerfilter/source xmloff/source
oox/source/ppt/pptgraphicshapecontext.cxx | 23 +++-
sc/inc/queryparam.hxx |1
sc/source/core/data/dociter.cxx | 62 +-
sc/source/core/data/table3.cxx| 42 ++
sc/source/core/tool/queryparam.cxx|5 +
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
sw/source/filter/ww8/ww8par.cxx |2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14
xmloff/source/text/XMLTextFrameContext.cxx| 12 +++-
9 files changed, 163 insertions(+), 9 deletions(-)
New commits:
commit 9c97888e825a0a0371ed824f89c7ab1d50ab9bbd
Author: Eike Rathke er...@redhat.com
Date: Wed Nov 27 23:43:09 2013 +0100
resolved fdo#71589 reimplemented horizontal range lookup
Regression introduced with ebdd9c300718bce454ef56a31d5d8fb699fc1822
(first eaea417bfdf8d06df2b7f2e42c904c32ce77e871) that removed the
bMixedComparison member from ScQueryParam under the false assumption
that is was only used to emulate a legacy Excel behavior. In fact it was
also needed to do the at least horizontal range lookup in sorted mixed
data, though didn't evaluate exactly the same conditions as Excel and
defined in ODFF.
Reimplemented a similar behavior for the new code structures but this
time also checking for the additional condtion that a query ByString
does not return the last numeric result and vice versa, which previously
was missing.
(cherry picked from commit f0701470858f57a855ba57c0c2283e52953db327)
Conflicts:
sc/source/core/data/dociter.cxx
Backported.
Change-Id: I46061777879ba5301bfcaca2d50cf87a994f93f2
Reviewed-on: https://gerrit.libreoffice.org/6839
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx
index 26d2d1b..445c23c 100644
--- a/sc/inc/queryparam.hxx
+++ b/sc/inc/queryparam.hxx
@@ -36,6 +36,7 @@ struct ScQueryParamBase
boolbCaseSens;
boolbRegExp;
boolbDuplicate;
+boolmbRangeLookup; /// for spreadsheet functions like
MATCH, LOOKUP, HLOOKUP, VLOOKUP
virtual ~ScQueryParamBase();
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index f8ba16f..e050e58 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -1325,6 +1325,17 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange(
SCCOL nFoundCol,
SCROW nFoundRow, bool bSearchForEqualAfterMismatch,
bool bIgnoreMismatchOnLeadingStringsP )
{
+// Set and automatically reset mpParam-mbRangeLookup when returning. We
+// could use comphelper::FlagRestorationGuard, but really, that one is
+// overengineered for this simple purpose here.
+struct BoolResetter
+{
+bool mr;
+bool mb;
+BoolResetter( bool r, bool b ) : mr(r), mb(r) { r = b; }
+~BoolResetter() { mr = mb; }
+} aRangeLookupResetter( mpParam-mbRangeLookup, true);
+
nFoundCol = MAXCOL+1;
nFoundRow = MAXROW+1;
SetStopOnMismatch( true ); // assume sorted keys
@@ -1333,7 +1344,22 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange(
SCCOL nFoundCol,
bool bRegExp = mpParam-bRegExp
mpParam-GetEntry(0).GetQueryItem().meType == ScQueryEntry::ByString;
bool bBinary = !bRegExp mpParam-bByRow (mpParam-GetEntry(0).eOp ==
SC_LESS_EQUAL || mpParam-GetEntry(0).eOp == SC_GREATER_EQUAL);
-if (bBinary ? (BinarySearch() ? GetThis() : 0) : GetFirst())
+bool bFound = false;
+if (bBinary)
+{
+if (BinarySearch())
+{
+// BinarySearch() already positions correctly and only needs real
+// query comparisons afterwards, skip the verification check below.
+mpParam-mbRangeLookup = false;
+bFound = GetThis();
+}
+}
+else
+{
+bFound = GetFirst();
+}
+if (bFound)
{
// First equal entry or last smaller than (greater than) entry.
SCSIZE nColRowSave;
@@ -1351,9 +1377,43 @@ bool ScQueryCellIterator::FindEqualOrSortedLastInRange(
SCCOL nFoundCol,
{
// Step back to last in range and adjust position markers for
// GetNumberFormat() or similar.
+SCCOL nColDiff = nCol - nFoundCol;
nCol = nFoundCol;
nRow = nFoundRow;
nColRow = nColRowSave;
+if (mpParam-mbRangeLookup)
+{
+// Verify that the found entry does not only fulfill the range
+// lookup but also the real query, i.e. not numeric was found
+// if query is ByString and vice versa.
+mpParam-mbRangeLookup = false;
+// Step back the last field advance if
[Libreoffice-commits] core.git: vcl/inc vcl/win
vcl/inc/sallayout.hxx|6 +++---
vcl/win/source/gdi/winlayout.cxx | 11 ++-
2 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit af43ae6f85f9ca840889d568f15b6123c98037a4
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 3 20:26:36 2013 +0100
vcl: try to fix some sal_Int32 GetTextBreak()s
Change-Id: If4aee2b42f0d2e15ca228863754959b7486437ee
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 1f933a4..561c8f9 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -205,7 +205,7 @@ public:
int GetOrientation() const { return
mnOrientation; }
// methods using string indexing
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra=0, int
nFactor=1 ) const = 0;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra=0, int
nFactor=1) const = 0;
virtual longFillDXArray( sal_Int32* pDXArray ) const = 0;
virtual longGetTextWidth() const { return FillDXArray( NULL ); }
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const = 0;
@@ -263,7 +263,7 @@ class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout
{
public:
virtual voidDrawText( SalGraphics ) const;
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor
) const;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const;
virtual longFillDXArray( sal_Int32* pDXArray ) const;
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point
rPos,
@@ -359,7 +359,7 @@ public:
// used by upper layers
virtual longGetTextWidth() const;
virtual longFillDXArray( sal_Int32* pDXArray ) const;
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor
) const;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const;
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
// used by display layers
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index a0f1ec4..dc6e469 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -158,7 +158,7 @@ public:
const PhysicalFontFace** pFallbackFonts = NULL ) const;
virtual longFillDXArray( long* pDXArray ) const;
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor
) const;
+virtual salInt32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const;
virtual voidGetCaretPositions( int nArraySize, long* pCaretXArray )
const;
// for glyph+font+script fallback
@@ -1010,7 +1010,7 @@ public:
const PhysicalFontFace** pFallbackFonts = NULL ) const;
virtual longFillDXArray( long* pDXArray ) const;
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor
) const;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const;
virtual voidGetCaretPositions( int nArraySize, long* pCaretXArray )
const;
virtual boolIsKashidaPosValid ( int nCharPos ) const;
@@ -2719,7 +2719,7 @@ public:
virtual void DrawText( SalGraphics ) const;
// methods using string indexing
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra=0, int
nFactor=1 ) const;
+virtual sal_Int32 GetTextBreak( long nMaxWidth, long nCharExtra=0, int
nFactor=1 ) const;
virtual long FillDXArray( long* pDXArray ) const;
virtual void GetCaretPositions( int nArraySize, long* pCaretXArray )
const;
@@ -2855,9 +2855,10 @@ void GraphiteWinLayout::DrawText(SalGraphics
sal_graphics) const
DeleteFont( SelectFont( aHDC, hOrigFont ) );
}
-int GraphiteWinLayout::GetTextBreak( long nMaxWidth, long nCharExtra, int
nFactor ) const
+sal_Int32 GraphiteWinLayout::GetTextBreak(
+long nMaxWidth, long nCharExtra, int nFactor) const
{
-int nBreak = maImpl.GetTextBreak(nMaxWidth, nCharExtra, nFactor);
+sal_Int32 nBreak = maImpl.GetTextBreak(nMaxWidth, nCharExtra, nFactor);
return nBreak;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Wizard use in Calc changes format
On 03/12/2013 16:22, Eike Rathke wrote: ... Indeed, I reproduced that. Even if the FunctionWizard is invoked on an already existing formula, some modifications are done inside the wizard but it is left with Cancel so the changes are not applied, then also the font settings are modified. You're right! I've just tested this. I'm not aware of an existing bug filed. Bug filled https://bugs.freedesktop.org/show_bug.cgi?id=72278 Thank you Eike for your feedback about this! Julien ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - chart2/qa
chart2/qa/extras/chart2export.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit df51860c26dcc6cf8fa24d2795be05e903d22127 Author: Tor Lillqvist t...@collabora.com Date: Tue Nov 26 11:38:10 2013 +0200 Blind fix for sal_Int32/int confusion Change-Id: Ia052922ec323220b8785b1a156e5bc2fbf44c11b (cherry picked from commit 40e98f439f892af47b508968aaa25c2327b97868) Signed-off-by: Thorsten Behrens t...@documentfoundation.org diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index f46ab1a..88dc66e 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -177,7 +177,7 @@ void checkTrendlinesInChart(uno::Reference chart2::XChartDocument xChartDoc) CPPUNIT_ASSERT( xRegressionCurveContainer.is() ); Sequence Reference chart2::XRegressionCurve xRegressionCurveSequence = xRegressionCurveContainer-getRegressionCurves(); -CPPUNIT_ASSERT_EQUAL(3, xRegressionCurveSequence.getLength()); +CPPUNIT_ASSERT_EQUAL((sal_Int32) 3, xRegressionCurveSequence.getLength()); Referencechart2::XRegressionCurve xCurve; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 6 commits - vcl/source vcl/win winaccessibility/inc winaccessibility/Library_uacccom.mk winaccessibility/Library_winaccessibility.mk winacces
vcl/source/app/svdata.cxx | 33 --
vcl/win/source/window/salframe.cxx| 20 +++-
winaccessibility/Library_uacccom.mk |1
winaccessibility/Library_winaccessibility.mk |1
winaccessibility/inc/AccObjectManagerAgent.hxx|9 +
winaccessibility/inc/AccObjectWinManager.hxx |2
winaccessibility/inc/AccTopWindowListener.hxx |2
winaccessibility/inc/UAccCOMdllapi.h | 24
winaccessibility/inc/accHelper.hxx|4
winaccessibility/inc/g_msacc.hxx | 27 -
winaccessibility/source/UAccCOM/AccHypertext.cxx |6 -
winaccessibility/source/UAccCOM/AccTable.cxx | 10 --
winaccessibility/source/UAccCOM/EnumVariant.cxx |3
winaccessibility/source/UAccCOM/MAccessible.cxx | 68 --
winaccessibility/source/UAccCOM/UAccCOM.cxx | 13 +-
winaccessibility/source/UAccCOM/acccommon.h |6 +
winaccessibility/source/service/AccObject.cxx | 16 ---
winaccessibility/source/service/AccObjectManagerAgent.cxx | 22 ++--
winaccessibility/source/service/AccObjectWinManager.cxx | 33 --
winaccessibility/source/service/AccTopWindowListener.cxx |6 +
winaccessibility/source/service/msaaservice_impl.cxx | 41 +---
21 files changed, 187 insertions(+), 160 deletions(-)
New commits:
commit 36dd638c53188b7606484f31d6a4cd6170850083
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 29 23:03:37 2013 +0100
vcl: check if AT is running before loading the library
... which should result in faster startup if it's disabled.
Change-Id: I39774b0a56f186d08270c2f17b2b20a823f21dc2
(cherry picked from commit b44ed4c408d92f7a1a3f2390c056d518c137ddd0)
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 97116d4..aa58484 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -297,6 +297,9 @@ com::sun::star::uno::Any
AccessBridgeCurrentContext::getValueByName( const OUStr
return ret;
}
+#ifdef _WIN32
+bool HasAtHook();
+#endif
bool ImplInitAccessBridge(bool bAllowCancel, bool rCancelled)
{
@@ -324,25 +327,35 @@ bool ImplInitAccessBridge(bool bAllowCancel, bool
rCancelled)
{
css::uno::Reference XComponentContext
xContext(comphelper::getProcessComponentContext());
+#ifdef _WIN32
bool bTryIAcc2 = (
officecfg::Office::Common::Misc::ExperimentalMode::get( xContext )
!getenv (SAL_DISABLE_IACCESSIBLE2) );
if ( bTryIAcc2 ) // Windows only really
{
-try {
-pSVData-mxAccessBridge
-= css::accessibility::MSAAService::create(xContext);
-SAL_INFO(vcl, got IAccessible2 bridge);
-return true;
-} catch (css::uno::DeploymentException e) {
-SAL_INFO(
-vcl,
-got no IAccessible2 bridge, \ e.Message
- \, falling back to java);
+if (!HasAtHook() !getenv(SAL_FORCE_IACCESSIBLE2))
+{
+SAL_INFO(vcl, Apparently no running AT -
+not enabling IAccessible2 integration);
+}
+else
+{
+try {
+pSVData-mxAccessBridge
+=
css::accessibility::MSAAService::create(xContext);
+SAL_INFO(vcl, got IAccessible2 bridge);
+return true;
+} catch (css::uno::DeploymentException e) {
+SAL_INFO(
+vcl,
+got no IAccessible2 bridge, \ e.Message
+ \, falling back to java);
+}
}
}
else
SAL_INFO( vcl, IAccessible2 disabled, falling back to java
);
+#endif
css::uno::Reference XExtendedToolkit xToolkit =
css::uno::Reference XExtendedToolkit
(Application::GetVCLToolkit(), UNO_QUERY);
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 913d539..f7c3086 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -6257,4 +6257,14 @@ sal_Bool ImplWriteLastError( DWORD lastError, const char
*szApiCall )
// ---
+#ifdef _WIN32
+bool HasAtHook()
+{
+BOOL bIsRunning = FALSE;
+// pvParam must be BOOL
+return SystemParametersInfo(SPI_GETSCREENREADER, 0, bIsRunning, 0)
+ bIsRunning;
+}
+#endif
+
/* vim:set shiftwidth=4
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 --- Comment #26 from deepjungle.m...@gmail.com --- Regression bug 71714 EDITING: Small capitals are showed like capitals in editor from 4.1... -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 deepjungle.m...@gmail.com changed: What|Removed |Added Depends on||71714 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-4' - 2 commits - sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlexport/data/bnc837302.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 24 ++
sw/source/core/doc/docredln.cxx |3 --
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14
4 files changed, 39 insertions(+), 2 deletions(-)
New commits:
commit 7418a5ab18955a76b38512ef757c873d149d6c02
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 20 13:39:18 2013 +0100
Related bnc#837302: Don't introduce a redlined delete and the end of doc.
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: I5c3903a40b69867684707d33acbc92b1f80a93ec
Reviewed-on: https://gerrit.libreoffice.org/6898
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d7a5c8b..1372151 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -800,6 +800,17 @@ void Test::testBnc837302()
getRun(xParagraph, 3, AAA);
// interestingly the 'Insert' is set on the _previous_ run
CPPUNIT_ASSERT_EQUAL(OUString(Insert),
getPropertyOUString(getRun(xParagraph, 2), RedlineType));
+
+// make sure we don't introduce a redlined delete in the 2nd paragraph
+xParagraph = getParagraph(2);
+OUString aProperty;
+try
+{
+// throws when not present
+aProperty = getPropertyOUString(getRun(xParagraph, 1),
RedlineType);
+}
+catch (const beans::UnknownPropertyException) {}
+CPPUNIT_ASSERT_EQUAL(OUString(), aProperty);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ded106d..131559f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -318,7 +318,21 @@ void DomainMapper_Impl::RemoveLastParagraph( )
#else
if (xCursor-getString() == \r\n)
#endif
+{
+uno::Referencebeans::XPropertySet
xDocProps(GetTextDocument(), uno::UNO_QUERY);
+const OUString aRecordChanges(RecordChanges);
+uno::Any
aPreviousValue(xDocProps-getPropertyValue(aRecordChanges));
+
+// disable redlining for this operation, otherwise we might
+// end up with an unwanted recorded deletion
+xDocProps-setPropertyValue(aRecordChanges,
uno::Any(sal_False));
+
+// delete
xCursor-setString(OUString());
+
+// restore again
+xDocProps-setPropertyValue(aRecordChanges, aPreviousValue);
+}
}
}
catch( const uno::Exception )
commit 6837d5ef4120c964735ba1a5d4f47c5ba76d5c1c
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 20 11:45:39 2013 +0100
bnc#837302: Allow insertion of redlines with an empty author.
No idea why that was not allowed (since the initial import in 2000), we need
it for interoperability.
Signed-off-by: Andras Timar andras.ti...@collabora.com
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
sw/source/core/doc/docredln.cxx
Change-Id: I475fa63f9a4a3219a2b898b6f7d81e0603d32c18
Reviewed-on: https://gerrit.libreoffice.org/6897
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Andras Timar andras.ti...@collabora.com
diff --git a/sw/qa/extras/ooxmlexport/data/bnc837302.docx
b/sw/qa/extras/ooxmlexport/data/bnc837302.docx
new file mode 100644
index 000..9d0c0af
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/bnc837302.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index c1bb45e..d7a5c8b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -77,6 +77,7 @@ public:
void testBnc834035();
void testCp115();
void testFdo70812();
+void testBnc837302();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -138,6 +139,7 @@ void Test::run()
{bnc834035.odt, Test::testBnc834035},
{cp115.odt, Test::testCp115},
{fdo70812.docx, Test::testFdo70812},
+{bnc837302.docx, Test::testBnc837302},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -789,6 +791,17 @@ void Test::testFdo70812()
getParagraph(1, Sample pages document.);
}
+void Test::testBnc837302()
+{
+// The problem was that text with empty author was not inserted as a
redline
+uno::Referencetext::XTextRange xParagraph = getParagraph(1);
+
+//
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b050c1394821bc8a5a08fa20185fb229fc170b58 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Dec 3 17:59:28 2013 +0100 Updated core Project: translations 198adcf1e6f8f7b776b137915fd0617846192a40 diff --git a/translations b/translations index f2f8bd8..198adcf 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit f2f8bd88316331e0445a4326918990fd73d259f8 +Subproject commit 198adcf1e6f8f7b776b137915fd0617846192a40 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: 30 arguments in functions (?)
Olivier Hallot wrote: Although it is a limit almost never reached, ?!?!?!? My guess is that most people that need more than 30, modify things so that they can use : , instead. (maybe there is just no demand for that...) My guess is that most people that would want more than 30, do not know that they can squish them into the last parameter. As such, demand depends upon knowing that it is available. jonathon -- Sent from the eating establishment at the Far side of the Universe, at the begining of Time, and at the end of Space. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.0.0.beta2'
Tag 'libreoffice-4.2.0.0.beta2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-12-03 20:07 -0800 Tag libreoffice-4.2.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSnjnqAAoJEPQ0oe+v7q6jR0AQAJMFVKrFHjo6Z1/9oUfNqudq HNwq6aiWCGzE2wwWwO+BCBE1QNC3/EdE1OEsmzuyJjBmQYmYByiwNjN5tXPk57Y1 tiHmYDbn5HJe7cTUT0IgtojRV/KVr3y9dkrVCe+EmQFBI225ExL5cBwla8Pb+7TG ETzRp5ue0i6fvID8K1KWuQNHUcEzw2wq5G4i67aTzPTMgw8UEf6DmT8nvKtak5I+ 4V9ZryEnRKGQrS7Zm/S/+JxeQlmX63H+D9wapHg3QeL1KC1BUcms7gcJxGdGYelx y0MJS0YodGw2ntYM/fTo/+ukxI+U6R8QuFtAhOD1y2w2T326XqK3AGds7qEBWI1k pHdvRtKfmSZTWCVPbIiXyKHfB0Aw5/OB1ut6IMXgOjXFtefFwQs9VIWZqO4e0irN K9XIC0SA919oDfhF4c8PpIyRK34YXSqHN2pUKg+2J8ZoOwRrHfr8/6SkgkV02rVR OyxqWVMJeDLH9Rjr3gpa0biB2Dv+kL2K1MH76ajUv3b1Lw+I3quvnlIeMgk4eox0 Vr21qjp7gVRA4D/IoNl/at5pJ77wNrT+4RM1763Uw8S7C+fAkUAjq5aHlGPwXYDN 4wE+Yd2AKZ/J1UmeUlFBAE0ETaYtZERa3KjptfuH7uwmW28R3wgJtNx8w01n+iZC qutnUBkX2/Qr700+Wbx9 =UKDB -END PGP SIGNATURE- Changes since libreoffice-4-2-milestone-2-100: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.2.0.0.beta2'
Tag 'libreoffice-4.2.0.0.beta2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-12-03 20:06 -0800 Tag libreoffice-4.2.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSnjncAAoJEPQ0oe+v7q6j+iEQAJkj+hx3isd95bVmh07p6o7H /SrVWNn+JqheqV0cAx9K0/h/jz/qfX4nCqzGL6HuLoPwVmT1fsSxjXquM5zuq2yp y2rP7nnpV049CLdFcdYdSmJVA+4zfdIopSpcX59ZVlVa3WpKRcHR5q0krDTuwUmZ V6RlJo4LNEm4HmbrIpyruGx3xqEV/4KX8DXcKgsqiRhK74I01THpZRneEZPjbwOe 37FaznCv5i2R4623DdoQk7ctOo7DahCBPF3t2LfhUfm5RECz0KSAXzOFdGapOk8Z PtqCt+9l5iQk/3o8UsUcaBLk1UYoJoa/aWpY4BpeA4+/pkurJiRUKDxKcIqf+1Ga +PHBjGP4mW+ZhOudw4b3K0UCbXJ9+50uWYIXsqf7/ToZzvPr/JmHbrTyxUUIV++J Uzb08FrpkTTUs2rJb9lHyc6sHfzdp3JNQtJXUuH3luQtnAP0AGDKwMnhjVLngGjC yclwst7/LdrGX2uEcJHT20MlPrpOtqmSF9S7ok9KT6ZN7f3eXZP4qy3snaWArfjK Jy0SEDF5M1VVLIzI7Uq8fRzNtcWUGsIpnjM+HzFr1Rb4WNDmRAeUfLyxwiLEf2qS vz52VmPoRsn5F3R2CT+/+07YtjVZmBU6Qlo+VISJFOTu0NN20IL2d19bMVOZ5/O/ hqeECPJyp6D6ZFOHf4ML =aBbW -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-2: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.2.0.0.beta2'
Tag 'libreoffice-4.2.0.0.beta2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-12-03 20:07 -0800 Tag libreoffice-4.2.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSnjnmAAoJEPQ0oe+v7q6j4rwP/0vQ4ZtwUfEgYT61Catk9JLe nxBU3oBHmksI1IV5VYIDeozAzE23xLbapKEBLIBjlrFjg9o3Tw9bIhk+u6T3UThD IFxHOel6J3++iJK+7zJXltpyrzwNlLVe6QoqdKBb96uOt2eqxvjojuzP/UEzf9di 8aa+dcCT/i62dvURX3EqkJX6ZEKC3p7k3mbsxm6ZGSjqpchgSBdclMzplOsVa6xm krzq8Q1En83S8wxE1lGD4cjErq8/+FiaqbQBj+elRBCvf7+P79FkZxfpA4WKZB7F wfTrRctQRnUJJ0A0ypCcwLTvzioH5y53op9WL59dPohl7/QRKhHfFfxJFOXKAPTS ffiKTil5ZoCZellvymygu3TFhmpObyw6ggFTvuT++Ze3Gr294AhVMbkQ1+IYFXKe wkwdum7KPWA8jNb4SI7zOSDeAju3voEZLela2/CykkuuQNk8F7c2uUFZPG9pqgf1 ctPTv+5DStmuZiMTXzI8C834sS3pwxLXOoIP0QG35HTcPC5EcC/DPlU1c8OOhU4C NJMC6vWOjh69YU3vnpjHIWWmg3H+/L3C6V1QNYN9P6hggsjYZNPdHCOihfh506oT gbfQZdSDTrgiPutgGhXrTZDLt8vB1+mcX7fwxKmY+1E6Xe2JjRQxsklInTewNyDY c/yt9ymW5vJiRj4MF8+I =T/9K -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-5: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.2.0.0.beta2'
Tag 'libreoffice-4.2.0.0.beta2' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2013-12-03 20:06 -0800 Tag libreoffice-4.2.0.0.beta2 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSnjniAAoJEPQ0oe+v7q6jVn8P/iZNrreuetCo8QS4+ixzPqzn 99zvd9+UZzppV2JwPdD3ZnJYH+UNSaZfK7XQc1BL7mUKieQUktSC6IMzjOw2Xrkn Np/roNZm7fncQX6zPUspPv64SDzBrwZFoGhc2zyPWIW/B8Ik9Cuylcjsi1SihXIR YPGIOG4krQ6FNq6ODUH1pklLspbJr00QHhF7WalNXyDjF0VbzAf9/aHx6T/1UZB4 RcQRRKDWFRWzKqGkohPuglAtLqGWbUnWOuHEksC3iMNIxUSQ6l7+eBKw6uWGbVTy mx07YzNSYr6LYFAB8M5oOTjUPnj2oV8L67CgXZK6XOtAPwu9B3fAL2+Ts+CZLiXj 5HlFD0A1Qz66SQP8vKSEUOKVnLySOI3/P06n4tX+qJ49Of5jIkS7O0LfXVm11MwQ besW5R6e5QqFPAfK41XiQzqPb5A/IEqKh7K/Qv2IQzrFu93TxQoMxAssSW0C62m3 KdeKZ5RiZFUtFwQtGZflJ1lAAqnrvbdEPs6jPKBtUqJ2JcT8ll7mzxha+Pcud35F /GJpjsTOh1RabbGume5LztUdRzVsn6mOe7IDrIPcJogkj3brrFfV3kwEvWsliGhI AP+6XbGRxMsqj1trm2L+APnKpB+jiYg5pdeLhNrjFCl2EpXjMviBBlq5ozH6UDzn 5MVEzDR6Av9ZqJ1VZUj2 =e2sn -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-3: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||72279 --- Comment #27 from Cor Nouws c...@nouenoff.nl --- adding bug 72279 When you update the Index the words A) 1) and I) dissapear in LoDEV, in 4.1 works perfectly -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 5df95fc776ff5a92402a55d27b110df6ca906662 Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com Date: Tue Dec 3 21:08:35 2013 +0100 bump version to 4.2.0.0.beta2+ Change-Id: Ia17cc7277be17f3584117e5a2deeb0f07505599d diff --git a/configure.ac b/configure.ac index 244fe05..176a7c8 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[4.2.0.0.beta1+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[4.2.0.0.beta2+],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua vcl/coretext vcl/inc vcl/source vcl/win
vcl/aqua/source/gdi/atsui/salatslayout.cxx |2 +-
vcl/coretext/ctlayout.cxx |2 +-
vcl/inc/graphite_layout.hxx|2 +-
vcl/inc/graphite_serverfont.hxx|3 ++-
vcl/inc/sallayout.hxx |4 ++--
vcl/inc/textlayout.hxx |2 +-
vcl/source/gdi/textlayout.cxx |2 +-
vcl/win/source/gdi/winlayout.cxx |6 +++---
8 files changed, 12 insertions(+), 11 deletions(-)
New commits:
commit c4d79527ce3a0d9b466ea291a1932bcd66474827
Author: Michael Stahl mst...@redhat.com
Date: Tue Dec 3 21:09:43 2013 +0100
vcl: fix sal_Int32 GetTextBreak harder
Change-Id: I75181d12ca8b883055e5314504633af38b5e49c7
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index 801af6a..59826e9 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -53,7 +53,7 @@ public:
virtual longGetTextWidth() const;
virtual longFillDXArray( sal_Int32* pDXArray ) const;
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor
) const;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const SAL_OVERRIDE;
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
virtual boolGetBoundRect( SalGraphics, Rectangle ) const;
diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index b6d2c16..56d8696 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -38,7 +38,7 @@ public:
virtual longGetTextWidth() const;
virtual longFillDXArray( sal_Int32* pDXArray ) const;
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra, int nFactor
) const;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const SAL_OVERRIDE;
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
virtual boolGetGlyphOutlines( SalGraphics, PolyPolyVector ) const;
virtual boolGetBoundRect( SalGraphics, Rectangle ) const;
diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index 434d6f6..30fe111 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -119,7 +119,7 @@ public:
virtual void AdjustLayout( ImplLayoutArgs ); // adjusting positions
// methods using string indexing
-virtual int GetTextBreak( long nMaxWidth, long nCharExtra=0, int
nFactor=1 ) const;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra=0, int
nFactor=1) const SAL_OVERRIDE;
virtual long FillDXArray( sal_Int32* pDXArray ) const;
virtual void ApplyDXArray(ImplLayoutArgs rArgs, std::vectorint
rDeltaWidth);
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index e21590a..df205d5 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -68,7 +68,8 @@ public:
};
virtual longGetTextWidth() const {
return maImpl.GetTextWidth(); }
virtual longFillDXArray( sal_Int32* dxa ) const {
return maImpl.FillDXArray(dxa); }
-virtual int GetTextBreak( long mw, long ce, int f ) const {
return maImpl.GetTextBreak(mw, ce, f); }
+virtual sal_Int32 GetTextBreak(long mw, long ce, int f) const
SAL_OVERRIDE
+{ return maImpl.GetTextBreak(mw, ce, f); }
virtual voidGetCaretPositions( int as, sal_Int32* cxa ) const {
maImpl.GetCaretPositions(as, cxa); }
// used by display layers
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 561c8f9..c4a1d4c 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -263,7 +263,7 @@ class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout
{
public:
virtual voidDrawText( SalGraphics ) const;
-virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const SAL_OVERRIDE;
virtual longFillDXArray( sal_Int32* pDXArray ) const;
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdxAry, Point
rPos,
@@ -359,7 +359,7 @@ public:
// used by upper layers
virtual longGetTextWidth() const;
virtual longFillDXArray( sal_Int32* pDXArray ) const;
-virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const;
+virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int
nFactor) const SAL_OVERRIDE;
virtual voidGetCaretPositions( int nArraySize, sal_Int32* pCaretXArray
) const;
// used by display layers
diff --git a/vcl/inc/textlayout.hxx b/vcl/inc/textlayout.hxx
index d16d249..14662c3 100644
---
[Libreoffice-commits] core.git: vcl/win
vcl/win/source/gdi/winlayout.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 37d9edc4a7da90da502e62e2adde67396d049bae Author: Michael Stahl mst...@redhat.com Date: Tue Dec 3 21:20:33 2013 +0100 vcl: d'oh /me still to dumb to type Change-Id: Ie8a5b7493c08a0a63f2791d3cfb00b490609eb7c diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index d06a060..e53daff 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -158,7 +158,7 @@ public: const PhysicalFontFace** pFallbackFonts = NULL ) const; virtual longFillDXArray( long* pDXArray ) const; -virtual salInt32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; +virtual sal_Int32 GetTextBreak(long nMaxWidth, long nCharExtra, int nFactor) const SAL_OVERRIDE; virtual voidGetCaretPositions( int nArraySize, long* pCaretXArray ) const; // for glyph+font+script fallback ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |6 -- 1 file changed, 6 deletions(-) New commits: commit 7eb3e0b3892c90a5a2fbaaeaf7693bffeb80a360 Author: Matúš Kukan matus.ku...@collabora.com Date: Tue Dec 3 12:43:39 2013 +0100 Kill --with-check-jobs as it is ignored anyway. since 4eebd65858655eef3f39e40ecbe74c505f6b4688 Change-Id: Ia754906e0de06690e43f2b1063f315659e50da3e diff --git a/configure.ac b/configure.ac index dce1142..3f9b913 100644 --- a/configure.ac +++ b/configure.ac @@ -2031,12 +2031,6 @@ AC_ARG_WITH(parallelism, 10.]), ,) -AC_ARG_WITH(check-jobs, -AS_HELP_STRING([--with-check-jobs], -[Maximum number of jobs that will be issued at the same time during 'make subsequenttest'. - Default value is the same as 'parallelism'. Useful because the subsequent tests are very lightweight.]), -,) - AC_ARG_WITH(all-tarballs, AS_HELP_STRING([--with-all-tarballs], [Download all external tarballs unconditionally])) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/formulacell.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit bfd1909c87d0d645f1bbb74a142172ecc15100e8 Author: Eike Rathke er...@redhat.com Date: Tue Dec 3 22:07:00 2013 +0100 remove and reinsert formula cell from/to tree during CompileXML ... to keep the count updated, which actually silences the dbgutil warning of ScDocument::RemoveFromFormulaTree() when loading .ods Change-Id: I8453d688ca673a47fee15c84478262e1da53e408 diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 8c3471e..c15710f 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -989,6 +989,11 @@ void ScFormulaCell::CompileXML( ScProgress rProgress ) return ; } +// Compilation changes RPN count, remove and reinsert to FormulaTree if it +// was in to update its count. +bool bWasInFormulaTree = pDocument-IsInFormulaTree( this); +if (bWasInFormulaTree) +pDocument-RemoveFromFormulaTree( this); ScCompiler aComp( pDocument, aPos, *pCode); aComp.SetGrammar(eTempGrammar); OUString aFormula, aFormulaNmsp; @@ -1039,6 +1044,8 @@ void ScFormulaCell::CompileXML( ScProgress rProgress ) SetDirtyVar(); pDocument-PutInFormulaTree(this); } +else if (bWasInFormulaTree) +pDocument-PutInFormulaTree(this); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/core/data/formulacell.cxx |7 +++ 1 file changed, 7 insertions(+) New commits: commit 90102d0832b2bc173b09188604aa311f17c19bbe Author: Eike Rathke er...@redhat.com Date: Tue Dec 3 22:07:00 2013 +0100 remove and reinsert formula cell from/to tree during CompileXML ... to keep the count updated, which actually silences the dbgutil warning of ScDocument::RemoveFromFormulaTree() when loading .ods Change-Id: I8453d688ca673a47fee15c84478262e1da53e408 (cherry picked from commit bfd1909c87d0d645f1bbb74a142172ecc15100e8) diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 6144c09..1451f02 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -991,6 +991,11 @@ void ScFormulaCell::CompileXML( ScProgress rProgress ) return ; } +// Compilation changes RPN count, remove and reinsert to FormulaTree if it +// was in to update its count. +bool bWasInFormulaTree = pDocument-IsInFormulaTree( this); +if (bWasInFormulaTree) +pDocument-RemoveFromFormulaTree( this); ScCompiler aComp( pDocument, aPos, *pCode); aComp.SetGrammar(eTempGrammar); OUString aFormula, aFormulaNmsp; @@ -1041,6 +1046,8 @@ void ScFormulaCell::CompileXML( ScProgress rProgress ) SetDirtyVar(); pDocument-PutInFormulaTree(this); } +else if (bWasInFormulaTree) +pDocument-PutInFormulaTree(this); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Cor Nouws c...@nouenoff.nl changed: What|Removed |Added Depends on||72287 --- Comment #28 from Cor Nouws c...@nouenoff.nl --- adding bug 72287 [TEMPLATE MANGER] / [UI] selecting available templates not possible below the second row in the list -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Eike Rathke er...@redhat.com changed: What|Removed |Added Depends on||72288 --- Comment #29 from Eike Rathke er...@redhat.com --- Adding regression bug 72288, matrix case insensitive string comparisons don't work anymore. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: locking foo ...
On 03/12/13 22:33, Michael Meeks wrote: Hi Michael, On Tue, 2013-12-03 at 17:03 +0100, Michael Stahl wrote: also: the hypothesis that duplicating the state in CMAccessible prevents locking SolarMutex in COM calls is not entirely true: for example CMAccessible::get_accChildCount retrieves it from the XAccessibleContext (... which it retrieves from m_xAccessible, ignoring m_xContext?). similar code handles CHILDID_SELF cases throughout. Good to know =) [ by the way i haven't done anything about the state duplication across classes yet - just cleaned up cases where class had 2 members pointing to the same thing. ] Ok; fair enough. there are basically 2 different interfaces in CMAccessible: the IAccessible2 ones will only be called from outside, while the internal ones will only be called from UNO event listeners. the internal ones don't need any locking since the UNO event listeners have to do that already. Right - so I was overlooking the fact that native C++ calls know nothing about apartments and thus we can circumvent all that fluff and not care anything about it =) Indeed - I think we should be able to avoid CoCreateInstance completely: http://msdn.microsoft.com/en-us/library/windows/desktop/ff485840%28v=vs.85%29.aspx Suggests that just deriving from and working with IUnknown should be acceptable rather than going through the CoCreateInstance over-complexity... i think probably it's better in the current situation not to have the components live in the main thread STA in the first place, and hope that just creating them with direct C++ new practically does that; what is missing currently is the locking when called via COM. Sure - if they are running in the MTA, they can just wait for the SolarMutex - surely ? - we cannot assume that calls to the UNO event listener are made with SolarMutex locked or not locked (maybe there are XAccessible impl.s that don't use SolarMutex, or they release it prior to calling listeners?) - it has to work for both possibilities Really ? surely all XAccessible foo in practice is called with the SolarMutex held =) I'd be -amazed- if it was even safe to release it at that granularity ... so that suggests using SolarMutex. Right. there is also the mysterious if (!IsInMainThread()) check in AccObjectWinManager::NotifyAccEvent() - not sure if that is supposed to Yes - superstition is a wonderful thing =) so in summary it looks to me like putting SolarMutex guards in the public CMAccessible methods is the way to go. Agreed =) ok, will do that some time... and now for another fun problem i've seen: it's possible to deadlock between the Win32 message handling in the main thread and deleting VCL Window on other threads. the ~Window destroys the native Win32 window by sending a Win32 message to it, and the Win32 window apparently is tied to a thread such that that message send blocks until the main thread gets the message and acts on it. Ok - I was also appalled by the void WinSalInstance::Yieldimplementation in the windows backend there too which is completely bogus. It basically assumes that the main thread (if not now running) will at some stage run - if we hang around a bit - and as such will be able to process a SAL_MSG_THREADYIELD message - which may well not work at all. Then again - that's a bit intractable; we have to destroy windows on the thread there were created on (unfortunately), and several other types of operation have to be done there - there is about a dozen of them in vcl/win. Each of these mandates a ~synchronous call to the 'main' thread succeeding during them. so what can happen is that some other thread locks SolarMutex, deletes a VCL Window, while main thread is in its message handling and tries to lock SolarMutex itself, e.g. while getting a TopWindow via MSAA (but there are many other messages which require locking SolarMutex); so this is mostly a pre-existing problem and i'm not sure if anything can easily be done about it; PostUserEvent apparently calls PostMessageW too so likely has the same problem. I guess it's pretty clear that we must never cause the main thread to stop executing while another thread wants to do something involving VCL. Which is pretty much the same as saying that the Solar Mutex is the world's most appallingly bad joke. It makes you -think- you can do things on other threads (and under Unix/gtk+ you even can ;-) but when push comes to shove - if the main thread is not idling in the main-loop, ~nothing is going to work =) What can we do about that ? Well - we could special-case the SolarMutex on Windows - making it not a CriticalSection but a true Windows 'mutex' that we can include in a 'WaitForMultipleObjects' - along with the rest of the things the mainloop wants. Or we could associate a condition with it that
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/scmatrix.hxx|2 +-
sc/source/core/data/validat.cxx|2 +-
sc/source/core/tool/interpr4.cxx |2 +-
sc/source/filter/excel/xeformula.cxx |6 +++---
sc/source/filter/excel/xehelper.cxx|2 +-
sc/source/filter/excel/xilink.cxx |4 ++--
sc/source/filter/xml/XMLExportDDELinks.cxx |2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 882665d821a2fc705b7ae03372c2ae7593028210
Author: Eike Rathke er...@redhat.com
Date: Wed Dec 4 00:29:29 2013 +0100
resolved fdo#72288 made case insensitive matrix string query work again
The SharedString stored at ScQueryEntry::Item was constructed from an
OUString passed from ScMatrixValue::GetString() so
rItem.maString.getDataIgnoreCase() in QueryEvaluator::compareByString()
was NULL and never evaluated equal. Made ScMatrixValue::GetString()
return a SharedString instead.
Change-Id: I473d5724dfb97707fea58e6b72b1396c049b79c8
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index f2508a6..93105dd 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -54,7 +54,7 @@ struct ScMatrixValue
ScMatValType nType;
/// Only valid if ScMatrix methods indicate so!
-OUString GetString() const { return aStr.getString(); }
+svl::SharedString GetString() const { return aStr; }
/// Only valid if ScMatrix methods indicate that this is no string!
sal_uInt16 GetError() const { return GetDoubleErrorValue( fVal); }
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 0adc60a..b7e51ba 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -731,7 +731,7 @@ bool ScValidationData::GetSelectionFromFormula(
// strings and empties
if( ScMatrix::IsNonValueType( nMatVal.nType ) )
{
-aValStr = nMatVal.GetString();
+aValStr = nMatVal.GetString().getString();
if( NULL != pStrings )
pEntry = new ScTypedStrData( aValStr, 0.0,
ScTypedStrData::Standard);
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index b341eaa..13c6b11 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1855,7 +1855,7 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef xMat,
short rRetTypeExpr, sal_
}
else
{
-OUString aStr( nMatVal.GetString());
+svl::SharedString aStr( nMatVal.GetString());
FormulaTokenRef xRes = new FormulaStringToken( aStr);
PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
rRetTypeExpr = NUMBERFORMAT_TEXT;
diff --git a/sc/source/filter/excel/xeformula.cxx
b/sc/source/filter/excel/xeformula.cxx
index ba02aef..19040ff 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1319,8 +1319,8 @@ void XclExpFmlaCompImpl::ProcessMatrix( const
XclExpScToken rTokData )
}
else// string or empty
{
-const OUString rStr = nMatVal.GetString();
-if( rStr.isEmpty() )
+const OUString aStr( nMatVal.GetString().getString());
+if( aStr.isEmpty() )
{
AppendExt( EXC_CACHEDVAL_EMPTY );
AppendExt( 0, 8 );
@@ -1328,7 +1328,7 @@ void XclExpFmlaCompImpl::ProcessMatrix( const
XclExpScToken rTokData )
else
{
AppendExt( EXC_CACHEDVAL_STRING );
-AppendExt( rStr );
+AppendExt( aStr );
}
}
}
diff --git a/sc/source/filter/excel/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index c64006a..2e6b4cf 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -1034,7 +1034,7 @@ void XclExpCachedMatrix::Save( XclExpStream rStrm ) const
}
else if( ScMatrix::IsNonValueType( nMatVal.nType ) )
{
-XclExpString aStr( nMatVal.GetString(), EXC_STR_DEFAULT );
+XclExpString aStr( nMatVal.GetString().getString(),
EXC_STR_DEFAULT );
rStrm.SetSliceSize( 6 );
rStrm EXC_CACHEDVAL_STRING aStr;
}
diff --git a/sc/source/filter/excel/xilink.cxx
b/sc/source/filter/excel/xilink.cxx
index 3a687eb..a33da23 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -517,8 +517,8 @@ bool XclImpExtName::CreateOleData(ScDocument rDoc, const
OUString rUrl,
break;
case SC_MATVAL_STRING:
{
-const OUString rStr = aVal.GetString();
-
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 Bug 65675 depends on bug 72288, which changed state. Bug 72288 Summary: EDITING: MATCH returns #N/A with match_type =0 in array formula with strings https://bugs.freedesktop.org/show_bug.cgi?id=72288 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/scmatrix.hxx|2 +-
sc/source/core/data/validat.cxx|2 +-
sc/source/core/tool/interpr4.cxx |2 +-
sc/source/filter/excel/xeformula.cxx |6 +++---
sc/source/filter/excel/xehelper.cxx|2 +-
sc/source/filter/excel/xilink.cxx |4 ++--
sc/source/filter/xml/XMLExportDDELinks.cxx |2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 507afd9531a89e5c8ec07514a8f741ce21a0b78d
Author: Eike Rathke er...@redhat.com
Date: Wed Dec 4 00:29:29 2013 +0100
resolved fdo#72288 made case insensitive matrix string query work again
The SharedString stored at ScQueryEntry::Item was constructed from an
OUString passed from ScMatrixValue::GetString() so
rItem.maString.getDataIgnoreCase() in QueryEvaluator::compareByString()
was NULL and never evaluated equal. Made ScMatrixValue::GetString()
return a SharedString instead.
Change-Id: I473d5724dfb97707fea58e6b72b1396c049b79c8
(cherry picked from commit 882665d821a2fc705b7ae03372c2ae7593028210)
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index f2508a6..93105dd 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -54,7 +54,7 @@ struct ScMatrixValue
ScMatValType nType;
/// Only valid if ScMatrix methods indicate so!
-OUString GetString() const { return aStr.getString(); }
+svl::SharedString GetString() const { return aStr; }
/// Only valid if ScMatrix methods indicate that this is no string!
sal_uInt16 GetError() const { return GetDoubleErrorValue( fVal); }
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 0adc60a..b7e51ba 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -731,7 +731,7 @@ bool ScValidationData::GetSelectionFromFormula(
// strings and empties
if( ScMatrix::IsNonValueType( nMatVal.nType ) )
{
-aValStr = nMatVal.GetString();
+aValStr = nMatVal.GetString().getString();
if( NULL != pStrings )
pEntry = new ScTypedStrData( aValStr, 0.0,
ScTypedStrData::Standard);
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index c70fdf4..6983d3e 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -1855,7 +1855,7 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef xMat,
short rRetTypeExpr, sal_
}
else
{
-OUString aStr( nMatVal.GetString());
+svl::SharedString aStr( nMatVal.GetString());
FormulaTokenRef xRes = new FormulaStringToken( aStr);
PushTempToken( new ScMatrixCellResultToken( xMat, xRes.get()));
rRetTypeExpr = NUMBERFORMAT_TEXT;
diff --git a/sc/source/filter/excel/xeformula.cxx
b/sc/source/filter/excel/xeformula.cxx
index ba02aef..19040ff 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1319,8 +1319,8 @@ void XclExpFmlaCompImpl::ProcessMatrix( const
XclExpScToken rTokData )
}
else// string or empty
{
-const OUString rStr = nMatVal.GetString();
-if( rStr.isEmpty() )
+const OUString aStr( nMatVal.GetString().getString());
+if( aStr.isEmpty() )
{
AppendExt( EXC_CACHEDVAL_EMPTY );
AppendExt( 0, 8 );
@@ -1328,7 +1328,7 @@ void XclExpFmlaCompImpl::ProcessMatrix( const
XclExpScToken rTokData )
else
{
AppendExt( EXC_CACHEDVAL_STRING );
-AppendExt( rStr );
+AppendExt( aStr );
}
}
}
diff --git a/sc/source/filter/excel/xehelper.cxx
b/sc/source/filter/excel/xehelper.cxx
index c64006a..2e6b4cf 100644
--- a/sc/source/filter/excel/xehelper.cxx
+++ b/sc/source/filter/excel/xehelper.cxx
@@ -1034,7 +1034,7 @@ void XclExpCachedMatrix::Save( XclExpStream rStrm ) const
}
else if( ScMatrix::IsNonValueType( nMatVal.nType ) )
{
-XclExpString aStr( nMatVal.GetString(), EXC_STR_DEFAULT );
+XclExpString aStr( nMatVal.GetString().getString(),
EXC_STR_DEFAULT );
rStrm.SetSliceSize( 6 );
rStrm EXC_CACHEDVAL_STRING aStr;
}
diff --git a/sc/source/filter/excel/xilink.cxx
b/sc/source/filter/excel/xilink.cxx
index 3a687eb..a33da23 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -517,8 +517,8 @@ bool XclImpExtName::CreateOleData(ScDocument rDoc, const
OUString rUrl,
break;
case SC_MATVAL_STRING:
Grupo de desarrollo (New Group) de extensiones para LibreOffice creado en Facebook
Hola, hemos creado un *grupo de desarrollo de extensiones para LibreOffice en Facebook*. El objetivo del grupo es traer a la mayor cantidad de programadores posible, para *ampliar conocimientos y fomentar el espíritu de colaboración y aprendizaje mutuo*. Aunque el grupo es de habla Hispana, aceptamos también el Inglés como idioma de comunicación. Deseamos que LibreOffice sea la única suite ofimática, y que se imponga al Office de Microsoft. Pensamos que la creación de extensiones es fundamental para hacer crecer a LibreOffice. *Te esperamos en nuestro grupo, y deseamos que traigas cuanta más gente posible mejor.* *PUEDES ACCEDER A NUESTRO GRUPO AQUI:* https://www.facebook.com/groups/programadoreslibreoffice Hello, we have created an *extensions development group at Facebook for LibreOffice*. The group's goal is to bring as much quantity as possible of programmers, to *increase the **mutual knowledge and boost the collaboration spirit*. Although it is a Hispanic language group, we accept also English as communication language. We wish LibreOffice be the only office suite, and it shows its leadership against Microsoft Office. We think the extensions creation it's important to make grow LibreOffice. *We wait you in our group, and we wish you bring as much people possible*. *YOU CAN ACCESS OUR GROUP HERE:* https://www.facebook.com/groups/programadoreslibreoffice ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for core on 2013-12-04
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things ! + fdo#39956 Delete JAB in https://gerrit.libreoffice.org/6819 from David Ostrovsky about module accessibility, build, desktop, include, offapi, padmin, postprocess, scp2, vcl, winaccessibility + Zip .ui translations per UIConfig target. in https://gerrit.libreoffice.org/6915 from Matúš Kukan about module include, solenv, vcl, xmlreader + sw/export docx: add unit test for document with header and section(s) in https://gerrit.libreoffice.org/6249 from Pierre-Eric Pelloux-Prayer about module sw + Export redline 'formatting changes' back to DOCX in https://gerrit.libreoffice.org/6909 from Adam CloudOn about module sw + DOCX Import of 'run formatting track changes' in https://gerrit.libreoffice.org/6908 from Adam CloudOn about module writerfilter + fdo#40314 Free value of intercept for trend line in https://gerrit.libreoffice.org/6904 from Laurent BP about module chart2 End of freshness * Merged changes on master for project core changed in the last 25 hours: + fdo#70797 fix incorrect argument handling of CHISQ.DIST in https://gerrit.libreoffice.org/6914 from Winfried Donkers + Revert fdo#67862: Add greek symbols to docking window in https://gerrit.libreoffice.org/6884 from Thomas Arnhold + convert FN_PARAM_MOVE_COUNT from SfxInt16 to SfxInt32 in https://gerrit.libreoffice.org/6896 from Noel Grandin * Abandoned changes on master for project core changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: + fdo#69552 make calc functions CEILING and FLOOR comply with ODF1.2 in https://gerrit.libreoffice.org/6767 from Winfried Donkers + Code clean-up/consolidation task. in https://gerrit.libreoffice.org/5926 from Vishv Brahmbhatt + fdo#69407 in https://gerrit.libreoffice.org/6316 from matthieu gay + fix for exporting of text watermark to DOCX in https://gerrit.libreoffice.org/5568 from Adam CloudOn + WIP: fdo#33980 Preserve selection across all slide sorters. in https://gerrit.libreoffice.org/6633 from Andrzej J.R. Hunt + fdo#71043 - Use STACK lint tool to clean code in https://gerrit.libreoffice.org/6529 from José Guilherme Vanz + new cell-border handling in calc in https://gerrit.libreoffice.org/6093 from Viktor Varga + Increase number of remembered recent documents from 10 to 25 in https://gerrit.libreoffice.org/6101 from Krisztian Pinter + startcenter: Make SC open faster by timeouting thumbnails in https://gerrit.libreoffice.org/6102 from Krisztian Pinter + Simplify oslThreadIdentifier on Linux 32. in https://gerrit.libreoffice.org/5553 from Arnaud Versini + Dynamically align toolbars in LibreOffice in https://gerrit.libreoffice.org/5655 from Prashant Pandey + fdo#36791 : fix for import of greeting card in https://gerrit.libreoffice.org/4240 from Adam CloudOn + more debug logs, extra debug layer, file is not used in p3k in https://gerrit.libreoffice.org/5267 from James Michael Dupont + Positional Tab additions in https://gerrit.libreoffice.org/5387 from Adam CloudOn + fdo#64817 : fix for rectangle with image fill in https://gerrit.libreoffice.org/4718 from Adam CloudOn Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice Gerrit News for dev-tools on 2013-12-04
Moin! * Open changes on master for project dev-tools changed in the last 25 hours: None * Merged changes on master for project dev-tools changed in the last 25 hours: + fdo#71911 : show the top level dir of a new change in https://gerrit.libreoffice.org/6793 from Mathias M * Abandoned changes on master for project dev-tools changed in the last 25 hours: None * Open changes needing tweaks, but being untouched for more than a week: None Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
deadlock writing to stdout in remotely controlled soffice
Hey,
so I experience some strange deadlocks recently with quite interesting
backlogs.
Did anyone of you see something similar recently? Attached is a backtrace
for all threads and I wonder why thread 2 deadlocks. My build on that
machine is about two weeks old and it seems like I'm able to reproduce the
problem each time I hit the same file.
Regards,
Markus
Thread 7 (Thread 0x7fb87d0a6700 (LWP 22325)):
#0 0x00352dc0b912 in pthread_cond_timedwait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0
#1 0x7fb88e85b301 in rtl_cache_wsupdate_wait (seconds=10) at /home/buildslave/source/libo-core/sal/rtl/alloc_cache.cxx:1377
#2 0x7fb88e85b4e9 in rtl_cache_wsupdate_all (arg=0xa) at /home/buildslave/source/libo-core/sal/rtl/alloc_cache.cxx:1518
#3 0x00352dc07c53 in start_thread () from /lib64/libpthread.so.0
#4 0x00352d4f5dbd in clone () from /lib64/libc.so.6
Thread 6 (Thread 0x7fb87afcb700 (LWP 22328)):
#0 0x00352d4f6a6d in accept () from /lib64/libc.so.6
#1 0x7fb88e842f88 in osl_acceptPipe (pPipe=0x10ff720) at /home/buildslave/source/libo-core/sal/osl/unx/pipe.c:443
#2 0x7fb88e59de9e in osl::Pipe::accept (this=0x10fcdb8, Connection=...) at /home/buildslave/source/libo-core/include/osl/pipe.hxx:132
#3 0x7fb88e59b5d1 in desktop::OfficeIPCThread::execute (this=0x10fcd90) at /home/buildslave/source/libo-core/desktop/source/app/officeipcthread.cxx:679
#4 0x7fb88d3729c4 in salhelper::Thread::run (this=0x10fcd90) at /home/buildslave/source/libo-core/salhelper/source/thread.cxx:40
#5 0x7fb88d372d8d in osl::threadFunc (param=0x10fcda0) at /home/buildslave/source/libo-core/include/osl/thread.hxx:187
#6 0x7fb88e84c2e7 in osl_thread_start_Impl (pData=0x1100740) at /home/buildslave/source/libo-core/sal/osl/unx/thread.c:236
#7 0x00352dc07c53 in start_thread () from /lib64/libpthread.so.0
#8 0x00352d4f5dbd in clone () from /lib64/libc.so.6
Thread 5 (Thread 0x7fb87b9ea700 (LWP 22329)):
#0 0x00352d4f6a6d in accept () from /lib64/libc.so.6
#1 0x7fb88e842f88 in osl_acceptPipe (pPipe=0x12164f0) at /home/buildslave/source/libo-core/sal/osl/unx/pipe.c:443
#2 0x7fb87a34ff72 in osl::Pipe::accept (this=0x7fb87b9e98b0, Connection=...) at /home/buildslave/source/libo-core/include/osl/pipe.hxx:132
#3 0x7fb87a34f7cf in io_acceptor::PipeAcceptor::accept (this=0x11292a0) at /home/buildslave/source/libo-core/io/source/acceptor/acc_pipe.cxx:181
#4 0x7fb87a3587fe in io_acceptor::OAcceptor::accept (this=0x1101a70, sConnectionDescription=pipe,name=pytest188aabc4-5ca6-11e3-a31f-52540097aac2)
at /home/buildslave/source/libo-core/io/source/acceptor/acceptor.cxx:238
#5 0x7fb87a5b6847 in desktop::Acceptor::run (this=0x7b3d30) at /home/buildslave/source/libo-core/desktop/source/offacc/acceptor.cxx:100
#6 0x7fb87a5b622b in desktop::offacc_workerfunc (acc=0x7b3d30) at /home/buildslave/source/libo-core/desktop/source/offacc/acceptor.cxx:41
#7 0x7fb88e84c2e7 in osl_thread_start_Impl (pData=0x1105ee0) at /home/buildslave/source/libo-core/sal/osl/unx/thread.c:236
#8 0x00352dc07c53 in start_thread () from /lib64/libpthread.so.0
#9 0x00352d4f5dbd in clone () from /lib64/libc.so.6
Thread 4 (Thread 0x7fb8782fe700 (LWP 22331)):
#0 0x00352dc0b565 in pthread_cond_wait@@GLIBC_2.3.2 () from /lib64/libpthread.so.0
#1 0x7fb88e885266 in osl_waitCondition (Condition=0x121b100, pTimeout=0x0) at /home/buildslave/source/libo-core/sal/osl/unx/conditn.cxx:275
#2 0x7fb87a0be1da in osl::Condition::wait (this=0x121d1c0, pTimeout=0x0) at /home/buildslave/source/libo-core/include/osl/conditn.hxx:75
#3 0x7fb87a0f8985 in binaryurp::Writer::execute (this=0x121cff0) at /home/buildslave/source/libo-core/binaryurp/source/writer.cxx:140
#4 0x7fb88d3729c4 in salhelper::Thread::run (this=0x121cff0) at /home/buildslave/source/libo-core/salhelper/source/thread.cxx:40
#5 0x7fb88d372d8d in osl::threadFunc (param=0x121d000) at /home/buildslave/source/libo-core/include/osl/thread.hxx:187
#6 0x7fb88e84c2e7 in osl_thread_start_Impl (pData=0x121d4a0) at /home/buildslave/source/libo-core/sal/osl/unx/thread.c:236
#7 0x00352dc07c53 in start_thread () from /lib64/libpthread.so.0
#8 0x00352d4f5dbd in clone () from /lib64/libc.so.6
Thread 3 (Thread 0x7fb877afd700 (LWP 22333)):
#0 0x00352d4f6c6b in recv () from /lib64/libc.so.6
#1 0x7fb88e843195 in osl_receivePipe (pPipe=0x1217510, pBuffer=0x11633e8, BytesToRead=8) at /home/buildslave/source/libo-core/sal/osl/unx/pipe.c:506
#2 0x7fb88e8433eb in osl_readPipe (pPipe=0x1217510, pBuffer=0x11633e8, n=8) at /home/buildslave/source/libo-core/sal/osl/unx/pipe.c:590
#3 0x7fb87a350090 in osl::StreamPipe::read (this=0x1121a30, pBuffer=0x11633e8, n=8) at /home/buildslave/source/libo-core/include/osl/pipe.hxx:182
#4 0x7fb87a34f1f4 in io_acceptor::PipeConnection::read (this=0x1121a00, aReadBytes=uno::Sequence of length 8 = {...}, nBytesToRead=8) at
Re: deadlock writing to stdout in remotely controlled soffice
On 2013-12-04 08:13, Markus Mohrhard wrote: so I experience some strange deadlocks recently with quite interesting backlogs. These look very much like the SalYield issue that Michael Stahl / Michael Meeks / Stephen Bergman have been discussing recently on the mailing list. e.g. http://nabble.documentfoundation.org/Re-locking-foo-td4086346.html http://nabble.documentfoundation.org/threaded-progress-bar-amp-deadlock-td4086260.html http://nabble.documentfoundation.org/improving-threading-osl-Condition-abstraction-td4085441.html Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 7 commits - connectivity/source formula/source include/tools linguistic/workben sw/inc sw/source ucb/workben vcl/workben
connectivity/source/inc/file/FStatement.hxx |2
formula/source/ui/dlg/formula.cxx | 162 ++--
include/tools/string.hxx|1
linguistic/workben/sspellimp.cxx| 12 +-
sw/inc/splargs.hxx | 39 +++---
sw/source/core/doc/docedt.cxx |2
sw/source/core/doc/doctxm.cxx | 18 +--
sw/source/core/text/txthyph.cxx |6 -
sw/source/core/txtnode/txtedt.cxx |2
ucb/workben/ucb/ucbdemo.cxx | 15 +-
vcl/workben/svpclient.cxx |6 -
11 files changed, 129 insertions(+), 136 deletions(-)
New commits:
commit d6de313b043154e70a84c0fc29cbae94fe7541b1
Author: Noel Grandin n...@peralex.com
Date: Tue Dec 3 14:40:22 2013 +0200
STRING_NOTFOUND is no more
Change-Id: Ia8937e07786c497c5cb8485fa161fd68231c17f8
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 0c4571d..76e271e 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -26,7 +26,6 @@
* THIS CODE IS DEPRECATED. DO NOT USE IT IN ANY NEW CODE.
**/
-#define STRING_NOTFOUND((xub_StrLen)0x)
#define STRING_LEN ((xub_StrLen)0x)
#define STRING_MAXLEN ((xub_StrLen)0x)
commit eb56848029a3b26a9d4f07a55364749e9e7d8339
Author: Noel Grandin n...@peralex.com
Date: Tue Dec 3 14:39:34 2013 +0200
convert SwInterHyphInfo from xub_StrLen-sal_Int32
Change-Id: Ie5a877fb90c360506f05d0417524966e137e5d77
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 45fc34d..0210ad5 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -126,43 +126,40 @@ struct SwSpellArgs : SwArgsBase
class SwInterHyphInfo
{
-::com::sun::star::uno::Reference
-::com::sun::star::linguistic2::XHyphenatedWord xHyphWord;
-const Point aCrsrPos;
+::css::uno::Reference ::css::linguistic2::XHyphenatedWord xHyphWord;
+const Point aCrsrPos;
sal_BoolbNoLang : 1;
sal_BoolbCheck : 1;
public:
-xub_StrLen nStart;
-xub_StrLen nLen;
-xub_StrLen nWordStart;
-xub_StrLen nWordLen;
-xub_StrLen nHyphPos;
+sal_Int32 nStart;
+sal_Int32 nEnd;
+sal_Int32 nWordStart;
+sal_Int32 nWordLen;
+sal_Int32 nHyphPos;
sal_uInt16 nMinTrail;
inline SwInterHyphInfo( const Point rCrsrPos,
-const sal_uInt16 nStartPos = 0,
-const sal_uInt16 nLength = USHRT_MAX )
+sal_Int32 nStartPos = 0,
+sal_Int32 nLength = SAL_MAX_INT32 )
: aCrsrPos( rCrsrPos ),
bNoLang(sal_False), bCheck(sal_False),
- nStart(nStartPos), nLen(nLength),
+ nStart(nStartPos),
+ nEnd( std::max(SAL_MAX_INT32, nStartPos + nLength) ),
nWordStart(0), nWordLen(0),
nHyphPos(0), nMinTrail(0)
{ }
-inline xub_StrLen GetEnd() const
-{ return STRING_LEN == nLen ? nLen : nStart + nLen; }
+inline sal_Int32 GetEnd() const
+{ return nEnd; }
inline const Point *GetCrsrPos() const
-{ return aCrsrPos.X() || aCrsrPos.Y() ? aCrsrPos : 0; }
+{ return aCrsrPos.X() || aCrsrPos.Y() ? aCrsrPos : 0; }
inline sal_Bool IsCheck() const { return bCheck; }
inline void SetCheck( const sal_Bool bNew ) { bCheck = bNew; }
inline void SetNoLang( const sal_Bool bNew ) { bNoLang = bNew; }
-inline void
-SetHyphWord(const ::com::sun::star::uno::Reference
-::com::sun::star::linguistic2::XHyphenatedWord rxHW)
-{ xHyphWord = rxHW; }
-inline ::com::sun::star::uno::Reference
-::com::sun::star::linguistic2::XHyphenatedWord
-GetHyphWord() { return xHyphWord; }
+inline void SetHyphWord(const ::css::uno::Reference
::css::linguistic2::XHyphenatedWord rxHW)
+{ xHyphWord = rxHW; }
+inline ::css::uno::Reference ::css::linguistic2::XHyphenatedWord
GetHyphWord()
+{ return xHyphWord; }
};
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 79fbd43..a1d3e2e 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -2047,7 +2047,7 @@ SwHyphArgs::SwHyphArgs( const SwPaM *pPam, const Point
rCrsrPos,
inline void SwHyphArgs::SetRange( const SwNode *pNew )
{
nStart = pStart == pNew ? nPamStart : 0;
-nLen = pEnd == pNew ? nPamLen : STRING_NOTFOUND;
+nEnd = pEnd == pNew ? nPamStart + nPamLen : SAL_MAX_INT32;
}
void SwHyphArgs::SetPam( SwPaM *pPam ) const
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 909f2ad..4aa235e 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -100,7 +100,7 @@ sal_Bool SwTxtFrm::Hyphenate( SwInterHyphInfo rHyphInf )
Re: deadlock writing to stdout in remotely controlled soffice
Hey Noel, thanks for your answer but this problem has nothing to do with the IA2 work or the new xlsx threading implementation. 2013/12/4 Noel Grandin n...@peralex.com On 2013-12-04 08:13, Markus Mohrhard wrote: so I experience some strange deadlocks recently with quite interesting backlogs. These look very much like the SalYield issue that Michael Stahl / Michael Meeks / Stephen Bergman have been discussing recently on the mailing list. e.g. http://nabble.documentfoundation.org/Re-locking-foo-td4086346.html http://nabble.documentfoundation.org/threaded-progress-bar-amp- deadlock-td4086260.html http://nabble.documentfoundation.org/improving-threading-osl- Condition-abstraction-td4085441.html Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] Changes to 'private/moggi/export-crash-test'
New branch 'private/moggi/export-crash-test' available with the following commits: commit 32915efc07489721aadc20d5a427a8ca7f3171ea Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Dec 3 09:20:04 2013 +0100 initial work for crash testing ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/source vcl/source
sc/source/ui/Accessibility/AccessibleCellBase.cxx |3 +--
sc/source/ui/Accessibility/AccessibleTableBase.cxx |6 +-
vcl/source/gdi/outdev3.cxx |6 --
3 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit 2fbf95f5efb0e7e2781fa8546845a084721ee4e7
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 3 09:32:57 2013 +0100
warning C4702: unreachable code
...and simplification
Change-Id: I652da35312522f452276116df11e548ba9231b53
diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
index 5a74dcf..9ce33be 100644
--- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx
@@ -65,19 +65,15 @@ void SAL_CALL ScAccessibleTableBase::disposing()
uno::Any SAL_CALL ScAccessibleTableBase::queryInterface( uno::Type const
rType )
throw (uno::RuntimeException)
{
-uno::Any aRet;
if ( rType == ::getCppuType((uno::ReferenceXAccessibleTableSelection
*)0) )
{
-uno::ReferenceXAccessibleTableSelection xThis( this );
-aRet = xThis;
-return aRet;
+return uno::Any(uno::ReferenceXAccessibleTableSelection(this));
}
else
{
uno::Any aAny (ScAccessibleTableBaseImpl::queryInterface(rType));
return aAny.hasValue() ? aAny :
ScAccessibleContextBase::queryInterface(rType);
}
-return aRet;
}
void SAL_CALL ScAccessibleTableBase::acquire()
commit e40bae2dc347ae6c7e3a9133fcdd78c62192a016
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 3 09:30:25 2013 +0100
Revert ScAccessibleCellBase::getCurrentValue to reutnr a numeric value again
b41332475783c31136673fb44cf4c411bb0148f8 Integrate branch of IAccessible2
had
changed it to return a string, but that neither matched the documentation of
css.accessibility.XAccessibleValue nor did it satisfy JunitTest_sc_unoapi.
This
is the same underlying issue as 1cb1dca1260da2cea5b6800483e86a6d6b251844
Revert
SwAccessibleCell::getCurrentValue to return a numeric value again and needs
further clarification apparently.
Change-Id: Idb725724842ffa1aff811d66066912a22b2f2f6e
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index d021dbd..d1817b3 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -233,8 +233,7 @@ uno::Any SAL_CALL
uno::Any aAny;
if (mpDoc)
{
-OUString
valStr(mpDoc-GetString(maCellAddress.Col(),maCellAddress.Row(),maCellAddress.Tab()));
-aAny = valStr;
+aAny = mpDoc-GetValue(maCellAddress);
}
return aAny;
}
commit 44a6eee8e0b7c62685ebabea1fd9baee17cf62a6
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 3 09:23:43 2013 +0100
Call getLineBreak with null XHyphenator unless
TEXT_DRAW_WORDBREAK_HYPHENATION
So no longer instantiate XLinguServiceManager (which might e.g. bootstrap
Python) unless explicitly requested, which e.g. removes a noticable delay
when
switching to the Options dialog's Security page (which causes size
calculations of FixedText controls that use TEXT_DRAW_WORDBREAK but not
TEXT_DRAW_WORDBREAK_HYPHENATION).
Change-Id: Ib0a28d3d7d7718faf6df7a138f5a86b8b2fd7713
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index afe06f7..0543eb5 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -4679,8 +4679,10 @@ long OutputDevice::ImplGetTextLines(
ImplMultiTextLineInfo rLineInfo,
// get service provider
uno::Reference uno::XComponentContext xContext(
comphelper::getProcessComponentContext() );
+bool bHyphenate = (nStyle TEXT_DRAW_WORDBREAK_HYPHENATION)
+== TEXT_DRAW_WORDBREAK_HYPHENATION;
uno::Reference linguistic2::XHyphenator xHyph;
-if ( nStyle TEXT_DRAW_WORDBREAK )
+if ( bHyphenate )
{
uno::Reference linguistic2::XLinguServiceManager2 xLinguMgr =
linguistic2::LinguServiceManager::create(xContext);
xHyph = xLinguMgr-getHyphenator();
@@ -4712,7 +4714,7 @@ long OutputDevice::ImplGetTextLines(
ImplMultiTextLineInfo rLineInfo,
nBreakPos = (xub_StrLen)aLBR.breakIndex;
if ( nBreakPos = nPos )
nBreakPos = nSoftBreak;
-if ( (nStyle TEXT_DRAW_WORDBREAK_HYPHENATION) ==
TEXT_DRAW_WORDBREAK_HYPHENATION )
+if ( bHyphenate )
{
// Whether hyphen or not: Put the word after the
hyphen through
// word boundary.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
Re: [Libreoffice-commits] IAccessible2 problems
On 12/02/2013 04:13 PM, Stephan Bergmann wrote:
On 11/27/2013 04:44 PM, Stephan Bergmann wrote:
Below are two commits that were necessary to make (Linux) make check
work again post
http://cgit.freedesktop.org/libreoffice/core/commit/?id=efb23f29983f87104a684e7fab00b84fc59d131d
Integrate branch of IAccessible2. In both cases, the problematic
changes made by that commit looked rather unmotivated to me, and I do
not know whether it would actually have been better to change the code
under test or the test code. So, insight welcome.
And one more oddity:
commit 1cb1dca1260da2cea5b6800483e86a6d6b251844
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Dec 2 16:09:47 2013 +0100
Revert SwAccessibleCell::getCurrentValue to return a numeric value
again
76c549eb01dcb7b5bf28a271ce00e386f3d388ba Integrate branch of
IAccessible2 had
changed it to return a string, but that neither matched the
documentation of
css.accessibility.XAccessibleValue nor did it satisfy
JunitTest_sw_unoapi. This
needs further clarification apparently.
Change-Id: Ib09f7549db7ba5155798d5917908c7ce50e7a592
...and its brother for sc:
commit e40bae2dc347ae6c7e3a9133fcdd78c62192a016
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Dec 3 09:30:25 2013 +0100
Revert ScAccessibleCellBase::getCurrentValue to reutnr a numeric value again
b41332475783c31136673fb44cf4c411bb0148f8 Integrate branch of IAccessible2
had
changed it to return a string, but that neither matched the documentation of
css.accessibility.XAccessibleValue nor did it satisfy JunitTest_sc_unoapi.
This
is the same underlying issue as 1cb1dca1260da2cea5b6800483e86a6d6b251844
Revert
SwAccessibleCell::getCurrentValue to return a numeric value again and needs
further clarification apparently.
Change-Id: Idb725724842ffa1aff811d66066912a22b2f2f6e
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index d021dbd..d1817b3 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -233,8 +233,7 @@ uno::Any SAL_CALL
uno::Any aAny;
if (mpDoc)
{
-OUString
valStr(mpDoc-GetString(maCellAddress.Col(),maCellAddress.Row(),maCellAddress.Tab()));
-aAny = valStr;
+aAny = mpDoc-GetValue(maCellAddress);
}
return aAny;
}
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
RE: fdo69552 backward compatibility with optional arguments in calc functions
Hi Eike, Actually the risk is quite low, as every release would introduce a self-maintained state. To shorten things the final cut could be done at every step if the sequence turned out to be unmaintainable. You obviously have thought about it more than I have ;) Fortunately we do have some time now for 4.3 to think things over. I'm not clinging to my proposal but I think it's best for the users who exchange documents. I shall have a look at the code and see if your stepped approach is easy to apply. Also, I shall have a look if and how this has effect on the Excel 2010 functions CEILING.PRECISE, ISO.CEILING and FLOOR.PRECISE. Where would be a good place to put the 'to Do list' (planned changes per release per function)? In the code, in a wiki, which file/page? Winfried ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 14 ++
2 files changed, 25 insertions(+)
New commits:
commit 6cd9431a182f54d491ab1459443a80c6a8e4ae95
Author: Jan Holesovsky ke...@collabora.com
Date: Wed Nov 20 13:39:18 2013 +0100
Related bnc#837302: Don't introduce a redlined delete and the end of doc.
Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
Change-Id: I5c3903a40b69867684707d33acbc92b1f80a93ec
Reviewed-on: https://gerrit.libreoffice.org/6898
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d7a5c8b..1372151 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -800,6 +800,17 @@ void Test::testBnc837302()
getRun(xParagraph, 3, AAA);
// interestingly the 'Insert' is set on the _previous_ run
CPPUNIT_ASSERT_EQUAL(OUString(Insert),
getPropertyOUString(getRun(xParagraph, 2), RedlineType));
+
+// make sure we don't introduce a redlined delete in the 2nd paragraph
+xParagraph = getParagraph(2);
+OUString aProperty;
+try
+{
+// throws when not present
+aProperty = getPropertyOUString(getRun(xParagraph, 1),
RedlineType);
+}
+catch (const beans::UnknownPropertyException) {}
+CPPUNIT_ASSERT_EQUAL(OUString(), aProperty);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index ded106d..131559f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -318,7 +318,21 @@ void DomainMapper_Impl::RemoveLastParagraph( )
#else
if (xCursor-getString() == \r\n)
#endif
+{
+uno::Referencebeans::XPropertySet
xDocProps(GetTextDocument(), uno::UNO_QUERY);
+const OUString aRecordChanges(RecordChanges);
+uno::Any
aPreviousValue(xDocProps-getPropertyValue(aRecordChanges));
+
+// disable redlining for this operation, otherwise we might
+// end up with an unwanted recorded deletion
+xDocProps-setPropertyValue(aRecordChanges,
uno::Any(sal_False));
+
+// delete
xCursor-setString(OUString());
+
+// restore again
+xDocProps-setPropertyValue(aRecordChanges, aPreviousValue);
+}
}
}
catch( const uno::Exception )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source
sw/source/filter/ww8/ww8par.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6dfc6b717b5e625cbc48c856b73573719c511c8a Author: Michael Stahl mst...@redhat.com Date: Mon Dec 2 22:20:25 2013 +0100 fdo#71749: sw: WW8: don't loop on tables in footnotes (regression from ee1db992b98378b5e2f5e9aa8af0e36c375e582f) Change-Id: Id10b6fb8e9e3697b10a1df605cb48d94a55ad207 (cherry picked from commit 790896d9a557d34ea91d6e5926471de66503be7a) Reviewed-on: https://gerrit.libreoffice.org/6905 Reviewed-by: Miklos Vajna vmik...@collabora.co.uk Tested-by: Miklos Vajna vmik...@collabora.co.uk diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index bf5bea0..223de68 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -2383,7 +2383,7 @@ bool SwWW8ImplReader::ProcessSpecial(bool rbReSync, WW8_CP nStartCp) pPlcxMan-GetPap()-Restore( aSave ); } } -} while (nInTable nCellLevel); +} while (!bFtnEdn (nInTable nCellLevel)); return bTableRowEnd; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmloff/source
xmloff/source/text/XMLTextFrameContext.cxx | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
New commits:
commit 0763cf6ed7bdc629e59b5df757b9ef4f5273f393
Author: Michael Stahl mst...@redhat.com
Date: Mon Dec 2 23:28:20 2013 +0100
fdo#71450 fdo#71698: ODF import: fix frame name corner cases
Trying to set a name that is already in use will throw an exception (and
set a different, generated name); if there is actually no name in the
file then there's no point trying to set anything.
(regression from b69d152cfa1da868ba960345d72ba78f9f8e1b35)
Change-Id: Ie54d4a830cc23e2853a6efeb81f77dcc788192ea
(cherry picked from commit 8171e713e74e3d09e86592c28abfe05d0400c071)
Reviewed-on: https://gerrit.libreoffice.org/6907
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx
b/xmloff/source/text/XMLTextFrameContext.cxx
index 3ca7e86..745ff63 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1291,12 +1291,20 @@ void XMLTextFrameContext_Impl::SetHyperlink( const
OUString rHRef,
void XMLTextFrameContext_Impl::SetName()
{
ReferenceXNamed xNamed(xPropSet, UNO_QUERY);
-if (xNamed.is())
+if (!m_sOrigName.isEmpty() xNamed.is())
{
OUString const name(xNamed-getName());
if (name != m_sOrigName)
{
-xNamed-setName(m_sOrigName);
+try
+{
+xNamed-setName(m_sOrigName);
+}
+catch (uno::Exception const e)
+{ // fdo#71698 document contains 2 frames with same draw:name
+SAL_INFO(xmloff.text, SetName(): exception setting \
+ m_sOrigName \: e.Message);
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e8/0e74b336cca423d4c897182ce591417dc50ebd
e8/0e74b336cca423d4c897182ce591417dc50ebd |1 + 1 file changed, 1 insertion(+) New commits: commit 6f7cbd187b158b1247ef7a55cdbb0260dee9f573 Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 3 09:13:39 2013 + Notes added by 'git notes add' diff --git a/e8/0e74b336cca423d4c897182ce591417dc50ebd b/e8/0e74b336cca423d4c897182ce591417dc50ebd new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/e8/0e74b336cca423d4c897182ce591417dc50ebd @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/sdi sw/source
sw/sdi/swriter.sdi |8
sw/source/ui/shells/textsh1.cxx |6 +++---
sw/source/ui/shells/txtcrsr.cxx |8
3 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 63947810107e042ebe440b865904c62e2d3f74d8
Author: Noel Grandin n...@peralex.com
Date: Mon Dec 2 14:12:09 2013 +0200
convert FN_PARAM_MOVE_COUNT from SfxInt16 to SfxInt32
so that we can convert surrounding code from xub_StrLen to sal_Int32
Change-Id: Ib779c82a71405f855cfe72bcde2511e8153445f0
Reviewed-on: https://gerrit.libreoffice.org/6896
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 9cb8c62..0c7cff7 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1947,7 +1947,7 @@ SfxVoidItem FrameDialog FN_FORMAT_FRAME_DLG
//--
SfxBoolItem GoDown FN_LINE_DOWN
-(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select
FN_PARAM_MOVE_SELECTION)
+(SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select
FN_PARAM_MOVE_SELECTION)
[
/* flags: */
AutoUpdate = FALSE,
@@ -1972,7 +1972,7 @@ SfxBoolItem GoDown FN_LINE_DOWN
//--
SfxBoolItem GoLeft FN_CHAR_LEFT
-(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select
FN_PARAM_MOVE_SELECTION)
+(SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select
FN_PARAM_MOVE_SELECTION)
[
/* flags: */
AutoUpdate = FALSE,
@@ -1997,7 +1997,7 @@ SfxBoolItem GoLeft FN_CHAR_LEFT
//--
SfxBoolItem GoRight FN_CHAR_RIGHT
-(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select
FN_PARAM_MOVE_SELECTION)
+(SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select
FN_PARAM_MOVE_SELECTION)
[
/* flags: */
AutoUpdate = FALSE,
@@ -3222,7 +3222,7 @@ SfxVoidItem GoToStartOfPrevPageSel
FN_START_OF_PREV_PAGE_SEL
//--
SfxBoolItem GoUp FN_LINE_UP
-(SfxInt16Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select
FN_PARAM_MOVE_SELECTION)
+(SfxInt32Item Count FN_PARAM_MOVE_COUNT,SfxBoolItem Select
FN_PARAM_MOVE_SELECTION)
[
/* flags: */
AutoUpdate = FALSE,
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 091058e..9868653 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -197,7 +197,7 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog,
sal_uInt16 nSlot,const
const SfxPoolItem* pSelectionItem;
sal_Bool bInsert = sal_False;
-xub_StrLen nInsert = 0;
+sal_Int32 nInsert = 0;
// The old item is for unknown reasons back in the set again.
if( !bSelectionPut SFX_ITEM_SET ==
aTmpSet.GetItemState(FN_PARAM_SELECTION, sal_False, pSelectionItem) )
@@ -215,7 +215,7 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog,
sal_uInt16 nSlot,const
aReq.AppendItem( SfxStringItem( FN_INSERT_STRING, sInsert ) );
aReq.Done();
SfxRequest aReq1( rWrtSh.GetView().GetViewFrame(),
FN_CHAR_LEFT );
-aReq1.AppendItem( SfxInt16Item(FN_PARAM_MOVE_COUNT, nInsert) );
+aReq1.AppendItem( SfxInt32Item(FN_PARAM_MOVE_COUNT, nInsert) );
aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION,
sal_True) );
aReq1.Done();
}
@@ -234,7 +234,7 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog,
sal_uInt16 nSlot,const
if(bInsert)
{
SfxRequest aReq1( rWrtSh.GetView().GetViewFrame(), FN_CHAR_RIGHT );
-aReq1.AppendItem( SfxInt16Item(FN_PARAM_MOVE_COUNT, nInsert) );
+aReq1.AppendItem( SfxInt32Item(FN_PARAM_MOVE_COUNT, nInsert) );
aReq1.AppendItem( SfxBoolItem(FN_PARAM_MOVE_SELECTION, sal_False)
);
aReq1.Done();
rWrtSh.SwapPam();
diff --git a/sw/source/ui/shells/txtcrsr.cxx b/sw/source/ui/shells/txtcrsr.cxx
index 2c09fea..d686012 100644
--- a/sw/source/ui/shells/txtcrsr.cxx
+++ b/sw/source/ui/shells/txtcrsr.cxx
@@ -48,12 +48,12 @@ void SwTextShell::ExecBasicMove(SfxRequest rReq)
GetView().GetEditWin().FlushInBuffer();
const SfxItemSet *pArgs = rReq.GetArgs();
sal_Bool bSelect = sal_False;
-sal_uInt16 nCount = 1;
+sal_Int32 nCount = 1;
if(pArgs)
{
const SfxPoolItem *pItem;
if(SFX_ITEM_SET == pArgs-GetItemState(FN_PARAM_MOVE_COUNT, sal_True,
pItem))
-nCount = ((const SfxInt16Item *)pItem)-GetValue();
+nCount = ((const SfxInt32Item *)pItem)-GetValue();
if(SFX_ITEM_SET == pArgs-GetItemState(FN_PARAM_MOVE_SELECTION,
sal_True, pItem))
bSelect = ((const SfxBoolItem *)pItem)-GetValue();
}
@@
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - c6/504da108d58a0730fb889b7b7279f25ed75024
c6/504da108d58a0730fb889b7b7279f25ed75024 |1 + 1 file changed, 1 insertion(+) New commits: commit bdf702beb7df49a6a294e6f897e692467648a14a Author: Caolán McNamara caol...@redhat.com Date: Tue Dec 3 09:16:47 2013 + Notes added by 'git notes add' diff --git a/c6/504da108d58a0730fb889b7b7279f25ed75024 b/c6/504da108d58a0730fb889b7b7279f25ed75024 new file mode 100644 index 000..8a2345e --- /dev/null +++ b/c6/504da108d58a0730fb889b7b7279f25ed75024 @@ -0,0 +1 @@ +ignore: fixed ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] libvisio.git: 2 commits - src/conv src/lib
src/conv/raw/vsd2raw.cpp |1 -
src/lib/VSDPages.cpp |6 ++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 6a4e4bae12214d9a913b7b7fe134919a6b7882bf
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 10:22:31 2013 +0100
Add startDocument and endDocument calls
Change-Id: I964e74614e18775e6383e385024331e03e8cf442
diff --git a/src/lib/VSDPages.cpp b/src/lib/VSDPages.cpp
index 5043814..1cb9787 100644
--- a/src/lib/VSDPages.cpp
+++ b/src/lib/VSDPages.cpp
@@ -93,6 +93,10 @@ void
libvisio::VSDPages::draw(librevenge::RVNGDrawingInterface *painter)
{
if (!painter)
return;
+ if (m_pages.empty())
+return;
+
+ painter-startDocument(librevenge::RVNGPropertyList());
for (unsigned i = 0; i m_pages.size(); ++i)
{
@@ -118,6 +122,8 @@ void
libvisio::VSDPages::draw(librevenge::RVNGDrawingInterface *painter)
_drawWithBackground(painter, iter-second);
painter-endPage();
}
+
+ painter-endDocument();
}
void libvisio::VSDPages::_drawWithBackground(librevenge::RVNGDrawingInterface
*painter, const libvisio::VSDPage page)
commit fd77d1c48c490cb697ccf62d47cbdb28998ce99f
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Tue Dec 3 06:58:22 2013 +0100
No need of this anymore
Change-Id: Ia04b59bd92854123800ba2bf2576919c6d90c907
diff --git a/src/conv/raw/vsd2raw.cpp b/src/conv/raw/vsd2raw.cpp
index 738a863..750ac7e 100644
--- a/src/conv/raw/vsd2raw.cpp
+++ b/src/conv/raw/vsd2raw.cpp
@@ -79,7 +79,6 @@ int main(int argc, char *argv[])
return 1;
}
- (void)printIndentLevel;
librevenge::RVNGRawDrawingGenerator painter(printIndentLevel);
if (!libvisio::VisioDocument::parse(input, painter))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - chart2/source
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx |
299 ++
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx |
193 ++
chart2/source/view/main/ChartItemPool.cxx|
2
3 files changed, 139 insertions(+), 355 deletions(-)
New commits:
commit 8ad8e8754cadebf9c06dd487a9816e0980ee36b0
Author: Tomaž Vajngerl qui...@gmail.com
Date: Thu Nov 21 20:25:53 2013 +0100
Simplify conversion from/to ItemSet/PropertySet for RegressionCurves
Change-Id: I5ddf53f984508a88fd02063eb9f81cd05cf627c9
Reviewed-on: https://gerrit.libreoffice.org/6872
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org
diff --git
a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index bce1e7f..6b28439 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -68,6 +68,51 @@ namespace
return eType;
}
+template class T, class D
+bool lclConvertToPropertySet(const SfxItemSet rItemSet, sal_uInt16 nWhichId,
uno::Referencebeans::XPropertySet xProperties, OUString aPropertyID)
+{
+OSL_ASSERT(xProperties.is());
+if( xProperties.is() )
+{
+T aValue = static_castT(static_castconst D(rItemSet.Get( nWhichId
)).GetValue());
+T aOldValue = aValue;
+bool aSuccess = xProperties-getPropertyValue( aPropertyID ) =
aOldValue;
+if (!aSuccess || aOldValue != aValue)
+{
+xProperties-setPropertyValue( aPropertyID , uno::makeAny( aValue
));
+return true;
+}
+}
+return false;
+}
+
+template class T, class D
+void lclConvertToItemSet(SfxItemSet rItemSet, sal_uInt16 nWhichId,
uno::Referencebeans::XPropertySet xProperties, OUString aPropertyID)
+{
+OSL_ASSERT(xProperties.is());
+if( xProperties.is() )
+{
+T aValue = static_castT(static_castconst D(rItemSet.Get( nWhichId
)).GetValue());
+if(xProperties-getPropertyValue( aPropertyID ) = aValue)
+{
+rItemSet.Put(D( nWhichId, aValue ));
+}
+}
+}
+
+void lclConvertToItemSetDouble(SfxItemSet rItemSet, sal_uInt16 nWhichId,
uno::Referencebeans::XPropertySet xProperties, OUString aPropertyID)
+{
+OSL_ASSERT(xProperties.is());
+if( xProperties.is() )
+{
+double aValue = static_castdouble(static_castconst
SvxDoubleItem(rItemSet.Get( nWhichId )).GetValue());
+if(xProperties-getPropertyValue( aPropertyID ) = aValue)
+{
+rItemSet.Put(SvxDoubleItem( aValue, nWhichId ));
+}
+}
+}
+
} // anonymous namespace
namespace chart
@@ -128,8 +173,8 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
uno::Reference chart2::XRegressionCurve xCurve( GetPropertySet(),
uno::UNO_QUERY );
bool bChanged = false;
-OSL_ASSERT( xCurve.is());
-if( !xCurve.is())
+OSL_ASSERT(xCurve.is());
+if(!xCurve.is())
return false;
switch( nWhichId )
@@ -151,7 +196,7 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
m_xCurveContainer,
xCurve,
uno::Reference uno::XComponentContext ());
-uno::Reference beans::XPropertySet xProperties( xCurve,
uno::UNO_QUERY );
+uno::Referencebeans::XPropertySet xProperties( xCurve,
uno::UNO_QUERY );
resetPropertySet( xProperties );
bChanged = true;
}
@@ -160,324 +205,128 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
case SCHATTR_REGRESSION_DEGREE:
{
-sal_Int32 aDegree = static_cast sal_Int32 (
-static_cast const SfxInt32Item (
-rItemSet.Get( nWhichId )).GetValue());
-
uno::Reference beans::XPropertySet xProperties( xCurve,
uno::UNO_QUERY );
-OSL_ASSERT( xProperties.is());
-if( xProperties.is() )
-{
-sal_Int32 aOldDegree = 2;
-xProperties-getPropertyValue( PolynomialDegree ) =
aOldDegree;
-if (aOldDegree != aDegree)
-{
-xProperties-setPropertyValue( PolynomialDegree ,
uno::makeAny( aDegree ));
-bChanged = true;
-}
-}
+bChanged = lclConvertToPropertySetsal_Int32,
SfxInt32Item(rItemSet, nWhichId, xProperties, OUString(PolynomialDegree));
}
break;
case SCHATTR_REGRESSION_PERIOD:
{
-sal_Int32 aPeriod = static_cast sal_Int32 (
-static_cast const SfxInt32Item (
-rItemSet.Get( nWhichId
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - chart2/source
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx |
261 --
1 file changed, 117 insertions(+), 144 deletions(-)
New commits:
commit 67bbe10ef7c6d5bdb5af7276533656d2504238c2
Author: Tomaž Vajngerl qui...@gmail.com
Date: Wed Nov 20 22:40:51 2013 +0100
DRY-cleanup RegressionCurveItemConverter
Change-Id: I8fb799b2efc81587252161ccadfa1dbd6b096bda
Reviewed-on: https://gerrit.libreoffice.org/6871
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org
diff --git
a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 2bf7900..bce1e7f 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -128,55 +128,52 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
uno::Reference chart2::XRegressionCurve xCurve( GetPropertySet(),
uno::UNO_QUERY );
bool bChanged = false;
+OSL_ASSERT( xCurve.is());
+if( !xCurve.is())
+return false;
+
switch( nWhichId )
{
case SCHATTR_REGRESSION_TYPE:
{
-OSL_ASSERT( xCurve.is());
-if( xCurve.is())
+SvxChartRegress eRegress = static_cast SvxChartRegress (
+static_cast sal_Int32 (
RegressionCurveHelper::getRegressionType( xCurve )));
+SvxChartRegress eNewRegress = static_cast const
SvxChartRegressItem (
+rItemSet.Get( nWhichId )).GetValue();
+if( eRegress != eNewRegress )
{
-SvxChartRegress eRegress = static_cast SvxChartRegress (
-static_cast sal_Int32 (
RegressionCurveHelper::getRegressionType( xCurve )));
-SvxChartRegress eNewRegress = static_cast const
SvxChartRegressItem (
-rItemSet.Get( nWhichId )).GetValue();
-if( eRegress != eNewRegress )
-{
-// note that changing the regression type changes the
object
-// for which this converter was created. Not optimal, but
-// currently the only way to handle the type in the
-// regression curve properties dialog
-xCurve = RegressionCurveHelper::changeRegressionCurveType(
-lcl_convertRegressionType( eNewRegress ),
-m_xCurveContainer,
-xCurve,
-uno::Reference uno::XComponentContext ());
-uno::Reference beans::XPropertySet xProperties( xCurve,
uno::UNO_QUERY );
-resetPropertySet( xProperties );
-bChanged = true;
-}
+// note that changing the regression type changes the object
+// for which this converter was created. Not optimal, but
+// currently the only way to handle the type in the
+// regression curve properties dialog
+xCurve = RegressionCurveHelper::changeRegressionCurveType(
+lcl_convertRegressionType( eNewRegress ),
+m_xCurveContainer,
+xCurve,
+uno::Reference uno::XComponentContext ());
+uno::Reference beans::XPropertySet xProperties( xCurve,
uno::UNO_QUERY );
+resetPropertySet( xProperties );
+bChanged = true;
}
}
break;
case SCHATTR_REGRESSION_DEGREE:
{
-if( xCurve.is())
-{
-sal_Int32 aDegree = static_cast sal_Int32 (
-static_cast const SfxInt32Item (
-rItemSet.Get( nWhichId )).GetValue());
+sal_Int32 aDegree = static_cast sal_Int32 (
+static_cast const SfxInt32Item (
+rItemSet.Get( nWhichId )).GetValue());
-uno::Reference beans::XPropertySet xProperties( xCurve,
uno::UNO_QUERY );
-OSL_ASSERT( xProperties.is());
-if( xProperties.is() )
+uno::Reference beans::XPropertySet xProperties( xCurve,
uno::UNO_QUERY );
+OSL_ASSERT( xProperties.is());
+if( xProperties.is() )
+{
+sal_Int32 aOldDegree = 2;
+xProperties-getPropertyValue( PolynomialDegree ) =
aOldDegree;
+if (aOldDegree != aDegree)
{
-sal_Int32 aOldDegree = 2;
-xProperties-getPropertyValue( PolynomialDegree ) =
aOldDegree;
-if (aOldDegree != aDegree)
-{
-
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - chart2/source chart2/uiconfig
chart2/source/controller/dialogs/res_Trendline.cxx |
56 ++
chart2/source/controller/dialogs/res_Trendline.hxx |
1
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx |
15 ++
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx |
16 ++
chart2/source/inc/chartview/ChartSfxItemIds.hxx |
3
chart2/source/tools/RegressionCurveHelper.cxx|
12 ++
chart2/source/tools/RegressionCurveModel.cxx |
9 +
chart2/source/view/main/ChartItemPool.cxx|
1
chart2/uiconfig/ui/tp_Trendline.ui |
45 ++--
9 files changed, 127 insertions(+), 31 deletions(-)
New commits:
commit 04e704c1c28d6554bc0f03ece2fbff3a11b745ef
Author: Tomaž Vajngerl qui...@gmail.com
Date: Sat Nov 23 16:06:28 2013 +0100
Custom name for a trend line (shown in legend).
Previously, a trendline name was fixed to a combination of the
trendline type and the name of the series. With this it is possible
to add a custom name for the trendline, which is shown in the
legend.
Change-Id: I61eaaf14e6df45088abdf1f3e9c24877d26ae8a7
Reviewed-on: https://gerrit.libreoffice.org/6873
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx
b/chart2/source/controller/dialogs/res_Trendline.cxx
index db83486..76be297 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -24,6 +24,7 @@
#include chartview/ChartSfxItemIds.hxx
#include svl/intitem.hxx
+#include svl/stritem.hxx
#include sfx2/tabdlg.hxx
#include vector
@@ -36,26 +37,28 @@ TrendlineResources::TrendlineResources( Window * pParent,
const SfxItemSet rInA
m_eTrendLineType( CHREGRESS_LINEAR ),
m_bTrendLineUnique( true )
{
-((SfxTabPage*)pParent)-get(m_pRB_Linear,linear);
-((SfxTabPage*)pParent)-get(m_pRB_Logarithmic,logarithmic);
-((SfxTabPage*)pParent)-get(m_pRB_Exponential,exponential);
-((SfxTabPage*)pParent)-get(m_pRB_Power,power);
-((SfxTabPage*)pParent)-get(m_pRB_Polynomial,polynomial);
-((SfxTabPage*)pParent)-get(m_pRB_MovingAverage,movingAverage);
-((SfxTabPage*)pParent)-get(m_pNF_Degree,degree);
-((SfxTabPage*)pParent)-get(m_pNF_Period,period);
-((SfxTabPage*)pParent)-get(m_pNF_ExtrapolateForward,extrapolateForward);
-
((SfxTabPage*)pParent)-get(m_pNF_ExtrapolateBackward,extrapolateBackward);
-((SfxTabPage*)pParent)-get(m_pCB_SetIntercept,setIntercept);
-((SfxTabPage*)pParent)-get(m_pNF_InterceptValue,interceptValue);
-((SfxTabPage*)pParent)-get(m_pCB_ShowEquation,showEquation);
-
((SfxTabPage*)pParent)-get(m_pCB_ShowCorrelationCoeff,showCorrelationCoefficient);
-((SfxTabPage*)pParent)-get(m_pFI_Linear,imageLinear);
-((SfxTabPage*)pParent)-get(m_pFI_Logarithmic,imageLogarithmic);
-((SfxTabPage*)pParent)-get(m_pFI_Exponential,imageExponential);
-((SfxTabPage*)pParent)-get(m_pFI_Power,imagePower);
-((SfxTabPage*)pParent)-get(m_pFI_Polynomial,imagePolynomial);
-((SfxTabPage*)pParent)-get(m_pFI_MovingAverage,imageMovingAverage);
+SfxTabPage* pTabPage = reinterpret_castSfxTabPage*(pParent);
+pTabPage-get(m_pRB_Linear,linear);
+pTabPage-get(m_pRB_Logarithmic,logarithmic);
+pTabPage-get(m_pRB_Exponential,exponential);
+pTabPage-get(m_pRB_Power,power);
+pTabPage-get(m_pRB_Polynomial,polynomial);
+pTabPage-get(m_pRB_MovingAverage,movingAverage);
+pTabPage-get(m_pNF_Degree,degree);
+pTabPage-get(m_pNF_Period,period);
+pTabPage-get(m_pEE_Name,entry_name);
+pTabPage-get(m_pNF_ExtrapolateForward,extrapolateForward);
+pTabPage-get(m_pNF_ExtrapolateBackward,extrapolateBackward);
+pTabPage-get(m_pCB_SetIntercept,setIntercept);
+pTabPage-get(m_pNF_InterceptValue,interceptValue);
+pTabPage-get(m_pCB_ShowEquation,showEquation);
+pTabPage-get(m_pCB_ShowCorrelationCoeff,showCorrelationCoefficient);
+pTabPage-get(m_pFI_Linear,imageLinear);
+pTabPage-get(m_pFI_Logarithmic,imageLogarithmic);
+pTabPage-get(m_pFI_Exponential,imageExponential);
+pTabPage-get(m_pFI_Power,imagePower);
+pTabPage-get(m_pFI_Polynomial,imagePolynomial);
+pTabPage-get(m_pFI_MovingAverage,imageMovingAverage);
FillValueSets();
Link aLink = LINK(this, TrendlineResources, SelectTrendLine );
@@ -110,6 +113,16 @@ void TrendlineResources::Reset( const SfxItemSet rInAttrs
)
{
const SfxPoolItem *pPoolItem = NULL;
+if( rInAttrs.GetItemState( SCHATTR_REGRESSION_CURVE_NAME, sal_True,
pPoolItem ) == SFX_ITEM_SET )
+{
+OUString aName = static_cast const
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/xmloff xmloff/source
include/xmloff/xmltoken.hxx |1 +
xmloff/source/chart/PropertyMap.hxx |1 +
xmloff/source/core/xmltoken.cxx |1 +
3 files changed, 3 insertions(+)
New commits:
commit 18aef30e3eef7e2d4027ac4c9e1f5915755d288e
Author: Tomaž Vajngerl qui...@gmail.com
Date: Sat Nov 23 18:09:33 2013 +0100
Support regression curve name in ODF.
Change-Id: Ic065d63eee507906febfa15eb6d5ae1e7de58280
Reviewed-on: https://gerrit.libreoffice.org/6874
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index bb585c6..f9196af 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -2158,6 +2158,7 @@ namespace xmloff { namespace token {
XML_REGRESSION_CURVE,
XML_REGRESSION_TYPE,
+XML_REGRESSION_CURVE_NAME,
XML_REGRESSION_EXTRAPOLATE_FORWARD,
XML_REGRESSION_EXTRAPOLATE_BACKWARD,
XML_REGRESSION_MAX_DEGREE,
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index 4bab098..a1efee2 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -185,6 +185,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
// regression curve properties
MAP_SPECIAL( RegressionType, CHART, XML_REGRESSION_TYPE,
XML_TYPE_STRING, XML_SCH_CONTEXT_SPECIAL_REGRESSION_TYPE ),
+MAP_ENTRY_ODF_EXT( CurveName, CHART, XML_REGRESSION_CURVE_NAME,
XML_TYPE_STRING ),
MAP_ENTRY_ODF_EXT( PolynomialDegree, CHART, XML_REGRESSION_MAX_DEGREE,
XML_TYPE_NUMBER ),
MAP_ENTRY_ODF_EXT( MovingAveragePeriod, CHART, XML_REGRESSION_PERIOD,
XML_TYPE_NUMBER ),
MAP_ENTRY_ODF_EXT( MovingAverageType, CHART, XML_REGRESSION_MOVING_TYPE,
XML_TYPE_STRING ),
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index dedb2b4..431e778 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2168,6 +2168,7 @@ namespace xmloff { namespace token {
TOKEN( regression-curve,XML_REGRESSION_CURVE ),
TOKEN( regression-type, XML_REGRESSION_TYPE ),
// Extended regression curve properties - ODF 1.2 extended
+TOKEN( regression-name, XML_REGRESSION_CURVE_NAME ),
TOKEN( regression-extrapolate-forward,
XML_REGRESSION_EXTRAPOLATE_FORWARD ),
TOKEN( regression-extrapolate-backward,
XML_REGRESSION_EXTRAPOLATE_BACKWARD ),
TOKEN( regression-max-degree, XML_REGRESSION_MAX_DEGREE ),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - include/oox oox/source
include/oox/drawingml/chart/seriesmodel.hxx|2 -
oox/source/drawingml/chart/seriesconverter.cxx |2 +
oox/source/export/chartexport.cxx | 28 +++--
oox/source/token/properties.txt|1
4 files changed, 21 insertions(+), 12 deletions(-)
New commits:
commit fc294a5c1ecc9465a3700f2a479be524e9f4f0de
Author: Tomaž Vajngerl qui...@gmail.com
Date: Sat Nov 23 20:30:49 2013 +0100
Support regression curve name in OOXML (import export).
Change-Id: I847e0df4f160e4b5078961a0e77c1e1e3fff9bd4
Reviewed-on: https://gerrit.libreoffice.org/6875
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Reviewed-by: Thorsten Behrens t...@documentfoundation.org
Tested-by: Thorsten Behrens t...@documentfoundation.org
diff --git a/include/oox/drawingml/chart/seriesmodel.hxx
b/include/oox/drawingml/chart/seriesmodel.hxx
index c374e52..1d426cb 100644
--- a/include/oox/drawingml/chart/seriesmodel.hxx
+++ b/include/oox/drawingml/chart/seriesmodel.hxx
@@ -148,7 +148,7 @@ struct TrendlineModel
ShapeRefmxShapeProp;/// Trendline formatting.
TrendlineLabelRef mxLabel;/// Trendline label text object.
-OUString maName; /// User-defined name of the trendline.
+OUStringmaName; /// User-defined name of the
trendline.
OptValue double mfBackward; /// Size of trendline before first
data point.
OptValue double mfForward; /// Size of trendline behind last
data point.
OptValue double mfIntercept;/// Crossing point with Y axis.
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index 1b56fef..5c85d99 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -433,6 +433,8 @@ void TrendlineConverter::convertFromModel( const Reference
XDataSeries rxDat
Reference XRegressionCurve xRegCurve( createInstance(
aServiceName ), UNO_QUERY_THROW );
PropertySet aPropSet( xRegCurve );
+// Name
+aPropSet.setProperty( PROP_CurveName, mrModel.maName );
aPropSet.setProperty( PROP_PolynomialDegree, mrModel.mnOrder );
aPropSet.setProperty( PROP_MovingAveragePeriod, mrModel.mnPeriod );
diff --git a/oox/source/export/chartexport.cxx
b/oox/source/export/chartexport.cxx
index 756f2ed..659252b 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -1543,8 +1543,7 @@ void ChartExport::exportSeries( Reference
chart2::XChartType xChartType, sal_
if( eChartType != chart::TYPEID_SCATTER eChartType !=
chart::TYPEID_BAR )
exportDataLabels( uno::Reference beans::XPropertySet
( aSeriesSeq[nSeriesIdx], uno::UNO_QUERY ), nSeriesLength );
-if( eChartType == chart::TYPEID_SCATTER )
-exportTrendlines( aSeriesSeq[nSeriesIdx] );
+exportTrendlines( aSeriesSeq[nSeriesIdx] );
//export error bars here
Reference XPropertySet xSeriesPropSet( xSource,
uno::UNO_QUERY );
@@ -2526,14 +2525,22 @@ void ChartExport::exportTrendlines( Reference
chart2::XDataSeries xSeries )
if (!xRegCurve.is())
continue;
+Reference XPropertySet xProperties( xRegCurve , uno::UNO_QUERY
);
+
pFS-startElement( FSNS( XML_c, XML_trendline ), FSEND );
-Reference XPropertySet xProperties( xRegCurve , uno::UNO_QUERY
);
+OUString aName;
+xProperties-getPropertyValue(CurveName) = aName;
+if(!aName.isEmpty())
+{
+pFS-startElement( FSNS( XML_c, XML_name), FSEND);
+pFS-writeEscaped(aName);
+pFS-endElement( FSNS( XML_c, XML_name) );
+}
exportShapeProps( xProperties );
OUString aService;
-
Reference lang::XServiceName xServiceName( xProperties,
UNO_QUERY );
if( !xServiceName.is() )
continue;
@@ -2596,8 +2603,8 @@ void ChartExport::exportTrendlines( Reference
chart2::XDataSeries xSeries )
double aExtrapolateForward = 0.0;
double aExtrapolateBackward = 0.0;
-xProperties-getPropertyValue( ExtrapolateForward) =
aExtrapolateForward;
-xProperties-getPropertyValue( ExtrapolateBackward) =
aExtrapolateBackward;
+xProperties-getPropertyValue(ExtrapolateForward) =
aExtrapolateForward;
+xProperties-getPropertyValue(ExtrapolateBackward) =
aExtrapolateBackward;
pFS-singleElement( FSNS( XML_c, XML_forward ),
XML_val, OString::number(aExtrapolateForward).getStr(),
@@ -2608,29 +2615,28 @@ void ChartExport::exportTrendlines( Reference
