[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/ui/XAcceleratorConfiguration.idl |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2aaa3ae69f710ccecbc60bab8110af0734980c13 Author: Julien Nabet Date: Sat Jun 29 08:05:09 2013 +0200 Fix some idl descriptions Change-Id: Iadc3a3dddb7d6df22888e76e8f69e6a829ea901a diff --git a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl index f7cc295..6524441 100644 --- a/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl +++ b/offapi/com/sun/star/ui/XAcceleratorConfiguration.idl @@ -251,8 +251,8 @@ interface XAcceleratorConfiguration /** connects this configuration to a new storage which must be used further on subsequent calls of -com::sun::star::utilXConfigurationPersistence.load() -and com::sun::star::utilXConfigurationPersistence.store(). +com::sun::star::util::XConfigurationPersistence.load() +and com::sun::star::util::XConfigurationPersistence.store(). */ interface com::sun::star::ui::XUIConfigurationStorage; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/text/AccessibleFootnoteView.idl |2 +- offapi/com/sun/star/text/AccessibleHeaderFooterView.idl |2 +- offapi/com/sun/star/text/AccessibleParagraphView.idl|6 +++--- offapi/com/sun/star/text/MailMerge.idl |6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) New commits: commit 704292996a3731a61339b1a4a5c90c9403aa095f Author: Julien Nabet Date: Sat Jun 29 07:58:10 2013 +0200 Fix some idl descriptions Change-Id: Icd8aedbe66943bb06720af3fb572f7acce96c05e diff --git a/offapi/com/sun/star/text/AccessibleFootnoteView.idl b/offapi/com/sun/star/text/AccessibleFootnoteView.idl index a88b672..cf161e9 100644 --- a/offapi/com/sun/star/text/AccessibleFootnoteView.idl +++ b/offapi/com/sun/star/text/AccessibleFootnoteView.idl @@ -78,7 +78,7 @@ service AccessibleFootnoteView to the footnote anchor's paragraph. The following states might be contained in the state set returned by - ::com::sun::star::accessibility::XAccessible::getAccessibleStateSet(): + com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet(): ::com::sun::star::accessibility::AccessibleStateType::DEFUNC (indicates that diff --git a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl index 0a65f18..4f897e3 100644 --- a/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl +++ b/offapi/com/sun/star/text/AccessibleHeaderFooterView.idl @@ -79,7 +79,7 @@ service AccessibleHeaderFooterView There are no relations. The following states might be contained in the state set returned by - ::com::sun::star::accessibility::XAccessible::getAccessibleStateSet(): + ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet(): ::com::sun::star::accessibility::AccessibleStateType::DEFUNC (indicates that diff --git a/offapi/com/sun/star/text/AccessibleParagraphView.idl b/offapi/com/sun/star/text/AccessibleParagraphView.idl index d87bfb3..acf98c9 100644 --- a/offapi/com/sun/star/text/AccessibleParagraphView.idl +++ b/offapi/com/sun/star/text/AccessibleParagraphView.idl @@ -69,7 +69,7 @@ service AccessibleParagraphView the paragraph. There are no relations. The following states are supported by the -::com::sun::star::accessibility::AccessibleStateSet returned by +::com::sun::star::accessibility::XAccessibleStateSet returned by ::com::sun::star::accessibility::XAccessibleContext::getAccessibleStateSet(). ::com::sun::star::accessibility::AccessibleStateType::DEFUNC @@ -79,9 +79,9 @@ service AccessibleParagraphView ::com::sun::star::accessibility::AccessibleStateType::EDITABLE ::com::sun::star::accessibility::AccessibleStateType::ENABLED (always contained) - ::com::sun::star::accessibility::AccessibleStateType::MULTILINE + ::com::sun::star::accessibility::AccessibleStateType::MULTI_LINE (always contained) - ::com::sun::star::accessibility::AccessibleStateType::MULTISELECTABLE + ::com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE (always contained) ::com::sun::star::accessibility::AccessibleStateType::OPAQUE ::com::sun::star::accessibility::AccessibleStateType::SHOWING diff --git a/offapi/com/sun/star/text/MailMerge.idl b/offapi/com/sun/star/text/MailMerge.idl index 15ab38b..f669d71 100644 --- a/offapi/com/sun/star/text/MailMerge.idl +++ b/offapi/com/sun/star/text/MailMerge.idl @@ -66,7 +66,7 @@ published service MailMerge This service describe the interaction between all data access related properties, namely #DataSourceName, #Command, #CommandType, -#Connection, #Selection, #ResultSet, +#ActiveConnection, #Selection, #ResultSet, #Filter and #EscapeProcessing */ service com::sun::star::sdb::DataAccessDescriptor; @@ -129,8 +129,8 @@ published service MailMerge com::sun::star::sdbcx::XRowLocate interface. If this array is empty, the whole result set, as described by #ResultSet -respectively the triple (#DataSourceName, #DataCommandType, -#DataCommand). +respectively the triple (#DataSourceName, #CommandType, +#Command). For the interaction of this property with other data access relevant properties, see the com::sun::star::sdb::DataAccessDescriptor service. ___
[Libreoffice-commits] core.git: 2 commits - offapi/com udkapi/com
offapi/com/sun/star/deployment/ui/UpdateRequiredDialog.idl |2 -- offapi/com/sun/star/document/XDocumentRecovery.idl |2 +- offapi/com/sun/star/presentation/EffectNodeType.idl |2 +- offapi/com/sun/star/presentation/EffectPresetClass.idl |2 +- offapi/com/sun/star/presentation/TextAnimationType.idl |6 +++--- offapi/com/sun/star/presentation/XTransitionFactory.idl |4 ++-- offapi/com/sun/star/report/XReportDefinition.idl|8 offapi/com/sun/star/sdb/DataSource.idl |4 ++-- offapi/com/sun/star/sdb/DocumentContainer.idl |2 +- offapi/com/sun/star/sdb/XSingleSelectQueryAnalyzer.idl |2 +- offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl |2 +- udkapi/com/sun/star/reflection/XCompoundTypeDescription.idl |2 +- udkapi/com/sun/star/reflection/XIdlField2.idl |4 ++-- 13 files changed, 20 insertions(+), 22 deletions(-) New commits: commit 6850485b54ed77698b7c9622f437c9c7e1358ef4 Author: Julien Nabet Date: Sat Jun 29 07:41:02 2013 +0200 Fix some idl descriptions Change-Id: I7a986f39baf515b19255851f38600f112fe8b021 diff --git a/offapi/com/sun/star/report/XReportDefinition.idl b/offapi/com/sun/star/report/XReportDefinition.idl index a4ddd25..da38c86 100644 --- a/offapi/com/sun/star/report/XReportDefinition.idl +++ b/offapi/com/sun/star/report/XReportDefinition.idl @@ -255,7 +255,7 @@ interface XReportDefinition */ [attribute,readonly] com::sun::star::report::XGroups Groups; -/** returns the report header if the #ReportHeaderOnis `TRUE`. +/** returns the report header if the #ReportHeaderOn is `TRUE`. @throws com::sun::star::container::NoSuchElementException If the report has the report header disabled. @see XSection @@ -265,7 +265,7 @@ interface XReportDefinition get raises (com::sun::star::container::NoSuchElementException); }; -/** returns the page header if the #PageHeaderOnis `TRUE`. +/** returns the page header if the #PageHeaderOn is `TRUE`. @throws com::sun::star::container::NoSuchElementException If the report has the page header disabled. @see XSection @@ -280,7 +280,7 @@ interface XReportDefinition */ [attribute,readonly] com::sun::star::report::XSection Detail; -/** returns the page footer if the #PageFooterOnis `TRUE`. +/** returns the page footer if the #PageFooterOn is `TRUE`. @throws com::sun::star::container::NoSuchElementException If the report has the page footer disabled. @see XSection @@ -290,7 +290,7 @@ interface XReportDefinition get raises (com::sun::star::container::NoSuchElementException); }; -/** returns the report footer if the #ReportFooterOnis `TRUE`. +/** returns the report footer if the #ReportFooterOn is `TRUE`. @throws com::sun::star::container::NullPointerException If the report has the report footer disabled. @see XSection diff --git a/offapi/com/sun/star/sdb/DataSource.idl b/offapi/com/sun/star/sdb/DataSource.idl index 6909680..6635950 100644 --- a/offapi/com/sun/star/sdb/DataSource.idl +++ b/offapi/com/sun/star/sdb/DataSource.idl @@ -143,7 +143,7 @@ published service DataSource of an existing value), the #Settings property wraps the #Info property for easier single-value access. -You should use the #Setting property if you need to access a few properties only, +You should use the #Settings property if you need to access a few properties only, and the #Info property if you need access to all existent settings at once. The object represented by this property supports the com::sun::star::beans::PropertyBag @@ -164,7 +164,7 @@ published service DataSource Such properties are not removable from the bag, that is, their com::sun::star::beans::PropertyAttribute::REMOVABLE attribute is not set. Usually, you'll find that all of this properties have the -com::sun::star::beansPropertyState::PropertyState_DEFAULT_VALUE state. +com::sun::star::beans::PropertyState::PropertyState_DEFAULT_VALUE state. User-defined properties are the ones which are added at runtime by any instance. They might or might not be removable, this depends on whether or not the code adding them specifies the diff --git a/offapi/com/sun/star/sdb/DocumentContainer.idl b/offapi/com/sun/star/sdb/DocumentContainer.idl index 1386566..911cb0b 100644 --- a/offapi/com/sun/star/sdb/DocumentContainer.idl +++ b/offapi/com/sun/star/sdb/DocumentContainer.idl @@ -67,7 +67,7 @@ service DocumentContainer of a DocumentDefinition supports at least the following commands, additionally to the ones already supported by the DefinitionContent: -open: provides a com::sun::star::uc
[Libreoffice-commits] core.git: 2 commits - sc/source
sc/source/ui/condformat/condformatdlgentry.cxx | 59 -
sc/source/ui/inc/condformatdlgentry.hxx| 14 +
2 files changed, 69 insertions(+), 4 deletions(-)
New commits:
commit def32c7e14ad9743e2b55804442be5d596f6c21c
Author: Markus Mohrhard
Date: Sat Jun 29 05:38:37 2013 +0200
hide the style boxes to collapse the date entries fully
Change-Id: I58f06a57a05ef007afc203c737acfe29df6ea6a3
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index e0f78a5..2fb93e0 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -1258,6 +1258,7 @@ void ScDateFrmtEntry::SetActive()
maLbDateEntry.Show();
maFtStyle.Show();
maWdPreview.Show();
+maLbStyle.Show();
Select();
}
@@ -1267,6 +1268,7 @@ void ScDateFrmtEntry::SetInactive()
maLbDateEntry.Hide();
maFtStyle.Hide();
maWdPreview.Hide();
+maLbStyle.Hide();
Deselect();
}
commit aa028cab4a72660c773a9eac0cd8a19a0d655c01
Author: Markus Mohrhard
Date: Sat Jun 29 05:16:14 2013 +0200
update all style lists when a new style is added
Change-Id: Ib404958e2bc0e3bfe075d1c94f348e907ee004c8
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 46feaa8..e0f78a5 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -167,7 +167,8 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window*
pParent, ScDocument* pDoc, c
maEdVal2( this, NULL, NULL, ScResId( ED_VAL2 ) ),
maFtStyle( this, ScResId( FT_STYLE ) ),
maLbStyle( this, ScResId( LB_STYLE ) ),
-maWdPreview( this, ScResId( WD_PREVIEW ) )
+maWdPreview( this, ScResId( WD_PREVIEW ) ),
+mbIsInStyleCreate(false)
{
FreeResource();
@@ -175,6 +176,8 @@ ScConditionFrmtEntry::ScConditionFrmtEntry( Window*
pParent, ScDocument* pDoc, c
Init();
+StartListening(*pDoc->GetStyleSheetPool(), true);
+
if(pFormatEntry)
{
OUString aStyleName = pFormatEntry->GetStyle();
@@ -436,6 +439,35 @@ void ScConditionFrmtEntry::SetInactive()
namespace {
+void UpdateStyleList(ListBox& rLbStyle, ScDocument* pDoc)
+{
+OUString aSelectedStyle = rLbStyle.GetSelectEntry();
+for(sal_Int32 i = rLbStyle.GetEntryCount(); i >= 1; --i)
+{
+rLbStyle.RemoveEntry(i);
+}
+FillStyleListBox(pDoc, rLbStyle);
+rLbStyle.SelectEntry(aSelectedStyle);
+}
+
+}
+
+void ScConditionFrmtEntry::Notify(SfxBroadcaster&, const SfxHint& rHint)
+{
+SfxStyleSheetHint* pHint = PTR_CAST(SfxStyleSheetHint, &rHint);
+if(!pHint)
+return;
+
+sal_uInt16 nHint = pHint->GetHint();
+if(nHint == SFX_STYLESHEET_MODIFIED)
+{
+if(!mbIsInStyleCreate)
+UpdateStyleList(maLbStyle, mpDoc);
+}
+}
+
+namespace {
+
void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc, SvxFontPrevWindow&
rWdPreview )
{
if(rLbStyle.GetSelectEntryPos() == 0)
@@ -503,7 +535,9 @@ void StyleSelect( ListBox& rLbStyle, ScDocument* pDoc,
SvxFontPrevWindow& rWdPre
IMPL_LINK_NOARG(ScConditionFrmtEntry, StyleSelectHdl)
{
+mbIsInStyleCreate = true;
StyleSelect( maLbStyle, mpDoc, maWdPreview );
+mbIsInStyleCreate = false;
return 0;
}
@@ -1189,11 +1223,14 @@ ScDateFrmtEntry::ScDateFrmtEntry( Window* pParent,
ScDocument* pDoc, const ScCon
maLbDateEntry( this, ScResId( LB_DATE_TYPE ) ),
maFtStyle( this, ScResId( FT_STYLE ) ),
maLbStyle( this, ScResId( LB_STYLE ) ),
-maWdPreview( this, ScResId( WD_PREVIEW ) )
+maWdPreview( this, ScResId( WD_PREVIEW ) ),
+mbIsInStyleCreate(false)
{
Init();
FreeResource();
+StartListening(*pDoc->GetStyleSheetPool(), sal_True);
+
if(pFormat)
{
sal_Int32 nPos = static_cast(pFormat->GetDateType());
@@ -1234,6 +1271,20 @@ void ScDateFrmtEntry::SetInactive()
Deselect();
}
+void ScDateFrmtEntry::Notify( SfxBroadcaster&, const SfxHint& rHint )
+{
+SfxStyleSheetHint* pHint = PTR_CAST(SfxStyleSheetHint, &rHint);
+if(!pHint)
+return;
+
+sal_uInt16 nHint = pHint->GetHint();
+if(nHint == SFX_STYLESHEET_MODIFIED)
+{
+if(!mbIsInStyleCreate)
+UpdateStyleList(maLbStyle, mpDoc);
+}
+}
+
ScFormatEntry* ScDateFrmtEntry::GetEntry() const
{
ScCondDateFormatEntry* pNewEntry = new ScCondDateFormatEntry(mpDoc);
@@ -1250,7 +1301,9 @@ OUString ScDateFrmtEntry::GetExpressionString()
IMPL_LINK_NOARG( ScDateFrmtEntry, StyleSelectHdl )
{
+mbIsInStyleCreate = true;
StyleSelect( maLbStyle, mpDoc, maWdPreview );
+mbIsInStyleCreate = false;
return 0;
}
diff --git a/sc/source/ui/inc/condformatdlgentry.hxx
b/sc/source/ui/inc/condformatdlgentry.hxx
index 7727d28..77054ab 100644
--- a/sc/source/ui/inc/condformatdlgentry.hxx
+++ b/sc/source/ui/inc/condformatdlgentry.hxx
[Libreoffice-commits] core.git: 4 commits - sc/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/inc/colorscale.hxx | 19 ---
sc/inc/stylehelper.hxx | 29 ++
sc/inc/styleuno.hxx|9 -
sc/source/core/data/colorscale.cxx | 18 +++
sc/source/core/data/table2.cxx |2
sc/source/core/tool/stylehelper.cxx| 157 +
sc/source/filter/xml/xmlcondformat.cxx |5 -
sc/source/filter/xml/xmlexprt.cxx |6 -
sc/source/ui/unoobj/cellsuno.cxx |1
sc/source/ui/unoobj/fmtuno.cxx |1
sc/source/ui/unoobj/styleuno.cxx | 143 --
12 files changed, 217 insertions(+), 174 deletions(-)
New commits:
commit 5b9bad7482a98f2d0d37c4b75a13292abe653ea3
Author: Markus Mohrhard
Date: Sat Jun 29 02:50:48 2013 +0200
handle localized default style names, fdo#61339
We need to map localized style names during import and export from and
to ODF. The default styles are the only localized style names and are
not imported with the name written into the file.
Change-Id: Ibdc2f750b7a4b7ce6994b22248e237fe95ac638d
diff --git a/sc/source/filter/xml/xmlcondformat.cxx
b/sc/source/filter/xml/xmlcondformat.cxx
index 41f4f3d..afeec54 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -18,6 +18,7 @@
#include "rangeutl.hxx"
#include "docfunc.hxx"
#include "XMLConverter.hxx"
+#include "stylehelper.hxx"
ScXMLConditionalFormatsContext::ScXMLConditionalFormatsContext( ScXMLImport&
rImport, sal_uInt16 nPrfx,
@@ -566,7 +567,7 @@ ScXMLCondContext::ScXMLCondContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
sExpression = sValue;
break;
case XML_TOK_CONDITION_APPLY_STYLE_NAME:
-sStyle = sValue;
+sStyle =
ScStyleNameConversion::ProgrammaticToDisplayName(sValue, SFX_STYLE_FAMILY_PARA
);
break;
case XML_TOK_CONDITION_BASE_CELL_ADDRESS:
sAddress = sValue;
@@ -764,7 +765,7 @@ ScXMLDateContext::ScXMLDateContext( ScXMLImport& rImport,
sal_uInt16 nPrfx,
sDateType = sValue;
break;
case XML_TOK_COND_DATE_STYLE:
-sStyle = sValue;
+sStyle =
ScStyleNameConversion::ProgrammaticToDisplayName(sValue, SFX_STYLE_FAMILY_PARA
);
break;
default:
break;
diff --git a/sc/source/filter/xml/xmlexprt.cxx
b/sc/source/filter/xml/xmlexprt.cxx
index 3c4a2b1..3dcb8ba 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -59,6 +59,7 @@
#include "colorscale.hxx"
#include "conditio.hxx"
#include "cellvalue.hxx"
+#include "stylehelper.hxx"
#include
#include
@@ -4000,7 +4001,7 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
default:
SAL_WARN("sc", "unimplemented conditional
format export");
}
-OUString sStyle = pEntry->GetStyle();
+OUString sStyle =
ScStyleNameConversion::DisplayToProgrammaticName(pEntry->GetStyle(),
SFX_STYLE_FAMILY_PARA);
AddAttribute(XML_NAMESPACE_CALC_EXT,
XML_APPLY_STYLE_NAME, sStyle);
AddAttribute(XML_NAMESPACE_CALC_EXT, XML_VALUE,
aCond.makeStringAndClear());
@@ -4127,7 +4128,8 @@ void ScXMLExport::ExportConditionalFormat(SCTAB nTab)
{
const ScCondDateFormatEntry& mrDateFormat =
static_cast(*pFormatEntry);
OUString aDateType =
getDateStringForType(mrDateFormat.GetDateType());
-AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE,
mrDateFormat.GetStyleName());
+OUString aStyleName =
ScStyleNameConversion::DisplayToProgrammaticName(mrDateFormat.GetStyleName(),
SFX_STYLE_FAMILY_PARA );
+AddAttribute( XML_NAMESPACE_CALC_EXT, XML_STYLE,
aStyleName);
AddAttribute( XML_NAMESPACE_CALC_EXT, XML_DATE,
aDateType);
SvXMLElementExport aElementDateFormat(*this,
XML_NAMESPACE_CALC_EXT, XML_DATE_IS, true, true);
}
commit b3aabf223ec7bc2678fd6dfb79ab7f079e5b
Author: Markus Mohrhard
Date: Sat Jun 29 02:06:25 2013 +0200
extract this functionality from the uno code
we need this code in our next step for some mappings in the filters code
Change-Id: I059d9d05877846215e1a967123dc253de605417e
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 58a5406..c1d12a2 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -252,6 +252,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/scopetools \
sc/source/core/tool/simplerangelist \
sc/source/core/tool/stringutil \
+ sc/source/core/tool
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 5 commits - sc/inc sc/qa sc/source
sc/inc/calcmacros.hxx| 24
sc/inc/column.hxx|4 +
sc/inc/document.hxx |5 +
sc/inc/dpcache.hxx |2
sc/inc/dpfilteredcache.hxx |2
sc/inc/dpitemdata.hxx|2
sc/inc/dpmacros.hxx | 23
sc/inc/dpnumgroupinfo.hxx|2
sc/inc/dpobject.hxx |2
sc/inc/dptabdat.hxx |2
sc/inc/dptabres.hxx |2
sc/inc/mtvelements.hxx |3 -
sc/inc/pivot.hxx |2
sc/inc/scmatrix.hxx |3 +
sc/inc/table.hxx |5 +
sc/qa/unit/ucalc.cxx | 19 ++
sc/source/core/data/column2.cxx | 40 ++
sc/source/core/data/documen9.cxx |3 -
sc/source/core/data/document.cxx | 11 +++
sc/source/core/data/dptabsrc.cxx |2
sc/source/core/data/table1.cxx | 10 +++
sc/source/core/tool/interpr1.cxx | 65 --
sc/source/core/tool/scmatrix.cxx | 111 +++
sc/source/ui/dbgui/fieldwnd.cxx |2
24 files changed, 245 insertions(+), 101 deletions(-)
New commits:
commit 8fa433e962b7e0779bd6f430b74be0d4d96d9c27
Author: Kohei Yoshida
Date: Fri Jun 28 19:37:50 2013 -0400
Add tests for matrix's min and max values, and fix one bug.
Apparently numeric_limits::min() is not to be used for signed types.
Change-Id: Ia9730328562905459eb1d3e5cfd1a023c644e219
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 9fc681e..d05b7eb 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2498,6 +2498,25 @@ void Test::testMatrix()
CPPUNIT_ASSERT_EQUAL(1.5, pMat->GetDouble(0, 1));
CPPUNIT_ASSERT_EQUAL(1.5, pMat->GetDouble(1, 0));
CPPUNIT_ASSERT_MESSAGE("PutEmpty() call failed.", pMat->IsEmpty(1, 1));
+
+// Max and min values.
+pMat = new ScMatrix(2, 2, 0.0);
+pMat->PutDouble(-10, 0, 0);
+pMat->PutDouble(-12, 0, 1);
+pMat->PutDouble(-8, 1, 0);
+pMat->PutDouble(-25, 1, 1);
+CPPUNIT_ASSERT_EQUAL(-25.0, pMat->GetMinValue(false));
+CPPUNIT_ASSERT_EQUAL(-8.0, pMat->GetMaxValue(false));
+pMat->PutString("Test", 0, 0);
+CPPUNIT_ASSERT_EQUAL(0.0, pMat->GetMaxValue(true)); // text as zero.
+CPPUNIT_ASSERT_EQUAL(-8.0, pMat->GetMaxValue(false)); // ignore text.
+pMat->PutBoolean(true, 0, 0);
+CPPUNIT_ASSERT_EQUAL(1.0, pMat->GetMaxValue(false));
+pMat = new ScMatrix(2, 2, 10.0);
+pMat->PutBoolean(false, 0, 0);
+pMat->PutDouble(12.5, 1, 1);
+CPPUNIT_ASSERT_EQUAL(0.0, pMat->GetMinValue(false));
+CPPUNIT_ASSERT_EQUAL(12.5, pMat->GetMaxValue(false));
}
void Test::testEnterMixedMatrix()
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index bf3ea63..b0bef2e 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -940,7 +940,7 @@ public:
struct MaxOp
{
-static double init() { return std::numeric_limits::min(); }
+static double init() { return -std::numeric_limits::max(); }
static double compare(double left, double right)
{
return std::max(left, right);
commit c6725f9a65d020294de22dd3de475ccf157e9e77
Author: Kohei Yoshida
Date: Fri Jun 28 17:54:34 2013 -0400
Better to calculate max and min value of matrix *in* the matrix itself.
Change-Id: I410b345ac32550a188aa356e133ef8e0e9b13d9f
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 66b271b..d6ac279 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -349,6 +349,9 @@ public:
IterateResult Product(bool bTextAsZero) const;
size_t Count(bool bCountStrings) const;
+double GetMaxValue( bool bTextAsZero ) const;
+double GetMinValue( bool bTextAsZero ) const;
+
// All other matrix functions MatMult, MInv, ... are in ScInterpreter
// to be numerically safe.
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index ce0ce41..44a32c2 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3728,39 +3728,7 @@ void ScInterpreter::ScMin( bool bTextAsZero )
{
ScMatrixRef pMat = GetMatrix();
if (pMat)
-{
-SCSIZE nC, nR;
-nFuncFmtType = NUMBERFORMAT_NUMBER;
-pMat->GetDimensions(nC, nR);
-if (pMat->IsNumeric())
-{
-for (SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++)
-for (SCSIZE nMatRow = 0; nMatRow < nR; nMatRow++)
-{
-nVal = pMat->GetDouble(nMatCol,nMatRow);
-if (nMin > nVal) nMin = nVal;
-}
-}
-else
-{
-for (SCSIZE nMatCol = 0; nMatCol < nC;
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/qa sc/source
sc/qa/unit/ucalc.cxx | 19 +++
sc/source/core/tool/scmatrix.cxx |2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
New commits:
commit 93a1f731c17059d1e5d254061dcee7c4a6781859
Author: Kohei Yoshida
Date: Fri Jun 28 19:37:50 2013 -0400
Add tests for matrix's min and max values, and fix one bug.
Apparently numeric_limits::min() is not to be used for signed types.
Change-Id: Ia9730328562905459eb1d3e5cfd1a023c644e219
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index be470b1..c7eda91 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -2562,6 +2562,25 @@ void Test::testMatrix()
CPPUNIT_ASSERT_EQUAL(1.5, pMat->GetDouble(0, 1));
CPPUNIT_ASSERT_EQUAL(1.5, pMat->GetDouble(1, 0));
CPPUNIT_ASSERT_MESSAGE("PutEmpty() call failed.", pMat->IsEmpty(1, 1));
+
+// Max and min values.
+pMat = new ScMatrix(2, 2, 0.0);
+pMat->PutDouble(-10, 0, 0);
+pMat->PutDouble(-12, 0, 1);
+pMat->PutDouble(-8, 1, 0);
+pMat->PutDouble(-25, 1, 1);
+CPPUNIT_ASSERT_EQUAL(-25.0, pMat->GetMinValue(false));
+CPPUNIT_ASSERT_EQUAL(-8.0, pMat->GetMaxValue(false));
+pMat->PutString("Test", 0, 0);
+CPPUNIT_ASSERT_EQUAL(0.0, pMat->GetMaxValue(true)); // text as zero.
+CPPUNIT_ASSERT_EQUAL(-8.0, pMat->GetMaxValue(false)); // ignore text.
+pMat->PutBoolean(true, 0, 0);
+CPPUNIT_ASSERT_EQUAL(1.0, pMat->GetMaxValue(false));
+pMat = new ScMatrix(2, 2, 10.0);
+pMat->PutBoolean(false, 0, 0);
+pMat->PutDouble(12.5, 1, 1);
+CPPUNIT_ASSERT_EQUAL(0.0, pMat->GetMinValue(false));
+CPPUNIT_ASSERT_EQUAL(12.5, pMat->GetMaxValue(false));
}
void Test::testEnterMixedMatrix()
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index bf3ea63..b0bef2e 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -940,7 +940,7 @@ public:
struct MaxOp
{
-static double init() { return std::numeric_limits::min(); }
+static double init() { return -std::numeric_limits::max(); }
static double compare(double left, double right)
{
return std::max(left, right);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/inc sc/source xmloff/source
sc/inc/colorscale.hxx | 35 +
sc/inc/conditio.hxx|2
sc/source/core/data/colorscale.cxx | 154 -
sc/source/core/data/conditio.cxx | 17 ++
sc/source/ui/condformat/condformatdlgentry.cxx | 28 ++--
xmloff/source/chart/SchXMLTableContext.cxx | 118 +++
6 files changed, 338 insertions(+), 16 deletions(-)
New commits:
commit 17cb1d6d82db56761c86ee95195689cc155901b3
Author: Markus Mohrhard
Date: Fri Jun 28 23:28:36 2013 +0200
allow these cond formats to be updated when formula val changes,fdo#64401
When the formulas depend on cells outside of the paint range we need to
update the whole range. This approach will update the range more often
than necessary but prevents that we need to mess with ScFormulaCell.
In the future we should replace ScFormulaCell in this part of the code
with something simpler that will correctly fix this problem.
Change-Id: Ie8a8e5205f9ea1e43bb6d9f8bee6e0bab29e4840
diff --git a/sc/inc/colorscale.hxx b/sc/inc/colorscale.hxx
index 5a390de6..832e09b 100644
--- a/sc/inc/colorscale.hxx
+++ b/sc/inc/colorscale.hxx
@@ -17,6 +17,9 @@
#include
#include "conditio.hxx"
+#include
+#include
+
#include
//TODO: merge this with conditio.hxx
@@ -27,6 +30,24 @@ class ScTokenArray;
struct ScDataBarInfo;
class BitmapEx;
+class ScFormulaListener : public SvtListener
+{
+private:
+std::vector maCells;
+mutable bool mbDirty;
+ScDocument* mpDoc;
+
+void startListening(ScTokenArray* pTokens, const ScAddress& rPos);
+
+public:
+ScFormulaListener(ScFormulaCell* pCell);
+virtual ~ScFormulaListener();
+
+void Notify( SvtBroadcaster& rBC, const SfxHint& rHint );
+
+bool NeedsRepaint() const;
+};
+
// don't change the order
// they are also used in the dialog to determine the position
// in the list box
@@ -47,6 +68,7 @@ private:
double mnVal;
Color maColor;
boost::scoped_ptr mpCell;
+boost::scoped_ptr mpListener;
ScColorScaleEntryType meType;
public:
@@ -60,7 +82,9 @@ public:
void SetColor(const Color&);
double GetValue() const;
void SetValue(double nValue);
-void SetFormula(const OUString& rFormula, ScDocument* pDoc, const
ScAddress& rAddr, formula::FormulaGrammar::Grammar eGrammar =
formula::FormulaGrammar::GRAM_DEFAULT);
+void SetFormula(const OUString& rFormula, ScDocument* pDoc, const
ScAddress& rAddr,
+formula::FormulaGrammar::Grammar eGrammar =
formula::FormulaGrammar::GRAM_DEFAULT);
+
void UpdateMoveTab(SCTAB nOldTab, SCTAB nNewTab, SCTAB nTabNo);
void UpdateReference( UpdateRefMode eUpdateRefMode,
const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
@@ -71,6 +95,7 @@ public:
ScColorScaleEntryType GetType() const;
void SetType( ScColorScaleEntryType eType );
+bool NeedsRepaint() const;
};
namespace databar
@@ -200,6 +225,8 @@ public:
virtual void startRendering();
virtual void endRendering();
+virtual bool NeedsRepaint() const = 0;
+
protected:
std::vector& getValues() const;
@@ -243,6 +270,8 @@ public:
virtual void UpdateReference( UpdateRefMode eUpdateRefMode,
const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+virtual bool NeedsRepaint() const;
+
virtual condformat::ScFormatEntryType GetType() const;
typedef ColorScaleEntries::iterator iterator;
typedef ColorScaleEntries::const_iterator const_iterator;
@@ -271,6 +300,8 @@ public:
virtual void UpdateReference( UpdateRefMode eUpdateRefMode,
const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+virtual bool NeedsRepaint() const;
+
virtual condformat::ScFormatEntryType GetType() const;
private:
@@ -313,6 +344,8 @@ public:
virtual void UpdateReference( UpdateRefMode eUpdateRefMode,
const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz );
+virtual bool NeedsRepaint() const;
+
virtual condformat::ScFormatEntryType GetType() const;
static ScIconSetMap* getIconSetMap();
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 87cfcc3..42ad1f7 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -390,6 +390,8 @@ public:
// don't use the same name as for the const version
ScRangeList& GetRangeList() { return maRanges; }
+ScDocument* GetDocument() { return pDoc; }
+
bool IsEmpty() const;
size_t size() const;
diff --git a/sc/source/core/data/colorscale.cxx
b/sc/source/core/data/colorscale.cxx
index 70865be..9d4d71b 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -13,12 +13,117 @@
#include "fillinfo.hxx"
#include "iconsets.hrc"
#include "scresid.hxx"
+#include "tokenarray.hxx"
+
+#include "formula/token.hxx"
#include
+ScFormulaListener::ScFormulaListener(ScFormulaCell* pCell):
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - officecfg/registry sd/Package_xml.mk sd/source sd/xml test/Package_unittest.mk
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 14 ++
sd/Package_xml.mk |1
sd/source/core/sdpage.cxx | 59 +++-
sd/xml/layoutlist.xml |8 +
test/Package_unittest.mk|1
5 files changed, 79 insertions(+), 4 deletions(-)
New commits:
commit e2a23779c42a4b252706794dd7e89e975804c50e
Author: Vishv Brahmbhatt
Date: Sat Jun 29 02:55:37 2013 +0530
Changing the XML parser with configuration file path
Updating the "getRootElement" function.So "layoutlist.xml" can be read from
actual configuration path.
Change-Id: Iee636d32e629e935e46a18572646659780ae20e3
diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
index 8161806..fcb0e74 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs
@@ -468,6 +468,20 @@
List of files containing object effects
vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml
+
+
+
+
+
+
+Contains a list of layout type.It contains
+properties of presobj like their Position,
+Height and Width
+
+ List of files containing list of layouts
+
+vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/layoutlist.xml
+
diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
index 94e9607..3c997e0 100644
--- a/sd/Package_xml.mk
+++ b/sd/Package_xml.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_Package_set_outdir,sd_xml,$(INSTDIR)))
$(eval $(call gb_Package_add_files,sd_xml,share/config/soffice.cfg/simpress,\
effects.xml \
transitions.xml \
+ layoutlist.xml \
))
# vim: set noet sw=4 ts=4:
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 9dbe297..1bcda69 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -57,6 +57,15 @@
#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include "../ui/inc/DrawDocShell.hxx"
#include "Outliner.hxx"
@@ -81,9 +90,15 @@
using namespace ::sd;
using namespace ::com::sun::star;
+using namespace ::com::sun::star::uno;
using namespace com::sun::star::xml::dom;
using ::com::sun::star::uno::Reference;
+using ::com::sun::star::io::XInputStream;
+using ::com::sun::star::lang::XMultiServiceFactory;
+using ::com::sun::star::container::XNameAccess;
+using ::com::sun::star::beans::PropertyValue;
+
TYPEINIT2( SdPage, FmFormPage, SdrObjUserCall );
@@ -1173,15 +1188,51 @@ static const LayoutDescriptor& GetLayoutDescriptor(
AutoLayout eLayout )
return aLayouts[ eLayout - AUTOLAYOUT__START ];
}
+#define EXPAND_PROTOCOL "vnd.sun.star.expand:"
//to get the root element of the xml file
Reference getRootElement()
{
rtl::OUString filepath="/home/vishv/layoutlist.xml";
const Reference
xContext(comphelper_getProcessComponentContext());
-const Reference
xDocBuilder(css::xml::dom::DocumentBuilder::create(xContext));
-const Reference xDoc = xDocBuilder->parseURI(filepath);
-const Reference xRoot = xDoc->getDocumentElement();
-return xRoot;
+Reference< XMultiServiceFactory >
xServiceFactory(xContext->getServiceManager(), UNO_QUERY_THROW );
+Reference< util::XMacroExpander > xMacroExpander
=util::theMacroExpander::get(xContext);
+Reference< XMultiServiceFactory > xConfigProvider
=configuration::theDefaultProvider::get( xContext );
+ // read path to transition effects files from config
+Any propValue = uno::makeAny(
+beans::PropertyValue(
+"nodepath", -1,
+uno::makeAny( OUString( "/org.openoffice.Office.Impress/Misc" )),
+beans::PropertyState_DIRECT_VALUE ) );
+
+Reference xNameAccess(
+xConfigProvider->createInstanceWithArguments(
+"com.sun.star.configuration.ConfigurationAccess",
+Sequence( &propValue, 1 ) ), UNO_QUERY_THROW );
+uno::Sequence< OUString > aFiles;
+xNameAccess->getByName( "LayoutListFiles" ) >>= aFiles;
+
+for( sal_Int32 i=0; iexpandMacros( aMacro );
+}
+SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL,
STREAM_READ );
+::utl::OInputStreamWrapper* isw=new ::utl::OInputStreamWrapper( pIStm);
+Reference xIs(isw);
+
+rtl::OUString sServName =
rtl::OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder");
+Reference xDb(
xServiceFactory->createInstance(sServName), UNO_QUERY);
+const Reference xDom(xDb->parse(xIs), UNO_QUERY_THROW );
+const Reference xRoot(
xDom->getDocumentElement(),UNO_QU
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/scmatrix.hxx |3 +
sc/source/core/tool/interpr1.cxx | 65 --
sc/source/core/tool/scmatrix.cxx | 111 +++
3 files changed, 116 insertions(+), 63 deletions(-)
New commits:
commit c91c3d161561e6d8e43527b0211ab67de54d47cf
Author: Kohei Yoshida
Date: Fri Jun 28 17:54:34 2013 -0400
Better to calculate max and min value of matrix *in* the matrix itself.
Change-Id: I410b345ac32550a188aa356e133ef8e0e9b13d9f
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 66b271b..d6ac279 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -349,6 +349,9 @@ public:
IterateResult Product(bool bTextAsZero) const;
size_t Count(bool bCountStrings) const;
+double GetMaxValue( bool bTextAsZero ) const;
+double GetMinValue( bool bTextAsZero ) const;
+
// All other matrix functions MatMult, MInv, ... are in ScInterpreter
// to be numerically safe.
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index aa55dcb..9cb89ae 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -3729,39 +3729,7 @@ void ScInterpreter::ScMin( bool bTextAsZero )
{
ScMatrixRef pMat = GetMatrix();
if (pMat)
-{
-SCSIZE nC, nR;
-nFuncFmtType = NUMBERFORMAT_NUMBER;
-pMat->GetDimensions(nC, nR);
-if (pMat->IsNumeric())
-{
-for (SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++)
-for (SCSIZE nMatRow = 0; nMatRow < nR; nMatRow++)
-{
-nVal = pMat->GetDouble(nMatCol,nMatRow);
-if (nMin > nVal) nMin = nVal;
-}
-}
-else
-{
-for (SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++)
-{
-for (SCSIZE nMatRow = 0; nMatRow < nR; nMatRow++)
-{
-if (!pMat->IsString(nMatCol,nMatRow))
-{
-nVal = pMat->GetDouble(nMatCol,nMatRow);
-if (nMin > nVal) nMin = nVal;
-}
-else if ( bTextAsZero )
-{
-if ( nMin > 0.0 )
-nMin = 0.0;
-}
-}
- }
-}
-}
+nMin = pMat->GetMinValue(bTextAsZero);
}
break;
case svString :
@@ -3855,36 +3823,7 @@ void ScInterpreter::ScMax( bool bTextAsZero )
if (pMat)
{
nFuncFmtType = NUMBERFORMAT_NUMBER;
-SCSIZE nC, nR;
-pMat->GetDimensions(nC, nR);
-if (pMat->IsNumeric())
-{
-for (SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++)
-for (SCSIZE nMatRow = 0; nMatRow < nR; nMatRow++)
-{
-nVal = pMat->GetDouble(nMatCol,nMatRow);
-if (nMax < nVal) nMax = nVal;
-}
-}
-else
-{
-for (SCSIZE nMatCol = 0; nMatCol < nC; nMatCol++)
-{
-for (SCSIZE nMatRow = 0; nMatRow < nR; nMatRow++)
-{
-if (!pMat->IsString(nMatCol,nMatRow))
-{
-nVal = pMat->GetDouble(nMatCol,nMatRow);
-if (nMax < nVal) nMax = nVal;
-}
-else if ( bTextAsZero )
-{
-if ( nMax < 0.0 )
-nMax = 0.0;
-}
-}
-}
-}
+nMax = pMat->GetMaxValue(bTextAsZero);
}
}
break;
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 26fe7d3..bf3ea63 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -223,6 +223,9 @@ public:
ScMatrix::IterateResult Product(bool bTextAsZero) const;
size_t Count(bool bCountStrings) const;
+double GetMaxValue( bool bTextAsZero ) const;
[Libreoffice-commits] core.git: svl/README sw/README
svl/README | 38 + sw/README | 79 + 2 files changed, 117 insertions(+) New commits: commit fdf5152552c1df59d73a32cb8ae1f259e5cb4f80 Author: Michael Stahl Date: Fri Jun 28 23:22:43 2013 +0200 more README Change-Id: I569e7fd3cf9e418af03285f4f499f5ea3a0c0dc0 diff --git a/svl/README b/svl/README index 2ab2f1d..c2cca3f 100644 --- a/svl/README +++ b/svl/README @@ -10,3 +10,41 @@ formats, to Chart regression line properties. There are lots of other useful helpers in here for various office tasks; much of this code was originally moved from svx/sfx2. + +== Items, Pools and Sets == + +=== SfxPoolItem === + +A small reference counted piece of data. Many subclasses, each with a +unique integer to identify its type (WhichId). Can be compared for equality +(operator==), Clone()d, and converted to/from uno::Any (QueryValue/PutValue). + +A pool item may have value semantics (SFX_ITEM_POOLABLE), meaning that +there will generally be only one instance that compares equal per item pool, +or not, in which case the item will be Clone()d quite a bit. + +=== SfxItemPool === + +Usually there is one item pool per document, with a range of valid WhichIds +that is specific to the type of document. + +The item pool owns all instances of SfxPoolItem or its subclasses that have +ever been added to an item set. It also contains a default item for +every WhichId, which will be (depending on parameters) returned from item +sets if the set does not contain an item at this WhichId. + +=== SfxItemSet === + +The item set can be created with a user-supplied range of WhichIds; it +will accept SfxPoolItems with matching WhichIds and ignore attempts to +insert items with non-matching WhichIds. + +Items that are succesfully inserted into the set will be stored in the +set's SfxItemPool, and for poolable items only a single instance that +compares equal under the predicate operator== will be stored in the pool, +regardless of how many sets contain it, thus conserving memory. + +There are members _pWhichRanges for the valid ranges (as pairs of WhichIds), +_nCount for the number of items contained, and _aItems for the pointers to +the actual items. + diff --git a/sw/README b/sw/README index 1b979dd..f78020ad 100644 --- a/sw/README +++ b/sw/README @@ -25,3 +25,82 @@ comments show that Writer core dates back until at least November * ww8: DOC import, DOC/DOCX/RTF export * xml: ODF import/export, subclassed from xmloff (where most of the work is done) * ui: user interface + +== Core == + +There is a good overview documentation of basic architecture of Writer core +in the OOo wiki: + +http://wiki.openoffice.org/wiki/Writer/Core_And_Layout +http://wiki.openoffice.org/wiki/Writer/Text_Formatting + +Writer specific WhichIds are defined in sw/inc/hintids.hxx. + +The details below are mainly about details missing from the Wiki pages. + +=== SwDoc === + +The central class for a document is SwDoc, which represents a document. + +This is a huge class with hundreds of methods; there are some efforts +to split up the class into many smaller classes that implement more +specific interfaces but this is not fully implemented yet; see the various +IDocument* classes. + +=== SwNodes === + +Basically a (fancy) array of SwNode pointers. There are special subclasses of +SwNode (SwStartNode and SwEndNode) which are used to encode a nested tree +structure into the flat array; the range of nodes from SwStartNode to its +corresponding SwEndNode is sometimes called a "section" (but is not necessarily +what the high-level document model calls a "Section"; that is just one of the +possibilities). + +The SwNodes contains the following top-level sections: + +1. Empty +2. Footnote content +3. Frame / Header / Footer content +4. Deleted Change Tracking content +5. Body content + +=== Undo === + +The Undo/Redo information is stored in a sw::UndoManager member of SwDoc, +which implements the IDocumentUndoRedo interface. +Its members include a SwNodes array containing the document content that +is currently not in the actual document but required for Undo/Redo, and +a stack of SwUndo actions, each of which represents one user-visible +Undo/Redo step. + +There are also ListActions which internally contain several individual SwUndo +actions; these are created by the StartUndo/EndUndo wrapper methods. + +=== Text Attributes === + +The sub-structure of paragraphs is stored in the SwpHintsArray member +SwTxtNode::m_pSwpHints. There is a base class SwTxtAttr with numerous +subclasses; the SwTxtAttr has a start and end index and a SfxPoolItem +to store the actual formatting attribute. + +There are several sub-categories of SwTxtAttr: + +- formatting attributes: Character Styles (SwTxtCharFmt, RES_TXTATR_CHARFMT) + and Automatic Styles (no special class, RES_TXTATR_AUTOFMT): + these are handled by SwpHintsArray::BuildPortions and MergePortions, + which crea
[Libreoffice-commits] core.git: Branch 'feature/polynomialregression' - 4 commits - chart2/source offapi/com oox/source sc/source
chart2/source/controller/dialogs/dlg_InsertTrendline.src |
2
chart2/source/controller/dialogs/res_Trendline.cxx |
56 +
chart2/source/controller/dialogs/res_Trendline.hxx |
6
chart2/source/controller/dialogs/res_Trendline_IDs.hrc |
5
chart2/source/controller/dialogs/res_Trendline_tmpl.hrc |
45 +++-
chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx |
72 +++
chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx |
57 +
chart2/source/inc/PolynomialRegressionCurveCalculator.hxx|
30 +--
chart2/source/inc/RegressionCurveCalculator.hxx |
63 +++---
chart2/source/tools/PolynomialRegressionCurveCalculator.cxx |
96 ++
chart2/source/tools/RegressionCurveCalculator.cxx|
28 +-
chart2/source/tools/RegressionCurveModel.cxx |
18 +
chart2/source/view/charttypes/VSeriesPlotter.cxx |
13 -
chart2/source/view/main/ChartItemPool.cxx|
14 -
offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl|
3
oox/source/drawingml/chart/seriesconverter.cxx |
7
oox/source/export/chartexport.cxx|
14 +
oox/source/token/properties.txt |
2
sc/source/filter/excel/xechart.cxx |
5
sc/source/filter/excel/xichart.cxx |
14 +
sc/source/filter/inc/xlchart.hxx |
2
21 files changed, 435 insertions(+), 117 deletions(-)
New commits:
commit c552b2c507a3df6adc968b81b375a13fcb89f50d
Author: Tomaž Vajngerl
Date: Fri Jun 28 22:58:15 2013 +0200
Force intercept import/export for binary MS office format.
Change-Id: I301762b94b4471e8bb144b63892afdf7f68fed77
diff --git a/sc/source/filter/excel/xechart.cxx
b/sc/source/filter/excel/xechart.cxx
index b0e13ac..b403bab 100644
--- a/sc/source/filter/excel/xechart.cxx
+++ b/sc/source/filter/excel/xechart.cxx
@@ -1731,6 +1731,11 @@ bool XclExpChSerTrendLine::Convert( Reference<
XRegressionCurve > xRegCurve, sal
aCurveProp.GetProperty(maData.mfForecastFor,
EXC_CHPROP_EXTRAPOLATE_FORWARD);
aCurveProp.GetProperty(maData.mfForecastBack,
EXC_CHPROP_EXTRAPOLATE_BACKWARD);
+sal_Bool bIsForceIntercept = false;
+aCurveProp.GetProperty(bIsForceIntercept, EXC_CHPROP_FORCE_INTERCEPT);
+if (bIsForceIntercept)
+aCurveProp.GetProperty(maData.mfIntercept, EXC_CHPROP_INTERCEPT_VALUE);
+
// line formatting
XclChDataPointPos aPointPos( nSeriesIdx );
diff --git a/sc/source/filter/excel/xichart.cxx
b/sc/source/filter/excel/xichart.cxx
index 6ae9237..d2cca4a 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -195,6 +195,13 @@ void lclConvertTimeInterval( Any& rInterval, sal_uInt16
nValue, bool bAuto, sal_
rInterval <<= cssc::TimeInterval( nValue, lclGetApiTimeUnit( nTimeUnit
) );
}
+bool lcl_IsForceIntercept(double intercept)
+{
+sal_math_Double* pIntercept =
reinterpret_cast(&intercept);
+return (pIntercept->w32_parts.msw != 0x ||
+pIntercept->w32_parts.lsw != 0x);
+}
+
} // namespace
// Common =
@@ -1650,6 +1657,13 @@ Reference< XRegressionCurve >
XclImpChSerTrendLine::CreateRegressionCurve() cons
aPropSet.SetProperty(EXC_CHPROP_EXTRAPOLATE_FORWARD,
maData.mfForecastFor);
aPropSet.SetProperty(EXC_CHPROP_EXTRAPOLATE_BACKWARD,
maData.mfForecastBack);
+sal_Bool bForceIntercept = lcl_IsForceIntercept(maData.mfIntercept);
+aPropSet.SetProperty(EXC_CHPROP_FORCE_INTERCEPT, bForceIntercept);
+if (bForceIntercept)
+{
+aPropSet.SetProperty(EXC_CHPROP_INTERCEPT_VALUE,
maData.mfIntercept);
+}
+
// #i83100# show equation and correlation coefficient
ScfPropertySet aLabelProp( xRegCurve->getEquationProperties() );
aLabelProp.SetBoolProperty( EXC_CHPROP_SHOWEQUATION,
maData.mnShowEquation != 0 );
diff --git a/sc/source/filter/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx
index b13d932..4354b5c 100644
--- a/sc/source/filter/inc/xlchart.hxx
+++ b/sc/source/filter/inc/xlchart.hxx
@@ -87,10 +87,12 @@ class XclRoot;
#define EXC_CHPROP_EXTRAPOLATE_BACKWARD "ExtrapolateBackward"
#define EXC_CHPROP_FILLBITMAPMODE "FillBitmapMode"
#define EXC_CHPROP_FILLSTYLE"FillStyle"
+#define EXC_CHPROP_FORCE_INTERCEPT "ForceIntercept"
#define EXC_CHPROP_GAPWIDTHSEQ "GapwidthSequence"
#define EXC_CHPROP_GEOMETRY3D "Geometry3D"
#de
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/documen9.cxx |3 ---
1 file changed, 3 deletions(-)
New commits:
commit 33b265463ede87a25fe3a13ede65c846be5b74d7
Author: Kohei Yoshida
Date: Fri Jun 28 16:38:19 2013 -0400
This is not needed.
Change-Id: I382b9d485b7bb58656561c4790580c9bc6339889
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index c4c1409..3d9110b 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -690,9 +690,6 @@ void ScDocument::ApplyAsianEditSettings(
ScEditEngineDefaulter& rEngine )
void ScDocument::RebuildFormulaGroups()
{
-if (!ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
-return;
-
SCTAB nTab;
for (nTab=0; nTab < static_cast(maTabs.size()); nTab++)
if (maTabs[nTab])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx|4 +++
sc/inc/document.hxx |5
sc/inc/table.hxx |5
sc/source/core/data/column2.cxx | 40 +++
sc/source/core/data/document.cxx | 11 ++
sc/source/core/data/table1.cxx | 10 +
6 files changed, 75 insertions(+)
New commits:
commit 96e92dc1677f3884ec6a1ec3b67148c28b24bd24
Author: Kohei Yoshida
Date: Fri Jun 28 15:49:43 2013 -0400
Add a convenient way to dump formula group states for a single column.
Useful when debugging.
Change-Id: I4e408ad9a3dc2046557d152fcd067c1b0c5645c0
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index 4601ae2..6cc3c4b 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -525,6 +525,10 @@ public:
void FormulaCellsUndecided( SCROW nRow1, SCROW nRow2 );
+#if DEBUG_COLUMN_STORAGE
+void DumpFormulaGroups() const;
+#endif
+
private:
sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 8d942b7..806fb77 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -36,6 +36,7 @@
#include
#include "typedstrdata.hxx"
#include "compressedarray.hxx"
+#include "calcmacros.hxx"
#include
#include
@@ -1984,6 +1985,10 @@ public:
*/
bool HasBroadcaster( SCTAB nTab, SCCOL nCol ) const;
+#if DEBUG_COLUMN_STORAGE
+void DumpFormulaGroups( SCTAB nTab, SCCOL nCol ) const;
+#endif
+
private: // CLOOK-Impl-methods
/**
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index bda039f..03060bb 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -32,6 +32,7 @@
#include "types.hxx"
#include "cellvalue.hxx"
#include "formula/types.hxx"
+#include "calcmacros.hxx"
#include
#include
@@ -857,6 +858,10 @@ public:
void SetFormulaResults( SCCOL nCol, SCROW nRow, const double* pResults,
size_t nLen );
+#if DEBUG_COLUMN_STORAGE
+void DumpFormulaGroups( SCCOL nCol ) const;
+#endif
+
/** Replace behaves differently to the Search; adjust the rCol and rRow
accordingly.
'Replace' replaces at the 'current' position, but in order to achieve
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index a7056d0..ae20e44 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1544,6 +1544,46 @@ void ScColumn::FormulaCellsUndecided( SCROW /*nRow1*/,
SCROW /*nRow2*/ )
{
}
+#if DEBUG_COLUMN_STORAGE
+
+namespace {
+
+struct FormulaGroupDumper : std::unary_function
+{
+void operator() (const sc::CellStoreType::value_type& rNode) const
+{
+if (rNode.type != sc::element_type_formula)
+return;
+
+sc::formula_block::const_iterator it =
sc::formula_block::begin(*rNode.data);
+sc::formula_block::const_iterator itEnd =
sc::formula_block::end(*rNode.data);
+
+for (; it != itEnd; ++it)
+{
+const ScFormulaCell& rCell = **it;
+if (!rCell.IsShared())
+continue;
+
+if (rCell.GetSharedTopRow() != rCell.aPos.Row())
+continue;
+
+SCROW nLen = rCell.GetSharedLength();
+cout << " * group: start=" << rCell.aPos.Row() << ", length=" <<
nLen << endl;
+std::advance(it, nLen-1);
+}
+}
+};
+
+}
+
+void ScColumn::DumpFormulaGroups() const
+{
+cout << "-- formua groups" << endl;
+std::for_each(maCells.begin(), maCells.end(), FormulaGroupDumper());
+cout << "--" << endl;
+}
+#endif
+
void ScColumn::CopyCellTextAttrsToDocument(SCROW nRow1, SCROW nRow2, ScColumn&
rDestCol) const
{
rDestCol.maCellTextAttrs.set_empty(nRow1, nRow2); // Empty the destination
range first.
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 3ce424f..9d3c72f 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -2266,6 +2266,17 @@ bool ScDocument::HasBroadcaster( SCTAB nTab, SCCOL nCol
) const
return pTab->HasBroadcaster(nCol);
}
+#if DEBUG_COLUMN_STORAGE
+void ScDocument::DumpFormulaGroups( SCTAB nTab, SCCOL nCol ) const
+{
+const ScTable* pTab = FetchTable(nTab);
+if (!pTab)
+return;
+
+pTab->DumpFormulaGroups(nCol);
+}
+#endif
+
bool ScDocument::TableExists( SCTAB nTab ) const
{
return ValidTab(nTab) && static_cast(nTab) < maTabs.size() &&
maTabs[nTab];
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index dcd0344..02c8952 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -2221,6 +2221,16 @@ void ScTable::SetFormulaResults( SCCOL nCol, SCROW nRow,
const double* pResults,
aCol[nCol].SetFormulaResults(nRow, pResults, nLen);
}
+#if DEBUG_COLUMN_STORAGE
+void ScTable::DumpFormulaGroups( SCCOL nCol ) const
+{
+if (!ValidCol(nCol))
+return;
+
+aCol[nCol].DumpFormulaGroups();
+}
+#endif
+
const SvtBroad
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/calcmacros.hxx| 24
sc/inc/dpcache.hxx |2 +-
sc/inc/dpfilteredcache.hxx |2 +-
sc/inc/dpitemdata.hxx|2 +-
sc/inc/dpmacros.hxx | 23 ---
sc/inc/dpnumgroupinfo.hxx|2 +-
sc/inc/dpobject.hxx |2 +-
sc/inc/dptabdat.hxx |2 +-
sc/inc/dptabres.hxx |2 +-
sc/inc/mtvelements.hxx |3 +--
sc/inc/pivot.hxx |2 +-
sc/source/core/data/dptabsrc.cxx |2 +-
sc/source/ui/dbgui/fieldwnd.cxx |2 +-
13 files changed, 35 insertions(+), 35 deletions(-)
New commits:
commit 289867cc31e484766ff911a313453323987280e6
Author: Kohei Yoshida
Date: Fri Jun 28 15:22:05 2013 -0400
Start moving all these DEBUG_FOO into calcmacros.hxx.
This header was formerly dpmacros.hxx, now renamed to calcmacros.hxx.
Change-Id: I2ed768b7c5678f5216b1e93df2c0cede0c548be4
diff --git a/sc/inc/dpmacros.hxx b/sc/inc/calcmacros.hxx
similarity index 86%
rename from sc/inc/dpmacros.hxx
rename to sc/inc/calcmacros.hxx
index 72659cc..03ca590 100644
--- a/sc/inc/dpmacros.hxx
+++ b/sc/inc/calcmacros.hxx
@@ -7,9 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef __SC_DPMACROS_HXX__
-#define __SC_DPMACROS_HXX__
+#ifndef SC_CALCMACROS_HXX
+#define SC_CALCMACROS_HXX
+#define DEBUG_COLUMN_STORAGE 0
#define DEBUG_PIVOT_TABLE 0
#if DEBUG_PIVOT_TABLE
diff --git a/sc/inc/dpcache.hxx b/sc/inc/dpcache.hxx
index 5a75463..707749c 100644
--- a/sc/inc/dpcache.hxx
+++ b/sc/inc/dpcache.hxx
@@ -21,7 +21,7 @@
#include "global.hxx"
#include "dpnumgroupinfo.hxx"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
#include "tools/date.hxx"
#include
diff --git a/sc/inc/dpfilteredcache.hxx b/sc/inc/dpfilteredcache.hxx
index c65b95c..bff1e18 100644
--- a/sc/inc/dpfilteredcache.hxx
+++ b/sc/inc/dpfilteredcache.hxx
@@ -24,7 +24,7 @@
#include "osl/mutex.hxx"
#include "global.hxx"
#include "dpitemdata.hxx"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
#include
#include
diff --git a/sc/inc/dpitemdata.hxx b/sc/inc/dpitemdata.hxx
index 9137e2a..823a6c1 100644
--- a/sc/inc/dpitemdata.hxx
+++ b/sc/inc/dpitemdata.hxx
@@ -16,7 +16,7 @@
#include "sal/types.h"
#include "tools/solar.h"
#include "rtl/ustring.hxx"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
#include "dpglobal.hxx"
/**
diff --git a/sc/inc/dpnumgroupinfo.hxx b/sc/inc/dpnumgroupinfo.hxx
index 523b792..6989fff 100644
--- a/sc/inc/dpnumgroupinfo.hxx
+++ b/sc/inc/dpnumgroupinfo.hxx
@@ -11,7 +11,7 @@
#define __SC_DPNUMGROUPINFO_HXX__
#include "scdllapi.h"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
struct ScDPNumGroupInfo
{
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 735b033..bbd3ba8 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -26,7 +26,7 @@
#include "dpoutput.hxx"
#include "dptypes.hxx"
#include "pivot.hxx"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
#include
diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx
index 22a8ffb..3239a80 100644
--- a/sc/inc/dptabdat.hxx
+++ b/sc/inc/dptabdat.hxx
@@ -24,7 +24,7 @@
#include "dpoutput.hxx"
#include "dpfilteredcache.hxx"
#include "dpcache.hxx"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
#include "svl/zforlist.hxx"
diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index e6289be..cab2da8 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -22,7 +22,7 @@
#include "global.hxx"
#include "dpfilteredcache.hxx"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
#include
#include
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 0ebf8be..ad65418 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -14,8 +14,7 @@
#include "formulacell.hxx"
#include "svl/broadcast.hxx"
#include "editeng/editobj.hxx"
-
-#define DEBUG_COLUMN_STORAGE 0
+#include "calcmacros.hxx"
#if DEBUG_COLUMN_STORAGE
#ifdef NDEBUG
diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx
index 85e19e0..12ed637 100644
--- a/sc/inc/pivot.hxx
+++ b/sc/inc/pivot.hxx
@@ -40,7 +40,7 @@
#include "global.hxx"
#include "address.hxx"
#include "dpglobal.hxx"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
#include
#include
diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx
index c38ee38..76ec9f5 100644
--- a/sc/source/core/data/dptabsrc.cxx
+++ b/sc/source/core/data/dptabsrc.cxx
@@ -45,7 +45,7 @@
#include "dpitemdata.hxx"
#include "dputil.hxx"
#include "dpresfilter.hxx"
-#include "dpmacros.hxx"
+#include "calcmacros.hxx"
#include
#include
diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx
index 3701081..8673e7f 100644
--- a/sc/source/ui/dbgui/fieldwnd.cxx
+++ b/sc/source/ui/dbgui/fieldwnd.cxx
@@ -48,7 +48,7 @@
#include "pvlaydlg.hxx"
#include "dpuiglobal.hxx"
-#include "dpmacros.hxx"
+#include "calcma
[Bug 44446] LibreOffice 3.6 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=6 Dan Dascalescu changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #230 from Dan Dascalescu --- LibreCalc Bug 39936 - it has always been unnecessarily cumbersome to move rows around. Excel has a context menu option called "Insert cut cells", which I miss dearly in LibreCalc. PS: is 3.6 still being developed? Should these bugs move to 4.x? -- 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 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 --- Comment #160 from Dan Dascalescu --- Bug 39936 - it has always been unnecessarily cumbersome to move rows around. Excel has a context menu option called "Insert cut cells", which I miss dearly in LibreCalc. -- 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: Bonjour Service implementation on server end
Hello all, I've just finished all my exams today! (yes ... we are really late in terms of finals :/ ) So now I can finally get up to full speed! ^^ And I means sorry for this very late update. As for now, the application is fully functional, which means it can handle connection/disconnection from server, basic functionalities like slides control and receive and slideshow previews work as expected as well. During the following week I will be working on the UI/UX design (I will open a wiki page for that). I will be testing it as an iPhone app as that might be the most frequent use case for this application. I've been doing some research on the bonjour service discovery and I will start with MacOS/iOS zeroconf networking but I might need some time to understand how server-end code work before experimenting with it. That it for now, I will let you know if I encounter any problems. ATB, Siqi 2013/6/17 Michael Meeks > > On Mon, 2013-06-17 at 13:16 +0100, Andrzej J. R. Hunt wrote: > > -Hence a custom discovery protocol was devised (multicast packets, see > > > android/sdremote/src/org/libreoffice/impressremote/communication/ServerFinder.java > > for an example of the client end). > > My concern (perhaps based on ignorance) was that despite the > multicast > nature of mDNS - I suspect that we have to have a single app on each > host owning the mDNS port - rather than allowing lots of separate apps > to listen to that on the same machine. > > As such, that gives some interesting platform integration problems > on > Linux - whereby we have to attempt to integrate with whatever dameon / > service is owning that port on the given platform - or bear the risk (if > we get it) of screwing up whatever else wants to use that. Then of > course, we disabled TCP/IP by default anyway concerned about security - > and so this was less of a problem. > > > W.r.t to actual support for this, as far as I remember it was: > > - Bonjour for Mac > > - Avahi for Linux > > - Bonjour for Windows too, but would require shipping the Bonjour > > binary along with LO. > > I guess that needs some license investigation; but sounds plausible > Bonjour is IIRC ALv2. Wrt. integrating with Avahi - I guess we don't > want hard linkage to that, in case it's not there - so that'd mean > having a plugin of some kind: do-able but a bit more work (depending how > Avahi's client functionality works). > > With an internal Bonjour on Windows, does that mean we join a > bun-fight > for who owns the mDNS port on Windows ? against anyone else that tries > to have Bonjour support ? and/or would we have to ship a daemon there ? > It'd be nice to know what version requirements we have for our base-line > Mac build vs. the Bonjour API. > > Otherwise - it seems like this is the best way to get > bluetooth-incapable iPhones working ? :-) so - lets go for it I guess. > > ATB, > > Michael. > > -- > michael.me...@suse.com <><, Pseudo Engineer, itinerant idiot > > -- Cordialement, Siqi LIU Étudiant Ingérieur, Université de Technologie de Compiègne Vice-Président de l'association robotique UTCoupe Responsable d'atelier de ClubChine -- Tel. +33 7 61 16 95 83 email: m...@siqi.fr -- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - vcl/source vcl/unx
vcl/source/control/scrbar.cxx|4 ++--
vcl/source/gdi/salgdilayout.cxx |4 ++--
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |8 +---
3 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit a08f579e3704fbd97590f9b050d250ae445725a7
Author: Ivan Timofeev
Date: Fri Jun 28 21:54:15 2013 +0400
fdo#63254: correct re-mirroring formula
This patch fixes horizontal scrollbar in Calc when a sheet is RTL and UI is
LTR.
When a particular window (horizontal scrollbar in this case) is RTL and a
whole
UI is LTR this code used for mirroring and re-mirroring back coordinates.
AFAICS
mirroring is correct, but re-mirroring is not.
The used formula comes from commit
69b684b12e42bf1396bdffca88ca880ac3c2e00b, and
the same formula appears in the other variant of overloaded function
"mirror":
mirror(sal_uInt32, const SalPoint*, SalPoint*, const OutputDevice*, bool),
but it does not affect the bug.
Change-Id: Iec9c53edce9d33be6b676d1094bed8bf92f2e435
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 9d54573..3d34a5f 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -119,7 +119,7 @@ void SalGraphics::mirror( long& x, const OutputDevice
*pOutDev, bool bBack ) con
{
long devX = pOutDevRef->GetOutOffXPixel(); // re-mirrored
mnOutOffX
if( bBack )
-x = x - pOutDevRef->GetOutputWidthPixel() + devX -
pOutDevRef->GetOutOffXPixel() + 1;
+x = devX + (pOutDevRef->GetOutputWidthPixel() + devX) - (x
+ 1);
else
x = pOutDevRef->GetOutputWidthPixel() - (x - devX) +
pOutDevRef->GetOutOffXPixel() - 1;
}
@@ -155,7 +155,7 @@ void SalGraphics::mirror( long& x, long& nWidth, const
OutputDevice *pOutDev, bo
{
long devX = pOutDevRef->GetOutOffXPixel(); // re-mirrored
mnOutOffX
if( bBack )
-x = x - pOutDevRef->GetOutputWidthPixel() + devX -
pOutDevRef->GetOutOffXPixel() + nWidth;
+x = devX + (pOutDevRef->GetOutputWidthPixel() + devX) - (x
+ nWidth);
else
x = pOutDevRef->GetOutputWidthPixel() - (x - devX) +
pOutDevRef->GetOutOffXPixel() - nWidth;
}
commit e3a801e2454eed2e61202bbacca01fe3fcc20c1d
Author: Ivan Timofeev
Date: Fri Jun 28 21:52:17 2013 +0400
fdo#44582: fix scrollbars in RTL UI
Change-Id: I518e9bcf673ffd1f17ecb51c2c4f962a2f722446
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index b326915..d283daf 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -317,9 +317,9 @@ void ScrollBar::ImplCalc( sal_Bool bUpdate )
if ( GetStyle() & WB_HORZ )
{
-if ( GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_LEFT,
+if ( GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()?
PART_BUTTON_RIGHT: PART_BUTTON_LEFT,
aControlRegion, 0, ImplControlValue(), OUString(),
aBoundingRegion, aBtn1Region ) &&
- GetNativeControlRegion( CTRL_SCROLLBAR, PART_BUTTON_RIGHT,
+ GetNativeControlRegion( CTRL_SCROLLBAR, IsRTLEnabled()?
PART_BUTTON_LEFT: PART_BUTTON_RIGHT,
aControlRegion, 0, ImplControlValue(), OUString(),
aBoundingRegion, aBtn2Region ) )
{
maBtn1Rect = aBtn1Region;
commit 48e1d9c7afe5c2a39d9a08d7a38f7c8ff39d8c84
Author: Ivan Timofeev
Date: Mon Jun 24 22:55:55 2013 +0400
fdo#66335: gtk: Revert hacks for RTL scrollbars
returning false here in getNativeControlRegion results in a fallback to
square buttons in vcl scrollbar code. But there is no problem in gtk+
backend
in this case, let's fix the problem differently.
This reverts commits 898a3e84807bccbb876e3f5583728f6d24e05e9a and
e8e82bd2109b82ddd535cdac30303249c6b62942.
Change-Id: I66fcdd1f27d471321852445e5881cee03baef7b1
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 176486e..c88bc6f 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -1048,13 +1048,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(
ControlType nType,
rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1;
if (!rNativeContentRegion.GetHeight())
rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1;
-//fdo#63254 horizontal scrool bar isn't displayed in RTL tab
-// with LTR UI in calc
-returnVal =Application::GetSettings().GetLayoutRTL();
-
-//See fdo#44582, Horizontal scrollbar in navigator window is broken
-if ((nPart==PART_BUTTON_LEFT || nPart==PART_BUTTON_RIGHT) &&
Application::GetSettings().GetL
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/column.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e0f49ff1fdb3813650bcce4eac1c2f7ec18942d0
Author: Kohei Yoshida
Date: Fri Jun 28 14:21:37 2013 -0400
This is obviously a mistake, & caused Calc to crash on Ctrl-D.
Change-Id: I85787366313e38ce0ff503c7677e4407c1e2e30e
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9f75ad8..a224b6f 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1595,7 +1595,7 @@ public:
void operator() (const sc::CellStoreType::value_type& aNode, size_t
nOffset, size_t nDataSize)
{
-size_t nRow = aNode.position - nOffset;
+size_t nRow = aNode.position + nOffset;
switch (aNode.type)
{
@@ -1773,7 +1773,7 @@ public:
void operator() (const sc::CellStoreType::value_type& aNode, size_t
nOffset, size_t nDataSize)
{
-size_t nRow = aNode.position - nOffset;
+size_t nRow = aNode.position + nOffset;
switch (aNode.type)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/column.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit bbfdd5955cd867929c30ec11c3d11a62b6a55efd
Author: Kohei Yoshida
Date: Fri Jun 28 14:21:37 2013 -0400
This is obviously a mistake, & caused Calc to crash on Ctrl-D.
Change-Id: I85787366313e38ce0ff503c7677e4407c1e2e30e
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 9f75ad8..a224b6f 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1595,7 +1595,7 @@ public:
void operator() (const sc::CellStoreType::value_type& aNode, size_t
nOffset, size_t nDataSize)
{
-size_t nRow = aNode.position - nOffset;
+size_t nRow = aNode.position + nOffset;
switch (aNode.type)
{
@@ -1773,7 +1773,7 @@ public:
void operator() (const sc::CellStoreType::value_type& aNode, size_t
nOffset, size_t nDataSize)
{
-size_t nRow = aNode.position - nOffset;
+size_t nRow = aNode.position + nOffset;
switch (aNode.type)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source
sc/source/core/data/column.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 281c3e03c19f3d5501d3be597b927dbd38c9afa0
Author: Kohei Yoshida
Date: Fri Jun 28 14:21:37 2013 -0400
This is obviously a mistake, & caused Calc to crash on Ctrl-D.
Change-Id: I85787366313e38ce0ff503c7677e4407c1e2e30e
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 1a00a15..25a20f6 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1595,7 +1595,7 @@ public:
void operator() (const sc::CellStoreType::value_type& aNode, size_t
nOffset, size_t nDataSize)
{
-size_t nRow = aNode.position - nOffset;
+size_t nRow = aNode.position + nOffset;
switch (aNode.type)
{
@@ -1773,7 +1773,7 @@ public:
void operator() (const sc::CellStoreType::value_type& aNode, size_t
nOffset, size_t nDataSize)
{
-size_t nRow = aNode.position - nOffset;
+size_t nRow = aNode.position + nOffset;
switch (aNode.type)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst tomcat/ExternalProject_tomcat.mk tomcat/Package_tomcat.mk tomcat/UnpackedTarball_tomcat.mk
download.lst |2 +- tomcat/ExternalProject_tomcat.mk |2 +- tomcat/Package_tomcat.mk |2 +- tomcat/UnpackedTarball_tomcat.mk |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 4f2890a8c9a0c8cadeb469b8b6e23ea7ec3f3b81 Author: Caolán McNamara Date: Fri Jun 28 19:05:58 2013 +0100 bump tomcat to 5.5.36 Change-Id: I04e5a96cb7fb5e7b8955a98eae2fdc01d4caa798 diff --git a/download.lst b/download.lst index 858d707..9c5c4bc 100644 --- a/download.lst +++ b/download.lst @@ -81,7 +81,7 @@ export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -export TOMCAT_TARBALL := 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz +export TOMCAT_TARBALL := 63574e3ada44f473892a61a2da433a59-apache-tomcat-5.5.36-src.tar.gz export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz export VIGRA_TARBALL := ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz export WPD_TARBALL := 972afb8fdf02d9e7517e258b7fa7f0eb-libwpd-0.9.8.tar.bz2 diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk index 0640f4b..e4f3ff1 100644 --- a/tomcat/ExternalProject_tomcat.mk +++ b/tomcat/ExternalProject_tomcat.mk @@ -25,6 +25,6 @@ $(call gb_ExternalProject_get_state_target,tomcat,build) : -Dant.build.javac.target=$(JAVA_TARGET_VER) \ ) \ $(if $(debug),-Dbuild.debug="on") \ - ,jakarta-servletapi-5) + ,servletapi) # vim: set noet sw=4 ts=4: diff --git a/tomcat/Package_tomcat.mk b/tomcat/Package_tomcat.mk index 8cd4512..1ab9c5c 100644 --- a/tomcat/Package_tomcat.mk +++ b/tomcat/Package_tomcat.mk @@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,tomcat_inc,$(call gb_UnpackedTarball_get_dir,to $(eval $(call gb_Package_use_external_project,tomcat_inc,tomcat)) -$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar)) +$(eval $(call gb_Package_add_file,tomcat_inc,bin/servlet-api.jar,servletapi/jsr154/dist/lib/servlet-api.jar)) # vim: set noet sw=4 ts=4: diff --git a/tomcat/UnpackedTarball_tomcat.mk b/tomcat/UnpackedTarball_tomcat.mk index 6e6a716..ed408f1 100644 --- a/tomcat/UnpackedTarball_tomcat.mk +++ b/tomcat/UnpackedTarball_tomcat.mk @@ -12,6 +12,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,tomcat)) $(eval $(call gb_UnpackedTarball_set_tarball,tomcat,$(TOMCAT_TARBALL))) -$(eval $(call gb_UnpackedTarball_add_file,tomcat,jakarta-servletapi-5/build.xml,tomcat/build.xml)) +$(eval $(call gb_UnpackedTarball_add_file,tomcat,servletapi/build.xml,tomcat/build.xml)) # vim: set noet sw=4 ts=4: ___ 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/0be9280acfe682154de431c3d9edfea4106177
e8/0be9280acfe682154de431c3d9edfea4106177 |1 + 1 file changed, 1 insertion(+) New commits: commit 3752c3d18f020677a6e9ff359feade9d32598bff Author: Caolán McNamara Date: Fri Jun 28 19:07:16 2013 +0100 Notes added by 'git notes add' diff --git a/e8/0be9280acfe682154de431c3d9edfea4106177 b/e8/0be9280acfe682154de431c3d9edfea4106177 new file mode 100644 index 000..9816ed6 --- /dev/null +++ b/e8/0be9280acfe682154de431c3d9edfea4106177 @@ -0,0 +1 @@ +prefer: 4f2890a8c9a0c8cadeb469b8b6e23ea7ec3f3b81 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - sc/source
sc/source/core/data/documen9.cxx|6 +-
sc/source/core/data/formulacell.cxx |3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 0406c5346c76ac2e02b69cb0cad830a89359c8c6
Author: Kohei Yoshida
Date: Fri Jun 28 13:28:31 2013 -0400
Ensure that the group calculation path won't get called when it's disabled.
Change-Id: I0ea45616558bebf99c63862a0458776c67789bbc
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index f4b2258..db733f7 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -698,11 +698,7 @@ void ScDocument::ApplyAsianEditSettings(
ScEditEngineDefaulter& rEngine )
void ScDocument::RebuildFormulaGroups()
{
-bool bEnableFormulaGroups;
-
-bEnableFormulaGroups = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
-
-if ( !bEnableFormulaGroups )
+if (!ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
return;
SCTAB nTab;
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 9c0a2b5..7e9cadc 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3099,6 +3099,9 @@ public:
bool ScFormulaCell::InterpretFormulaGroup()
{
+if (!ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
+return false;
+
// Re-build formulae groups if necessary - ideally this is done at
// import / insert / delete etc. and is integral to the data structures
pDocument->RebuildFormulaGroups();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/documen9.cxx|6 +-
sc/source/core/data/formulacell.cxx |3 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 6972c788286b151145067ac5be65540fc6ac7bc6
Author: Kohei Yoshida
Date: Fri Jun 28 13:28:31 2013 -0400
Ensure that the group calculation path won't get called when it's disabled.
Change-Id: I0ea45616558bebf99c63862a0458776c67789bbc
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 2938009..c4c1409 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -690,11 +690,7 @@ void ScDocument::ApplyAsianEditSettings(
ScEditEngineDefaulter& rEngine )
void ScDocument::RebuildFormulaGroups()
{
-bool bEnableFormulaGroups;
-
-bEnableFormulaGroups = ScInterpreter::GetGlobalConfig().mbOpenCLEnabled;
-
-if ( !bEnableFormulaGroups )
+if (!ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
return;
SCTAB nTab;
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 26d7ee5..f2d72da 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3084,6 +3084,9 @@ public:
bool ScFormulaCell::InterpretFormulaGroup()
{
+if (!ScInterpreter::GetGlobalConfig().mbOpenCLEnabled)
+return false;
+
// Re-build formulae groups if necessary - ideally this is done at
// import / insert / delete etc. and is integral to the data structures
pDocument->RebuildFormulaGroups();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/inc sw/source
sw/inc/swtblfmt.hxx |1
sw/source/core/doc/swtblfmt.cxx | 58 ++--
2 files changed, 34 insertions(+), 25 deletions(-)
New commits:
commit 2ff314df35dbcc0ae0cfdd76cba53155db9b2764
Author: Alex Ivan
Date: Fri Jun 28 19:46:02 2013 +0300
Proper initilization of members in SwTable*Fmt
Modified initilization of members in SwTableFmt and SwTableLineFmt
in order to properly create formats for lines and, respectively, boxes.
Change-Id: I5e7e1a57b6745ac60a8167b3e0968202657fb4ef
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index e3f7e9f..cbbed13 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -22,6 +22,7 @@
#include "hintids.hxx"
#include
#include
+#include
#include
#include
#include
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index b5d387f..d7b5e1c 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -31,15 +31,17 @@ SwTableFmt::SwTableFmt( SwAttrPool& rPool, const sal_Char*
pFmtNm,
SetRepeatHeading( 0 );
SetShadow( SvxShadowItem( RES_SHADOW ) );
-pFstLineFmt = NULL;
-pLstLineFmt = NULL;
-pOddLineFmt = NULL;
-pEvnLineFmt = NULL;
-
-pFstColFmt = NULL;
-pLstColFmt = NULL;
-pOddColFmt = NULL;
-pEvnColFmt = NULL;
+SwDoc* pDoc = GetDoc();
+
+pFstLineFmt = pDoc->MakeTableLineFmt();
+pLstLineFmt = pDoc->MakeTableLineFmt();
+pOddLineFmt = pDoc->MakeTableLineFmt();
+pEvnLineFmt = pDoc->MakeTableLineFmt();
+
+pFstColFmt = pDoc->MakeTableLineFmt();
+pLstColFmt = pDoc->MakeTableLineFmt();
+pOddColFmt = pDoc->MakeTableLineFmt();
+pEvnColFmt = pDoc->MakeTableLineFmt();
}
SwTableFmt::SwTableFmt( SwAttrPool& rPool, const String &rFmtNm,
@@ -54,15 +56,17 @@ SwTableFmt::SwTableFmt( SwAttrPool& rPool, const String
&rFmtNm,
SetRepeatHeading( 0 );
SetShadow( SvxShadowItem( RES_SHADOW ) );
-pFstLineFmt = NULL;
-pLstLineFmt = NULL;
-pOddLineFmt = NULL;
-pEvnLineFmt = NULL;
+SwDoc* pDoc = GetDoc();
+
+pFstLineFmt = pDoc->MakeTableLineFmt();
+pLstLineFmt = pDoc->MakeTableLineFmt();
+pOddLineFmt = pDoc->MakeTableLineFmt();
+pEvnLineFmt = pDoc->MakeTableLineFmt();
-pFstColFmt = NULL;
-pLstColFmt = NULL;
-pOddColFmt = NULL;
-pEvnColFmt = NULL;
+pFstColFmt = pDoc->MakeTableLineFmt();
+pLstColFmt = pDoc->MakeTableLineFmt();
+pOddColFmt = pDoc->MakeTableLineFmt();
+pEvnColFmt = pDoc->MakeTableLineFmt();
}
SwTableFmt& SwTableFmt::operator=( const SwTableFmt& rNew )
@@ -152,20 +156,24 @@ SwTableLineFmt::SwTableLineFmt( SwAttrPool& rPool, const
sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
{
-pFstBoxFmt = NULL;
-pLstBoxFmt = NULL;
-pOddBoxFmt = NULL;
-pEvnBoxFmt = NULL;
+SwDoc* pDoc = GetDoc();
+
+pFstBoxFmt = pDoc->MakeTableBoxFmt();
+pLstBoxFmt = pDoc->MakeTableBoxFmt();
+pOddBoxFmt = pDoc->MakeTableBoxFmt();
+pEvnBoxFmt = pDoc->MakeTableBoxFmt();
}
SwTableLineFmt::SwTableLineFmt( SwAttrPool& rPool, const String &rFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
{
-pFstBoxFmt = NULL;
-pLstBoxFmt = NULL;
-pOddBoxFmt = NULL;
-pEvnBoxFmt = NULL;
+SwDoc* pDoc = GetDoc();
+
+pFstBoxFmt = pDoc->MakeTableBoxFmt();
+pLstBoxFmt = pDoc->MakeTableBoxFmt();
+pOddBoxFmt = pDoc->MakeTableBoxFmt();
+pEvnBoxFmt = pDoc->MakeTableBoxFmt();
}
SwTableBoxFmt::SwTableBoxFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source vcl/test vcl/win
vcl/source/gdi/bitmap3.cxx |2 +-
vcl/test/canvasbitmaptest.cxx |2 +-
vcl/win/source/window/salframe.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 6491e0ed5b460857a6f7af8d5b87099f57522a21
Author: Takeshi Abe
Date: Sat Jun 29 01:00:09 2013 +0900
Mark as const
Change-Id: Ia390987749be2d1d642d4add11efcc892a81722a
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 8d5e6a4..5c4905a 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -215,7 +215,7 @@ void ImplCreateDitherMatrix( sal_uInt8
(*pDitherMatrix)[16][16] )
longi, j, k, l;
sal_uInt16 pMtx[ 16 ][ 16 ];
sal_uInt16 nMax = 0;
-static sal_uInt8pMagic[4][4] = { { 0, 14, 3, 13, },
+static const sal_uInt8 pMagic[4][4] = { { 0, 14, 3, 13, },
{11, 5, 8, 6, },
{12, 2, 15, 1, },
{7, 9, 4, 10 } };
diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx
index 7adba84..c07da03 100644
--- a/vcl/test/canvasbitmaptest.cxx
+++ b/vcl/test/canvasbitmaptest.cxx
@@ -701,7 +701,7 @@ public:
void TestWindow::Paint( const Rectangle& )
{
-static sal_Int8 lcl_depths[]={1,4,8,16,24};
+static const sal_Int8 lcl_depths[]={1,4,8,16,24};
try
{
diff --git a/vcl/win/source/window/salframe.cxx
b/vcl/win/source/window/salframe.cxx
index 2571b99..f3c9414 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -522,7 +522,7 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd,
sal_Bool bAsChild )
// translation table from System keycodes into StartView keycodes
#define KEY_TAB_SIZE 146
-static sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
+static const sal_uInt16 aImplTranslateKeyTab[KEY_TAB_SIZE] =
{
// StarView-Code System-Code Index
0,// 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/inc sw/source
sw/inc/swtblfmt.hxx | 50 -
sw/source/core/doc/swtblfmt.cxx | 215
2 files changed, 259 insertions(+), 6 deletions(-)
New commits:
commit 61a362510e0632b0b764dc02fb6242874b15418c
Author: Alex Ivan
Date: Fri Jun 28 18:56:54 2013 +0300
Add cell format info into SwTableBoxFmt
Migrated cell format information into SwTableBoxFmt.
Will remove info from SwTableBoxAutoFmt and try to remove the
class entirely as progress is made.
Change-Id: I4d5d0bc19aa80dfd1f8157eb0c05d54695cd9c8e
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 7783f7ba..e3f7e9f 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -19,6 +19,8 @@
#ifndef _SWTBLFMT_HXX
#define _SWTBLFMT_HXX
+#include "hintids.hxx"
+#include
#include
#include
#include
@@ -40,9 +42,11 @@
#include
#include
#include
+#include
#include
#include
#include
+#include
class SwDoc;
class SwTableLineFmt;
@@ -150,20 +154,54 @@ class SW_DLLPUBLIC SwTableBoxFmt : public SwFrmFmt
{
friend class SwDoc;
+String sNumFmtString;
+LanguageTypeeSysLanguage, eNumFmtLanguage;
+
protected:
SwTableBoxFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
-SwFrmFmt *pDrvdFrm )
-: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
-{}
+SwFrmFmt *pDrvdFrm );
SwTableBoxFmt( SwAttrPool& rPool, const String &rFmtNm,
-SwFrmFmt *pDrvdFrm )
-: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
-{}
+SwFrmFmt *pDrvdFrm );
// For recognition of changes (especially TableBoxAttribute).
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue
);
public:
+void SetFont( const SvxFontItem& rNew );
+void SetHeight( const SvxFontHeightItem& rNew );
+void SetWeight( const SvxWeightItem& rNew );
+void SetPosture( const SvxPostureItem& rNew );
+
+void SetCJKFont( const SvxFontItem& rNew );
+void SetCJKHeight( const SvxFontHeightItem& rNew );
+void SetCJKWeight( const SvxWeightItem& rNew );
+void SetCJKPosture( const SvxPostureItem& rNew );
+
+void SetCTLFont( const SvxFontItem& rNew );
+void SetCTLHeight( const SvxFontHeightItem& rNew );
+void SetCTLWeight( const SvxWeightItem& rNew );
+void SetCTLPosture( const SvxPostureItem& rNew );
+
+void SetUnderline( const SvxUnderlineItem& rNew );
+void SetOverline( const SvxOverlineItem& rNew );
+void SetCrossedOut( const SvxCrossedOutItem& rNew );
+void SetContour( const SvxContourItem& rNew );
+void SetShadowed( const SvxShadowedItem& rNew );
+void SetColor( const SvxColorItem& rNew );
+void SetBox( const SvxBoxItem& rNew );
+void SetBackground( const SvxBrushItem& rNew );
+
+void SetAdjust( const SvxAdjustItem& rNew );
+void SetTextOrientation( const SvxFrameDirectionItem& rNew );
+void SetVerticalAlignment( const SwFmtVertOrient& rNew );
+
+void SetValueFormat( const String& rFmt, LanguageType eLng, LanguageType
eSys );
+
+const SvxFrameDirectionItem& GetTextOrientation() const;
+const SwFmtVertOrient& GetVerticalAlignment() const;
+
+void GetValueFormat( String& rFmt, LanguageType& rLng, LanguageType& rSys
) const;
+
TYPEINFO(); // Already in base class Content.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt)
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index a14b961..b5d387f 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -168,4 +168,219 @@ SwTableLineFmt::SwTableLineFmt( SwAttrPool& rPool, const
String &rFmtNm,
pEvnBoxFmt = NULL;
}
+SwTableBoxFmt::SwTableBoxFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
+SwFrmFmt *pDrvdFrm )
+: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+{
+SetFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_FONT ) );
+SetHeight( SvxFontHeightItem( 240, 100, RES_CHRATR_FONTSIZE) );
+SetWeight( SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_WEIGHT ) );
+SetPosture( SvxPostureItem( ITALIC_NONE, RES_CHRATR_POSTURE ) );
+
+SetCJKFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CJK_FONT ) );
+SetCJKHeight( SvxFontHeightItem( 240, 100, RES_CHRATR_CJK_FONTSIZE) );
+SetCJKWeight( SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_CJK_WEIGHT ) );
+SetCJKPosture( SvxPostureItem( ITALIC_NONE, RES_CHRATR_CJK_POSTURE ) );
+
+SetCTLFont( *(SvxFontItem*)GetDfltAttr( RES_CHRATR_CTL_FONT ) );
+SetCTLHeight( SvxFontHeightItem( 240, 100, RES_CHRATR_CTL_FONTSIZE) );
+SetCTLWeight( SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_CTL_WEIGHT ) );
+SetCTLPosture( SvxPostureItem( ITALIC_NONE, RES_CHRATR_CTL_POSTURE ) );
+
+SetUnderline( SvxUnderlineItem( UNDERLINE_NONE, RES_CHRATR_UNDERLINE )
[Libreoffice-commits] core.git: connectivity/source dbaccess/source include/svx xmloff/source
connectivity/source/commontools/dbconversion.cxx |2 -- connectivity/source/parse/sqlflex.l |2 -- dbaccess/source/ui/querydesign/ConnectionLine.cxx |2 -- include/svx/def3d.hxx |2 -- xmloff/source/style/weighhdl.cxx |2 -- 5 files changed, 10 deletions(-) New commits: commit 4296394d5c54be51b36a0cddb2f8a8f62a226867 Author: Michael Stahl Date: Fri Jun 28 18:09:41 2013 +0200 remove pointless external guards for standard headers Change-Id: I509984a6029b6a86fd1ee3f947394af9cdf71c6a diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index bf36c93..651c8f0 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -20,9 +20,7 @@ #include #include #include -#ifndef _INC_STDIO #include -#endif #include #include #include diff --git a/connectivity/source/parse/sqlflex.l b/connectivity/source/parse/sqlflex.l index 0f7c3b5..7f8cf3e 100644 --- a/connectivity/source/parse/sqlflex.l +++ b/connectivity/source/parse/sqlflex.l @@ -26,9 +26,7 @@ #include // std::va_list #endif -#ifndef _INC_STRING #include -#endif #include "internalnode.hxx" diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index 3319f63..05ca77a 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -23,9 +23,7 @@ #include "TableWindowListBox.hxx" #include "TableConnection.hxx" #include -#ifndef _INC_MATH #include -#endif #include #include diff --git a/include/svx/def3d.hxx b/include/svx/def3d.hxx index 565f396..c96d7f5 100644 --- a/include/svx/def3d.hxx +++ b/include/svx/def3d.hxx @@ -20,9 +20,7 @@ #ifndef _SVX_DEF3D_HXX #define _SVX_DEF3D_HXX -#ifndef _INC_MATH #include -#endif #include const double fPiDiv180 = 0.01745329251994; diff --git a/xmloff/source/style/weighhdl.cxx b/xmloff/source/style/weighhdl.cxx index 0ef9c84..7c8d31b 100644 --- a/xmloff/source/style/weighhdl.cxx +++ b/xmloff/source/style/weighhdl.cxx @@ -26,9 +26,7 @@ #include #include -#ifndef _INC_LIMITS #include -#endif #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - 5 commits - sc/inc sc/Module_sc.mk sc/qa sc/source
sc/Module_sc.mk |2
sc/inc/column.hxx |2
sc/inc/document.hxx |2
sc/inc/table.hxx|2
sc/qa/unit/ucalc.cxx| 40 +++---
sc/source/core/data/column2.cxx | 227 +++-
sc/source/core/data/documen2.cxx|2
sc/source/core/data/document.cxx|2
sc/source/core/data/formulacell.cxx | 13 --
sc/source/core/data/table1.cxx |2
10 files changed, 231 insertions(+), 63 deletions(-)
New commits:
commit be4db37dddc261c2fe86bdaa67c4c042d2b0b0a3
Author: Kohei Yoshida
Date: Fri Jun 28 11:50:25 2013 -0400
ResolveStaticReference() to also dynamically recalc formula cells.
Change-Id: If42e5105be0e6db7c63d7c4e7c43de23716d6cbf
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index c2ce0e5..55fb97a 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1862,13 +1862,10 @@ formula::FormulaTokenRef
ScColumn::ResolveStaticReference( SCROW nRow )
case sc::element_type_formula:
{
ScFormulaCell* p = sc::formula_block::at(*it->data, aPos.second);
-if (p->GetDirty())
-// Dirty formula cell is not considered static (for now).
-// Return null token. Later we will switch to dynamically
-// interpreting all dirty formula cells.
-return formula::FormulaTokenRef();
+if (p->IsValue())
+return formula::FormulaTokenRef(new
formula::FormulaDoubleToken(p->GetValue()));
-return formula::FormulaTokenRef(new
formula::FormulaDoubleToken(p->GetResultDouble()));
+return formula::FormulaTokenRef(new
formula::FormulaStringToken(p->GetString()));
}
case sc::element_type_empty:
default:
@@ -1884,28 +1881,34 @@ class ToMatrixHandler
ScMatrix& mrMat;
SCCOL mnMatCol;
SCROW mnTopRow;
-bool mbSuccess;
public:
ToMatrixHandler(ScMatrix& rMat, SCCOL nMatCol, SCROW nTopRow) :
-mrMat(rMat), mnMatCol(nMatCol), mnTopRow(nTopRow), mbSuccess(true) {}
+mrMat(rMat), mnMatCol(nMatCol), mnTopRow(nTopRow) {}
void operator() (size_t nRow, double fVal)
{
mrMat.PutDouble(fVal, mnMatCol, nRow - mnTopRow);
}
-void operator() (size_t nRow, ScFormulaCell* p)
+void operator() (size_t nRow, const ScFormulaCell* p)
{
-if (p->GetDirty())
-{
-mbSuccess = false;
-return;
-}
+// Formula cell may need to re-calculate.
+ScFormulaCell& rCell = const_cast(*p);
+if (rCell.IsValue())
+mrMat.PutDouble(rCell.GetValue(), mnMatCol, nRow - mnTopRow);
+else
+mrMat.PutString(rCell.GetString(), mnMatCol, nRow - mnTopRow);
+}
-mrMat.PutDouble(p->GetResultDouble(), mnMatCol, nRow - mnTopRow);
+void operator() (size_t nRow, const OUString& rStr)
+{
+mrMat.PutString(rStr, mnMatCol, nRow - mnTopRow);
}
-bool isSuccess() const { return mbSuccess; }
+void operator() (size_t nRow, const EditTextObject* pStr)
+{
+mrMat.PutString(ScEditUtil::GetString(*pStr), mnMatCol, nRow -
mnTopRow);
+}
};
}
@@ -1916,8 +1919,8 @@ bool ScColumn::ResolveStaticReference( ScMatrix& rMat,
SCCOL nMatCol, SCROW nRow
return false;
ToMatrixHandler aFunc(rMat, nMatCol, nRow1);
-sc::ProcessFormulaNumeric(maCells.begin(), maCells, nRow1, nRow2, aFunc);
-return aFunc.isSuccess();
+sc::ParseAllNonEmpty(maCells.begin(), maCells, nRow1, nRow2, aFunc);
+return true;
}
namespace {
commit 3c339eb948ca49b3b7ca31d9267dbd98a6fa708f
Author: Kohei Yoshida
Date: Fri Jun 28 11:29:14 2013 -0400
Have FetchDoubleArray() to optionally calculate dependent formula cells.
Change-Id: Ide29df664ff002f9cd8fe3edbf9512dd0cbb9eb6
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index eef6442..13a0651 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -464,7 +464,7 @@ public:
formula::FormulaTokenRef ResolveStaticReference( SCROW nRow );
bool ResolveStaticReference( ScMatrix& rMat, SCCOL nMatCol, SCROW nRow1,
SCROW nRow2 );
void FillMatrix( ScMatrix& rMat, size_t nMatCol, SCROW nRow1, SCROW nRow2
) const;
-const double* FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW
nRow1, SCROW nRow2 ) const;
+const double* FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW
nRow1, SCROW nRow2 );
void SetFormulaResults( SCROW nRow, const double* pResults, size_t nLen );
void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 12cd7ff..3d12935 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1979,7 +1979,7 @@ public:
formula::FormulaTokenRef ResolveStaticReference( const ScRange& rRange );
cons
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b4/b809f19ca8ca8fda1058258c24f156a882691b
b4/b809f19ca8ca8fda1058258c24f156a882691b |1 + 1 file changed, 1 insertion(+) New commits: commit 27d5ca5b6a1a089b28b1c48518693709ca4066c5 Author: Caolán McNamara Date: Fri Jun 28 17:00:49 2013 +0100 Notes added by 'git notes add' diff --git a/b4/b809f19ca8ca8fda1058258c24f156a882691b b/b4/b809f19ca8ca8fda1058258c24f156a882691b new file mode 100644 index 000..00b55a3 --- /dev/null +++ b/b4/b809f19ca8ca8fda1058258c24f156a882691b @@ -0,0 +1 @@ +ignore: branding ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/column2.cxx | 39 +--
1 file changed, 21 insertions(+), 18 deletions(-)
New commits:
commit 87137126374d52d29ae070c5686b9f08c613062f
Author: Kohei Yoshida
Date: Fri Jun 28 11:50:25 2013 -0400
ResolveStaticReference() to also dynamically recalc formula cells.
Change-Id: If42e5105be0e6db7c63d7c4e7c43de23716d6cbf
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 82990ab..a7056d0 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1859,13 +1859,10 @@ formula::FormulaTokenRef
ScColumn::ResolveStaticReference( SCROW nRow )
case sc::element_type_formula:
{
ScFormulaCell* p = sc::formula_block::at(*it->data, aPos.second);
-if (p->GetDirty())
-// Dirty formula cell is not considered static (for now).
-// Return null token. Later we will switch to dynamically
-// interpreting all dirty formula cells.
-return formula::FormulaTokenRef();
+if (p->IsValue())
+return formula::FormulaTokenRef(new
formula::FormulaDoubleToken(p->GetValue()));
-return formula::FormulaTokenRef(new
formula::FormulaDoubleToken(p->GetResultDouble()));
+return formula::FormulaTokenRef(new
formula::FormulaStringToken(p->GetString()));
}
case sc::element_type_empty:
default:
@@ -1881,28 +1878,34 @@ class ToMatrixHandler
ScMatrix& mrMat;
SCCOL mnMatCol;
SCROW mnTopRow;
-bool mbSuccess;
public:
ToMatrixHandler(ScMatrix& rMat, SCCOL nMatCol, SCROW nTopRow) :
-mrMat(rMat), mnMatCol(nMatCol), mnTopRow(nTopRow), mbSuccess(true) {}
+mrMat(rMat), mnMatCol(nMatCol), mnTopRow(nTopRow) {}
void operator() (size_t nRow, double fVal)
{
mrMat.PutDouble(fVal, mnMatCol, nRow - mnTopRow);
}
-void operator() (size_t nRow, ScFormulaCell* p)
+void operator() (size_t nRow, const ScFormulaCell* p)
{
-if (p->GetDirty())
-{
-mbSuccess = false;
-return;
-}
+// Formula cell may need to re-calculate.
+ScFormulaCell& rCell = const_cast(*p);
+if (rCell.IsValue())
+mrMat.PutDouble(rCell.GetValue(), mnMatCol, nRow - mnTopRow);
+else
+mrMat.PutString(rCell.GetString(), mnMatCol, nRow - mnTopRow);
+}
-mrMat.PutDouble(p->GetResultDouble(), mnMatCol, nRow - mnTopRow);
+void operator() (size_t nRow, const OUString& rStr)
+{
+mrMat.PutString(rStr, mnMatCol, nRow - mnTopRow);
}
-bool isSuccess() const { return mbSuccess; }
+void operator() (size_t nRow, const EditTextObject* pStr)
+{
+mrMat.PutString(ScEditUtil::GetString(*pStr), mnMatCol, nRow -
mnTopRow);
+}
};
}
@@ -1913,8 +1916,8 @@ bool ScColumn::ResolveStaticReference( ScMatrix& rMat,
SCCOL nMatCol, SCROW nRow
return false;
ToMatrixHandler aFunc(rMat, nMatCol, nRow1);
-sc::ProcessFormulaNumeric(maCells.begin(), maCells, nRow1, nRow2, aFunc);
-return aFunc.isSuccess();
+sc::ParseAllNonEmpty(maCells.begin(), maCells, nRow1, nRow2, aFunc);
+return true;
}
namespace {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source unotools/source
sw/inc/pch/precompiled_sw.hxx |1 -
sw/source/core/unocore/unofield.cxx |1 -
unotools/source/misc/datetime.cxx | 29 -
3 files changed, 31 deletions(-)
New commits:
commit c99b97d306211fe346a7d0a5208aa99118208fc5
Author: Michael Stahl
Date: Thu Jun 27 23:26:18 2013 +0200
datetime.cxx: remove duplicative unused operators
Change-Id: I73aae52cc482f87fb27c35c5c0d9f7b378760906
diff --git a/unotools/source/misc/datetime.cxx
b/unotools/source/misc/datetime.cxx
index b383dc5..5101ee0 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -200,35 +200,6 @@ void typeConvert(const starutil::DateTime& _rDateTime,
DateTime& _rOut)
_rOut = DateTime(aDate, aTime);
}
-// FIXME: these operators should be in toplevel namespace? announced in
the .hxx file?
-//-
-bool operator ==(const starutil::DateTime& _rLeft, const starutil::DateTime&
_rRight)
-{
-return ( _rLeft.NanoSeconds == _rRight.NanoSeconds) &&
-( _rLeft.Seconds == _rRight.Seconds) &&
-( _rLeft.Minutes == _rRight.Minutes) &&
-( _rLeft.Hours == _rRight.Hours) &&
-( _rLeft.Day == _rRight.Day) &&
-( _rLeft.Month == _rRight.Month) &&
-( _rLeft.Year == _rRight.Year) ;
-}
-
-//-
-bool operator ==(const starutil::Date& _rLeft, const starutil::Date& _rRight)
-{
-return ( _rLeft.Day == _rRight.Day) &&
-( _rLeft.Month == _rRight.Month) &&
-( _rLeft.Year == _rRight.Year) ;
-}
-
-//-
-bool operator ==(const starutil::Time& _rLeft, const starutil::Time& _rRight)
-{
-return ( _rLeft.NanoSeconds == _rRight.NanoSeconds) &&
-( _rLeft.Seconds == _rRight.Seconds) &&
-( _rLeft.Minutes == _rRight.Minutes) &&
-( _rLeft.Hours == _rRight.Hours) ;
-}
OUString toISO8601(const starutil::DateTime& rDateTime)
{
commit 7c3980053f15338ff8afaa11b4c5cbe7b6d7ecef
Author: Michael Stahl
Date: Thu Jun 27 16:05:12 2013 +0200
remove unused DateTimeRange includes
Change-Id: Iedf60c9729067214365a74222be6a59c19d0f7d5
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 99fc585..1a5339e 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -405,7 +405,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index b4a5de0..6a202bf 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -40,7 +40,6 @@
#include
#include
#include
-#include
#include
#include
#include
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx |2
sc/inc/document.hxx |2
sc/inc/table.hxx|2
sc/source/core/data/column2.cxx | 188 +---
sc/source/core/data/document.cxx|2
sc/source/core/data/formulacell.cxx | 13 +-
sc/source/core/data/table1.cxx |2
7 files changed, 188 insertions(+), 23 deletions(-)
New commits:
commit 49c16e6060b4323c79d33abfa163d4e5aae2bc15
Author: Kohei Yoshida
Date: Fri Jun 28 11:29:14 2013 -0400
Have FetchDoubleArray() to optionally calculate dependent formula cells.
Change-Id: Ide29df664ff002f9cd8fe3edbf9512dd0cbb9eb6
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index b119d3d..4601ae2 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -471,7 +471,7 @@ public:
formula::FormulaTokenRef ResolveStaticReference( SCROW nRow );
bool ResolveStaticReference( ScMatrix& rMat, SCCOL nMatCol, SCROW nRow1,
SCROW nRow2 );
void FillMatrix( ScMatrix& rMat, size_t nMatCol, SCROW nRow1, SCROW nRow2
) const;
-const double* FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW
nRow1, SCROW nRow2 ) const;
+const double* FetchDoubleArray( sc::FormulaGroupContext& rCxt, SCROW
nRow1, SCROW nRow2 );
void SetFormulaResults( SCROW nRow, const double* pResults, size_t nLen );
void SetNumberFormat( SCROW nRow, sal_uInt32 nNumberFormat );
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fd8f61f..8d942b7 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1973,7 +1973,7 @@ public:
formula::FormulaTokenRef ResolveStaticReference( const ScRange& rRange );
const double* FetchDoubleArray(
-sc::FormulaGroupContext& rCxt, const ScAddress& rPos, SCROW nLength )
const;
+sc::FormulaGroupContext& rCxt, const ScAddress& rPos, SCROW nLength );
SvtBroadcaster* GetBroadcaster( const ScAddress& rPos );
const SvtBroadcaster* GetBroadcaster( const ScAddress& rPos ) const;
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index bae3818..bda039f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -842,7 +842,7 @@ public:
formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol, SCROW nRow );
formula::FormulaTokenRef ResolveStaticReference( SCCOL nCol1, SCROW nRow1,
SCCOL nCol2, SCROW nRow2 );
const double* FetchDoubleArray(
-sc::FormulaGroupContext& rCxt, SCCOL nCol, SCROW nRow1, SCROW nRow2 )
const;
+sc::FormulaGroupContext& rCxt, SCCOL nCol, SCROW nRow1, SCROW nRow2 );
ScRefCellValue GetRefCellValue( SCCOL nCol, SCROW nRow );
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 3704c6d..82990ab 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2073,23 +2073,189 @@ void ScColumn::FillMatrix( ScMatrix& rMat, size_t
nMatCol, SCROW nRow1, SCROW nR
sc::ParseBlock(maCells.begin(), maCells, aFunc, nRow1, nRow2);
}
-const double* ScColumn::FetchDoubleArray( sc::FormulaGroupContext& /*rCxt*/,
SCROW nRow1, SCROW nRow2 ) const
+namespace {
+
+bool appendDouble(
+sc::FormulaGroupContext::DoubleArrayType& rArray, size_t nLen,
+sc::CellStoreType::iterator it, const sc::CellStoreType::iterator& itEnd )
{
-// TODO: I'll use the context object later.
-if (nRow1 > nRow2)
-return NULL;
+size_t nLenRemain = nLen;
+for (; it != itEnd; ++it)
+{
+switch (it->type)
+{
+case sc::element_type_numeric:
+{
+sc::numeric_block::iterator itData =
sc::numeric_block::begin(*it->data);
+sc::numeric_block::iterator itDataEnd;
+if (nLenRemain >= it->size)
+{
+// Block is shorter than the remaining requested length.
+itDataEnd = sc::numeric_block::end(*it->data);
+nLenRemain -= it->size;
+}
+else
+{
+itDataEnd = itData;
+std::advance(itDataEnd, nLenRemain);
+nLenRemain = 0;
+}
-std::pair aPos =
maCells.position(nRow1);
-if (aPos.first->type != sc::element_type_numeric)
-// This is not a numeric cell block.
+for (; itData != itDataEnd; ++itData)
+rArray.push_back(*itData);
+}
+break;
+case sc::element_type_formula:
+{
+sc::formula_block::iterator itData =
sc::formula_block::begin(*it->data);
+sc::formula_block::iterator itDataEnd;
+if (nLenRemain >= it->size)
+{
+// Block is shorter than the remaining requested length.
+itDataEnd = sc::formula_block::end(*it->data);
+nLenRemain -= it->size;
+}
+else
+{
+
[Libreoffice-commits] core.git: include/xmloff
include/xmloff/XMLStringVector.hxx | 32
include/xmloff/txtparae.hxx|3 +--
include/xmloff/xmlnume.hxx |1 -
3 files changed, 1 insertion(+), 35 deletions(-)
New commits:
commit af41cbde659fec031706348c23c5672316ca026c
Author: Thomas Arnhold
Date: Fri Jun 28 16:40:29 2013 +0200
no need for XMLStringVector
Change-Id: I9e83c797da7e8a30d08db0ca0279a73d3f335477
diff --git a/include/xmloff/XMLStringVector.hxx
b/include/xmloff/XMLStringVector.hxx
deleted file mode 100644
index 863ec7a..000
--- a/include/xmloff/XMLStringVector.hxx
+++ /dev/null
@@ -1,32 +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 .
- */
-
-#ifndef _XMLOFF_XMLSTRINGVECTOR_HXX
-#define _XMLOFF_XMLSTRINGVECTOR_HXX
-
-#include
-
-#include
-
-typedef ::std::vector < OUString> XMLStringVector;
-
-
-#endif // _XMLOFF_XMLSTRINGVECTOR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index e37a6de..df7ce28 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -31,7 +31,6 @@
#include
#include
#include
-#include
#include
#include
@@ -87,7 +86,7 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public
XMLStyleExport
/// may be NULL (if no redlines should be exported; e.g. in block mode)
XMLRedlineExport*pRedlineExport;
-XMLStringVector *pHeadingStyles;
+std::vector *pHeadingStyles;
sal_BoolbProgress;
diff --git a/include/xmloff/xmlnume.hxx b/include/xmloff/xmlnume.hxx
index 78e7cbf..256d2a2 100644
--- a/include/xmloff/xmlnume.hxx
+++ b/include/xmloff/xmlnume.hxx
@@ -22,7 +22,6 @@
#include
#include
-#include
#include
namespace com { namespace sun { namespace star {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - connectivity/source
connectivity/source/parse/sqlnode.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 2cfb215de60eaa253766237c711f4f714dedb3c7
Author: Lionel Elie Mamane
Date: Fri Jun 28 16:25:11 2013 +0200
impl_parseLikeNodeToString_throw should be called only on a like_predicate
Change-Id: I3597aadab8b13703ed7b7731d530320c4e5999be
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index 9b31519..5b034e2 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -747,6 +747,7 @@ void
OSQLParseNode::impl_parseTableRangeNodeToString_throw(OUStringBuffer& rStri
void OSQLParseNode::impl_parseLikeNodeToString_throw( OUStringBuffer& rString,
const SQLParseNodeParameter& rParam, bool bSimple ) const
{
SAL_INFO( "connectivity.parse", "parse ocke.jans...@sun.com
OSQLParseNode::impl_parseLikeNodeToString_throw" );
+assert(SQL_ISRULE(this,like_predicate));
OSL_ENSURE(count() == 2,"count != 2: Prepare for GPF");
const OSQLParseNode* pEscNode = NULL;
commit ede7f6ae5fa9fd7a466066de74941a09117cc9a0
Author: Lionel Elie Mamane
Date: Fri Jun 28 16:12:26 2013 +0200
fdo#66130 correct "skip column name" condition for LIKE predicate
When converting a parse tree to SQL snippet for a predicate in the
context of a column, we skip the name of the same column in 'simple'
cases.
This is used mainly in the "Criterion" lines of query design,
and in the search/filter dialogs of forms, tables, etc.
In all other cases (such as when creating a full SQL command, or for
references to *other* columns than the context one), the column name
must be printed out.
In this respect, the condition "should we skip the column name?" in
impl_parseLikeNodeToString_throw was buggy, and different from the
one in the general case (in impl_parseNodeToString_throw), leading
to generating invalid SQL like:
SELECT foo, bar FROM baz LEFT JOIN qux ON LIKE qux.quu
instead of
SELECT foo, bar FROM baz LEFT JOIN qux ON baz.baa LIKE qux.quu
Change-Id: Ie14fce319554a66feb0fd0ce1a03d947a46a820a
diff --git a/connectivity/source/parse/sqlnode.cxx
b/connectivity/source/parse/sqlnode.cxx
index 07c2daf..9b31519 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -755,7 +755,7 @@ void OSQLParseNode::impl_parseLikeNodeToString_throw(
OUStringBuffer& rString, c
SQLParseNodeParameter aNewParam(rParam);
//aNewParam.bQuote = sal_True; // why setting this to true? @see
http://www.openoffice.org/issues/show_bug.cgi?id=75557
-if (bSimple && !columnMatchP(m_aChildren[0], rParam))
+if ( !(bSimple && rParam.bPredicate && rParam.xField.is() &&
SQL_ISRULE(m_aChildren[0],column_ref) && columnMatchP(m_aChildren[0], rParam)) )
m_aChildren[0]->impl_parseNodeToString_throw( rString, aNewParam,
bSimple );
const OSQLParseNode* pPart2 = m_aChildren[1];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - config_host.mk.in configure.ac
config_host.mk.in |1 + configure.ac | 20 2 files changed, 21 insertions(+) New commits: commit 892a0921f23bddd83a8c9066bfcb4c7338150dd3 Author: LuboÅ¡ LuÅák Date: Fri Jun 28 16:03:05 2013 +0200 detect -isystem The base part of 151abb8b2b9d3a9b98cec12e29484d12109b (and follow-up) fixes, for other commits using ISYSTEM. Change-Id: I9ab1ef95ec02ad30f943084161f76da1b2985b88 Signed-off-by: Jan Holesovsky diff --git a/config_host.mk.in b/config_host.mk.in index 17ab6a6..bcb016d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -258,6 +258,7 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ export INSTALLDIR=@INSTALLDIR@ export INSTALLDIRNAME=@INSTALLDIRNAME@ export INTRO_BITMAP=@INTRO_BITMAP@ +export ISYSTEM=@ISYSTEM@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAINTERPRETER=@JAVAINTERPRETER@ export JAVACISGCJ=@JAVACISGCJ@ diff --git a/configure.ac b/configure.ac index 06e7954..e97379d 100644 --- a/configure.ac +++ b/configure.ac @@ -2860,6 +2860,26 @@ AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED) AC_SUBST(XCRUN) AC_SUBST(MACOSX_CODESIGNING_IDENTITY) +# Use -isystem (gcc) if possible, to avoid warnigs in 3rd party headers. +ISYSTEM= +if test "$GCC" = "yes"; then +AC_MSG_CHECKING( for -isystem ) +save_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS -Werror" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ ISYSTEM=-isystem ],[]) +CFLAGS=$save_CFLAGS +if test -n "$ISYSTEM"; then +AC_MSG_RESULT(yes) +else +AC_MSG_RESULT(no) +fi +fi +if test -z "$ISYSTEM"; then +# fall back to using -I +ISYSTEM=-I +fi +AC_SUBST(ISYSTEM) + dnl === dnl Windows specific tests and stuff dnl === ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - config_host.mk.in configure.ac
config_host.mk.in |1 + configure.ac | 20 2 files changed, 21 insertions(+) New commits: commit 6c5a33501453e7e76cb5c1ad836a7ad4f0a69bf5 Author: LuboÅ¡ LuÅák Date: Fri Jun 28 16:03:05 2013 +0200 detect -isystem The base part of 151abb8b2b9d3a9b98cec12e29484d12109b (and follow-up) fixes, for other commits using ISYSTEM. Change-Id: I9ab1ef95ec02ad30f943084161f76da1b2985b88 diff --git a/config_host.mk.in b/config_host.mk.in index 05e4dfc..4f1842d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -265,6 +265,7 @@ export INPATH_FOR_BUILD=@INPATH_FOR_BUILD@ export INSTALLDIR=@INSTALLDIR@ export INSTALLDIRNAME=@INSTALLDIRNAME@ export INTRO_BITMAP=@INTRO_BITMAP@ +export ISYSTEM=@ISYSTEM@ export JAVAIFLAGS=@JAVAIFLAGS@ export JAVAINTERPRETER=@JAVAINTERPRETER@ export JAVACISGCJ=@JAVACISGCJ@ diff --git a/configure.ac b/configure.ac index e4c6827..e05fc81 100644 --- a/configure.ac +++ b/configure.ac @@ -2883,6 +2883,26 @@ AC_SUBST(MAC_OS_X_VERSION_MAX_ALLOWED) AC_SUBST(XCRUN) AC_SUBST(MACOSX_CODESIGNING_IDENTITY) +# Use -isystem (gcc) if possible, to avoid warnigs in 3rd party headers. +ISYSTEM= +if test "$GCC" = "yes"; then +AC_MSG_CHECKING( for -isystem ) +save_CFLAGS=$CFLAGS +CFLAGS="$CFLAGS -Werror" +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ ISYSTEM=-isystem ],[]) +CFLAGS=$save_CFLAGS +if test -n "$ISYSTEM"; then +AC_MSG_RESULT(yes) +else +AC_MSG_RESULT(no) +fi +fi +if test -z "$ISYSTEM"; then +# fall back to using -I +ISYSTEM=-I +fi +AC_SUBST(ISYSTEM) + dnl === dnl Windows specific tests and stuff dnl === ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx |4 ++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx |8
2 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit a09c27ec3ea614630c367aa90eab8fc62d077227
Author: Miklos Vajna
Date: Fri Jun 28 15:53:08 2013 +0200
RTFDesitnationState -> RTFDestinationState
Change-Id: I74e371b531d1a0d5cc9393dd10b9ee2c65ac2e4e
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9538101..4195dac 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -4657,12 +4657,12 @@ void RTFDocumentImpl::setInternalState(RTFInternalState
nInternalState)
m_aStates.top().nInternalState = nInternalState;
}
-RTFDesitnationState RTFDocumentImpl::getDestinationState()
+RTFDestinationState RTFDocumentImpl::getDestinationState()
{
return m_aStates.top().nDestinationState;
}
-void RTFDocumentImpl::setDestinationState(RTFDesitnationState
nDestinationState)
+void RTFDocumentImpl::setDestinationState(RTFDestinationState
nDestinationState)
{
m_aStates.top().nDestinationState = nDestinationState;
}
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 44c5f92..e48fe5d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -39,7 +39,7 @@ namespace writerfilter {
// Note that this is not a 1:1 mapping between destination control
// words, e.g. RTF_PICT gets mapped to DESTINATION_PICT or
// DESTINATION_SHAPEPROPERTYVALUEPICT, etc.
-enum RTFDesitnationState
+enum RTFDestinationState
{
DESTINATION_NORMAL,
DESTINATION_SKIP,
@@ -319,7 +319,7 @@ namespace writerfilter {
RTFDocumentImpl* m_pDocumentImpl;
RTFInternalState nInternalState;
-RTFDesitnationState nDestinationState;
+RTFDestinationState nDestinationState;
RTFFieldStatus nFieldStatus;
RTFBorderState nBorderState;
// font table, stylesheet table
@@ -441,8 +441,8 @@ namespace writerfilter {
bool isInBackground();
RTFInternalState getInternalState();
void setInternalState(RTFInternalState nInternalState);
-RTFDesitnationState getDestinationState();
-void setDestinationState(RTFDesitnationState
nDestinationState);
+RTFDestinationState getDestinationState();
+void setDestinationState(RTFDestinationState
nDestinationState);
void setDestinationText(OUString& rString);
/// Resolve a picture: If not inline, then anchored.
int resolvePict(bool bInline);
___
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 |2 ++
1 file changed, 2 insertions(+)
New commits:
commit d61ad2faff41548da8bfc612611ae4574bb5e9c8
Author: LuboÅ¡ LuÅák
Date: Fri Jun 28 14:56:04 2013 +0200
s/-I/-isystem/ also for KDE headers
Should have been included in df7dcd3982c80031bda141822a469fd5cc6f .
Change-Id: Icc6ecf42580d708dc8c610866212ece2e2026452
diff --git a/configure.ac b/configure.ac
index 1d4bbc1..aa440fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10539,6 +10539,7 @@ your KDE3 installation by exporting KDEDIR before
running "configure".])
dnl Set the variables
KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE
-DQT_THREAD_SUPPORT"
KDE_LIBS="-L$kde_libdir -L$qt_libdir -lkdeui -lkdecore -lqt-mt"
+KDE_CFLAGS=$(printf '%s' "$KDE_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
fi
AC_SUBST(KDE_CFLAGS)
AC_SUBST(KDE_LIBS)
@@ -10691,6 +10692,7 @@ the root of your Qt installation by exporting QT4DIR
before running "configure".
KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui`
-I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkio -lkfile -lkdeui -lkdecore
-lQtCore -lQtGui"
+KDE4_CFLAGS=$(printf '%s' "$KDE4_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
AC_LANG_PUSH([C++])
save_CXXFLAGS=$CXXFLAGS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - forms/source xmloff/source
forms/source/component/ListBox.cxx |5 +
xmloff/source/forms/elementexport.cxx |3 ++-
xmloff/source/forms/propertyexport.cxx |4 ++--
xmloff/source/forms/propertyexport.hxx | 11 ---
4 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit 60d4d5a4ec70186f64b12ebb485428e905283785
Author: Lionel Elie Mamane
Date: Thu Jun 27 17:14:16 2013 +0200
fdo#66171 ListBox correctly save empty or zero BoundColumn
Change-Id: I05fa923f962191081ea3318837d3e181c183b466
Reviewed-on: https://gerrit.libreoffice.org/4590
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index c3aba8b..6b143c4 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -609,6 +609,11 @@ namespace frm
_rxInStream >> nValue;
m_aBoundColumn <<= nValue;
}
+else // the constructor initialises to 1, so if it is empty,
+ // we must explicitly set to empty
+{
+m_aBoundColumn = Any();
+}
if (nVersion > 2)
readHelpTextCompatibly(_rxInStream);
diff --git a/xmloff/source/forms/elementexport.cxx
b/xmloff/source/forms/elementexport.cxx
index 818be04..2254cec 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -888,7 +888,8 @@ namespace xmloff
OAttributeMetaData::getDatabaseAttributeNamespace(DA_BOUND_COLUMN),
OAttributeMetaData::getDatabaseAttributeName(DA_BOUND_COLUMN),
PROPERTY_BOUNDCOLUMN,
-0);
+0,
+true);
RESET_BIT( nIncludeDatabase, DA_BOUND_COLUMN );
}
diff --git a/xmloff/source/forms/propertyexport.cxx
b/xmloff/source/forms/propertyexport.cxx
index 2af7199..83f0601 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -319,7 +319,7 @@ namespace xmloff
//-
void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16
_nNamespaceKey, const sal_Char* _pAttributeName,
-const ::rtl::OUString& _rPropertyName, const sal_Int16 _nDefault)
+const ::rtl::OUString& _rPropertyName, const sal_Int16 _nDefault, bool
force)
{
DBG_CHECK_PROPERTY( _rPropertyName, sal_Int16 );
@@ -328,7 +328,7 @@ namespace xmloff
m_xProps->getPropertyValue( _rPropertyName ) >>= nCurrentValue;
// add the attribute
-if (_nDefault != nCurrentValue)
+if (force || _nDefault != nCurrentValue)
{
// let the formatter of the export context build a string
::rtl::OUStringBuffer sBuffer;
diff --git a/xmloff/source/forms/propertyexport.hxx
b/xmloff/source/forms/propertyexport.hxx
index cab0764..191f55a 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -160,14 +160,19 @@ namespace xmloff
@param _pPropertyName
the name of the property to ask the control for
@param _nDefault
-the default of the attribute. If the current property value
equals this default, no
-attribute is added.
+the default of the attribute. See force parameter.
+@param force
+if true and the property is not set or does not contain a
sal_Int16,
+then _nDefault is written out.
+if false and the current property value equals _nDefault,
+then no attribute is added.
*/
void exportInt16PropertyAttribute(
const sal_uInt16 _nNamespaceKey,
const sal_Char* _pAttributeName,
const ::rtl::OUString& _rPropertyName,
-const sal_Int16 _nDefault);
+const sal_Int16 _nDefault,
+const bool force = false);
/** add an attribute which is represented by a sal_Int32 property to
the export context
___
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' - forms/source xmloff/source
forms/source/component/ListBox.cxx |5 +
xmloff/source/forms/elementexport.cxx |3 ++-
xmloff/source/forms/propertyexport.cxx |4 ++--
xmloff/source/forms/propertyexport.hxx | 11 ---
4 files changed, 17 insertions(+), 6 deletions(-)
New commits:
commit 19d08b0c655ff66c2948d6390e32e0ad0a1a67a3
Author: Lionel Elie Mamane
Date: Thu Jun 27 17:14:16 2013 +0200
fdo#66171 ListBox correctly save empty or zero BoundColumn
Change-Id: I05fa923f962191081ea3318837d3e181c183b466
Reviewed-on: https://gerrit.libreoffice.org/4589
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 14569f5..95b7ea1 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -650,6 +650,11 @@ namespace frm
_rxInStream >> nValue;
m_aBoundColumn <<= nValue;
}
+else // the constructor initialises to 1, so if it is empty,
+ // we must explicitly set to empty
+{
+m_aBoundColumn = Any();
+}
if (nVersion > 2)
readHelpTextCompatibly(_rxInStream);
diff --git a/xmloff/source/forms/elementexport.cxx
b/xmloff/source/forms/elementexport.cxx
index b10fa43..ca28348 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/xmloff/source/forms/elementexport.cxx
@@ -890,7 +890,8 @@ namespace xmloff
OAttributeMetaData::getDatabaseAttributeNamespace(DA_BOUND_COLUMN),
OAttributeMetaData::getDatabaseAttributeName(DA_BOUND_COLUMN),
PROPERTY_BOUNDCOLUMN,
-0);
+0,
+true);
RESET_BIT( nIncludeDatabase, DA_BOUND_COLUMN );
}
diff --git a/xmloff/source/forms/propertyexport.cxx
b/xmloff/source/forms/propertyexport.cxx
index 73f5e1d..7e7597b 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -319,7 +319,7 @@ namespace xmloff
//-
void OPropertyExport::exportInt16PropertyAttribute(const sal_uInt16
_nNamespaceKey, const sal_Char* _pAttributeName,
-const OUString& _rPropertyName, const sal_Int16 _nDefault)
+const OUString& _rPropertyName, const sal_Int16 _nDefault, bool force)
{
DBG_CHECK_PROPERTY( _rPropertyName, sal_Int16 );
@@ -328,7 +328,7 @@ namespace xmloff
m_xProps->getPropertyValue( _rPropertyName ) >>= nCurrentValue;
// add the attribute
-if (_nDefault != nCurrentValue)
+if (force || _nDefault != nCurrentValue)
{
// let the formatter of the export context build a string
OUStringBuffer sBuffer;
diff --git a/xmloff/source/forms/propertyexport.hxx
b/xmloff/source/forms/propertyexport.hxx
index a556753..ffc7f7c 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -160,14 +160,19 @@ namespace xmloff
@param _pPropertyName
the name of the property to ask the control for
@param _nDefault
-the default of the attribute. If the current property value
equals this default, no
-attribute is added.
+the default of the attribute. See force parameter.
+@param force
+if true and the property is not set or does not contain a
sal_Int16,
+then _nDefault is written out.
+if false and the current property value equals _nDefault,
+then no attribute is added.
*/
void exportInt16PropertyAttribute(
const sal_uInt16 _nNamespaceKey,
const sal_Char* _pAttributeName,
const OUString& _rPropertyName,
-const sal_Int16 _nDefault);
+const sal_Int16 _nDefault,
+const bool force = false);
/** add an attribute which is represented by a sal_Int32 property to
the export context
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - cairo/cairo cairo/UnpackedTarball_cairo.mk configure.ac
cairo/UnpackedTarball_cairo.mk |6 ++
cairo/cairo/no-flto-clang.patch | 11 +++
configure.ac|2 ++
3 files changed, 19 insertions(+)
New commits:
commit 833db52c5cb38c0ae61f80db98191eea08e2f6f3
Author: Michael Stahl
Date: Fri May 31 15:24:34 2013 +0200
configure: use -isystem for GSTREAMER_CFLAGS
... to work around GCC 4.8.0 -Werror=literal-suffix in gst/video/video.h
definition of GST_VIDEO_CAPS_RGB8_PALETTED.
Change-Id: I514b29d58f348bad0b13c7ef66db4b3ee34516cd
(cherry picked from commit 18b0bda1be62da1b0f9c1fc40864ccc486d5b43c)
Signed-off-by: LuboÅ¡ LuÅák
diff --git a/configure.ac b/configure.ac
index 92f0cfa..e4c6827 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9614,6 +9614,7 @@ if test "$build_gstreamer" = "yes"; then
ENABLE_GSTREAMER="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GSTREAMER, gstreamer-1.0 gstreamer-plugins-base-1.0
gstreamer-video-1.0 )
+GSTREAMER_CFLAGS="`echo $GSTREAMER_CFLAGS | sed -e
\"s/-I/${ISYSTEM}/g\"`"
else
AC_MSG_RESULT([no])
fi
@@ -9633,6 +9634,7 @@ if test "$build_gstreamer_0_10" = "yes"; then
PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10
gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10],, [
PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10
gstreamer-plugins-base-0.10] )
])
+GSTREAMER_0_10_CFLAGS="`echo $GSTREAMER_0_10_CFLAGS | sed -e
\"s/-I/${ISYSTEM}/g\"`"
else
AC_MSG_RESULT([no])
fi
commit a0f87de207c27785e1c9a4b4f11bbe8b704990b9
Author: LuboÅ¡ LuÅák
Date: Wed Jun 26 15:13:54 2013 +0200
prevent cairo from using -flto with clang, cairo uses it incorrectly
The option should be used also at link time (as e.g. the gcc man page says),
but cairo doesn't do so, and since -flto makes clang generate .o with LLVM
bytecode, plain ld chokes on it.
Change-Id: Ia5ce9a98afa4f88b8d0943a5971450d7009af913
Signed-off-by: Michael Stahl
diff --git a/cairo/UnpackedTarball_cairo.mk b/cairo/UnpackedTarball_cairo.mk
index fd14ffe..93cd015 100644
--- a/cairo/UnpackedTarball_cairo.mk
+++ b/cairo/UnpackedTarball_cairo.mk
@@ -41,4 +41,10 @@ ifneq (,$(filter ANDROID IOS,$(OS)))
$(eval $(call
gb_UnpackedTarball_add_file,cairo,.,cairo/cairo/dummy_pkg_config))
endif
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
+ cairo/cairo/no-flto-clang.patch \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/cairo/cairo/no-flto-clang.patch b/cairo/cairo/no-flto-clang.patch
new file mode 100644
index 000..725f484
--- /dev/null
+++ b/cairo/cairo/no-flto-clang.patch
@@ -0,0 +1,11 @@
+--- misc/cairo-1.10.2/configure.sav2013-06-26 15:00:42.0 +0200
misc/cairo-1.10.2/configure2013-06-26 15:03:36.995117032 +0200
+@@ -17236,7 +17236,7 @@ MAYBE_WARN="-Wall -Wextra \
+ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
+ -erroff=E_ENUM_TYPE_MISMATCH_OP"
+
+-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
++MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+
+ MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/Library_postgresql-sdbc-impl.mk connectivity/source
connectivity/Library_postgresql-sdbc-impl.mk |1
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 10
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 10
connectivity/source/drivers/postgresql/pq_tools.cxx | 105
--
connectivity/source/drivers/postgresql/pq_tools.hxx |9
connectivity/source/drivers/postgresql/pq_updateableresultset.cxx | 10
6 files changed, 22 insertions(+), 123 deletions(-)
New commits:
commit 2cc79aeaf0fb68ea5bed912ed229166c7af3e45d
Author: Lionel Elie Mamane
Date: Thu Jun 27 12:56:40 2013 +0200
Replace buggy pgsql-sdbc datetime functions with dbtools equivalents
In particular, the string2time function segfaults when called on an empty
string
(unconditionally tries to access the n-th character without checking
whether the string is that long)
this happens in particular when reading a column of type TIME with a NULL
value
Change-Id: I302044f67a92fe20685ce677ba3affdb9b44cb53
Reviewed-on: https://gerrit.libreoffice.org/4582
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk
b/connectivity/Library_postgresql-sdbc-impl.mk
index 6cc9f39..bdb96c5 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_Library_use_sdk_api,postgresql-sdbc-impl))
$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
cppu \
cppuhelper \
+ dbtools \
sal \
salhelper \
$(gb_UWINAPI) \
diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
index 1abe9de..1747909 100644
--- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
+++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx
@@ -49,6 +49,8 @@
#include
+#include
+
using osl::Mutex;
using osl::MutexGuard;
@@ -83,6 +85,8 @@ using com::sun::star::sdbc::XResultSetMetaDataSupplier;
using com::sun::star::beans::Property;
+using namespace dbtools;
+
namespace pq_sdbc_driver
{
static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper()
@@ -540,19 +544,19 @@ Sequence< sal_Int8 > BaseResultSet::getBytes( sal_Int32
columnIndex )
::com::sun::star::util::Date BaseResultSet::getDate( sal_Int32 columnIndex )
throw (SQLException, RuntimeException)
{
-return string2Date( getString( columnIndex ) );
+return DBTypeConversion::toDate( getString( columnIndex ) );
}
::com::sun::star::util::Time BaseResultSet::getTime( sal_Int32 columnIndex )
throw (SQLException, RuntimeException)
{
-return string2Time( getString( columnIndex ) );
+return DBTypeConversion::toTime( getString( columnIndex ) );
}
::com::sun::star::util::DateTime BaseResultSet::getTimestamp( sal_Int32
columnIndex )
throw (SQLException, RuntimeException)
{
-return string2DateTime( getString( columnIndex ) );
+return DBTypeConversion::toDateTime( getString( columnIndex ) );
}
// LEM TODO: these look like they are missing an actual implementation
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index e6dec90..fb82b99 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -54,6 +54,8 @@
#include
+#include
+
using osl::Mutex;
using osl::MutexGuard;
@@ -89,6 +91,8 @@ using com::sun::star::beans::XPropertySet;
using com::sun::star::beans::XMultiPropertySet;
using com::sun::star::beans::XFastPropertySet;
+using namespace dbtools;
+
namespace pq_sdbc_driver
{
static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper()
@@ -597,20 +601,20 @@ void PreparedStatement::setBytes(
void PreparedStatement::setDate( sal_Int32 parameterIndex, const
::com::sun::star::util::Date& x )
throw (SQLException, RuntimeException)
{
-setString( parameterIndex, date2String( x ) );
+setString( parameterIndex, DBTypeConversion::toDateString( x ) );
}
void PreparedStatement::setTime( sal_Int32 parameterIndex, const
::com::sun::star::util::Time& x )
throw (SQLException, RuntimeException)
{
-setString( parameterIndex, time2String( x ) );
+setString( parameterIndex, DBTypeConversion::toTimeString( x ) );
}
void PreparedStatement::setTimestamp(
sal_Int32 parameterIndex, const ::com::sun::star::util::DateTime& x )
throw (SQLException, RuntimeException)
{
-setString( parameterIndex, dateTime2String( x ) );
+setString( parameterIndex, DBTypeConversion::toDateTimeString( x ) );
}
void PreparedStatement::setBinaryStream(
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/p
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/commontools/dbconversion.cxx | 99 +--
1 file changed, 42 insertions(+), 57 deletions(-)
New commits:
commit da76d753485ae1dc2c65778b96fa6ffa1258fc54
Author: Lionel Elie Mamane
Date: Thu Jun 27 18:59:12 2013 +0200
fix nanosecond computation
when less/more than nine digits
Change-Id: I222ae7c51e37468a01abc9caab91657ea2593d13
Reviewed-on: https://gerrit.libreoffice.org/4592
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/connectivity/source/commontools/dbconversion.cxx
b/connectivity/source/commontools/dbconversion.cxx
index f777420..73b7638 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
@@ -56,6 +57,7 @@ namespace dbtools
using namespace ::comphelper;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::util;
+namespace utl = ::com::sun::star::util;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
@@ -69,7 +71,7 @@ namespace dbtools
return STANDARD_DB_DATE;
}
//--
-OUString DBTypeConversion::toDateString(const Date& rDate)
+OUString DBTypeConversion::toDateString(const utl::Date& rDate)
{
sal_Char s[11];
snprintf(s,
@@ -82,7 +84,7 @@ namespace dbtools
return OUString::createFromAscii(s);
}
//--
-OUString DBTypeConversion::toTimeString(const Time& rTime)
+OUString DBTypeConversion::toTimeString(const utl::Time& rTime)
{
std::ostringstream ostr;
using std::setw;
@@ -95,19 +97,19 @@ namespace dbtools
}
//--
-OUString DBTypeConversion::toDateTimeString(const DateTime& _rDateTime)
+OUString DBTypeConversion::toDateTimeString(const utl::DateTime&
_rDateTime)
{
-Date aDate(_rDateTime.Day,_rDateTime.Month,_rDateTime.Year);
+utl::Date aDate(_rDateTime.Day,_rDateTime.Month,_rDateTime.Year);
OUStringBuffer aTemp(toDateString(aDate));
aTemp.appendAscii(" ");
-Time
aTime(_rDateTime.NanoSeconds,_rDateTime.Seconds,_rDateTime.Minutes,_rDateTime.Hours);
+utl::Time
aTime(_rDateTime.NanoSeconds,_rDateTime.Seconds,_rDateTime.Minutes,_rDateTime.Hours);
aTemp.append( toTimeString(aTime) );
return aTemp.makeStringAndClear();
}
//--
-Date DBTypeConversion::toDate(sal_Int32 _nVal)
+utl::Date DBTypeConversion::toDate(sal_Int32 _nVal)
{
-Date aReturn;
+utl::Date aReturn;
aReturn.Day = (sal_uInt16)(_nVal % 100);
aReturn.Month = (sal_uInt16)((_nVal / 100) % 100);
aReturn.Year = (sal_uInt16)(_nVal / 1);
@@ -115,9 +117,9 @@ namespace dbtools
}
//--
-Time DBTypeConversion::toTime(sal_Int64 _nVal)
+utl::Time DBTypeConversion::toTime(sal_Int64 _nVal)
{
-Time aReturn;
+utl::Time aReturn;
sal_uInt64 unVal = static_cast(_nVal >= 0 ? _nVal :
-_nVal);
aReturn.Hours = unVal / hourMask;
aReturn.Minutes = (unVal / minMask) % 100;
@@ -127,7 +129,7 @@ namespace dbtools
}
//--
-sal_Int32 DBTypeConversion::toINT32(const Date& rVal)
+sal_Int32 DBTypeConversion::toINT32(const utl::Date& rVal)
{
return ((sal_Int32)(rVal.Day%100)) +
(((sal_Int32)(rVal.Month%100))*100) +
@@ -135,7 +137,7 @@ namespace dbtools
}
//--
-sal_Int64 DBTypeConversion::toINT64(const Time& rVal)
+sal_Int64 DBTypeConversion::toINT64(const utl::Time& rVal)
{
// normalize time
sal_Int32 nSeconds = rVal.Seconds + rVal.NanoSeconds /
nanoSecInSec;
@@ -153,7 +155,7 @@ namespace dbtools
}
//--
-sal_Int32 DBTypeConversion::getMsFromTime(const Time& rVal)
+sal_Int32 DBTypeConversion::getMsFromTime(const utl::Time& rVal)
{
sal_Int32 nHour = rVal.Hours;
sal_Int32 nMin = rVal.Minutes;
@@ -164,7 +166,7 @@ namespace dbtools
}
//--
-sal_Int64 DBTypeConversion::getNsFromTime(const Time& rVal)
+sal_Int64 DBTypeConversion::getNsFromTime(const utl::Time& rVal)
{
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 937abc32bfb5e7bba381f554218444f349380085
Author: Caolán McNamara
Date: Fri Jun 28 13:46:18 2013 +0100
stray debugging
Change-Id: Ie9408fecfdb9216a6a80d92a2c215ebf25997e9f
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 858a8b4..73b6592 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -1250,10 +1250,8 @@ void ImpPDFTabSecurityPage::enablePermissionControls()
{
sal_Bool bIsPDFASel = sal_False;
ImpPDFTabDialog* pParent = static_cast(GetTabDialog());
-fprintf(stderr, "pParent is %p\n", pParent);
if( pParent && pParent->GetTabPage( RID_PDF_TAB_GENER ) )
{
-fprintf(stderr,"got it\n");
bIsPDFASel = ( ( ImpPDFTabGeneralPage* )pParent->
GetTabPage( RID_PDF_TAB_GENER ) )->IsPdfaSelected();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - configure.ac
configure.ac |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3d736faef1cfc619f965d80c0eb112dc7c7426e3
Author: Michael Stahl
Date: Fri May 31 15:24:34 2013 +0200
configure: use -isystem for GSTREAMER_CFLAGS
... to work around GCC 4.8.0 -Werror=literal-suffix in gst/video/video.h
definition of GST_VIDEO_CAPS_RGB8_PALETTED.
Change-Id: I514b29d58f348bad0b13c7ef66db4b3ee34516cd
(cherry picked from commit 18b0bda1be62da1b0f9c1fc40864ccc486d5b43c)
Signed-off-by: LuboÅ¡ LuÅák
diff --git a/configure.ac b/configure.ac
index 299ee69..06e7954 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9509,6 +9509,7 @@ if test "$build_gstreamer" = "yes"; then
ENABLE_GSTREAMER="TRUE"
AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( GSTREAMER, gstreamer-1.0 gstreamer-plugins-base-1.0
gstreamer-video-1.0 )
+GSTREAMER_CFLAGS="`echo $GSTREAMER_CFLAGS | sed -e
\"s/-I/${ISYSTEM}/g\"`"
else
AC_MSG_RESULT([no])
fi
@@ -9528,6 +9529,7 @@ if test "$build_gstreamer_0_10" = "yes"; then
PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10
gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10],, [
PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10
gstreamer-plugins-base-0.10] )
])
+GSTREAMER_0_10_CFLAGS="`echo $GSTREAMER_0_10_CFLAGS | sed -e
\"s/-I/${ISYSTEM}/g\"`"
else
AC_MSG_RESULT([no])
fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 13 - source/text/shared/01/ref_pdf_export.xhp | 23 --- 2 files changed, 12 insertions(+), 24 deletions(-) New commits: commit e26aa35eb646a5f0e1256c72af000595c4845016 Author: Caolán McNamara Date: Fri Jun 28 13:20:05 2013 +0100 update help ids for pdf security page .ui conversion Change-Id: Ida134cf5fe2b1799fad26973797c923cc70bbec7 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 3795343..6743b96 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1741,7 +1741,6 @@ HID_FILTER_NAVIGATOR,38072, HID_FILTER_NAVIGATOR_WIN,38073, HID_FILTER_PDF_INITIAL_VIEW,64150, HID_FILTER_PDF_OPTIONS,64149, -HID_FILTER_PDF_SECURITY,64152, HID_FIRSTSTART_CANCEL,42781, HID_FIRSTSTART_FINISH,42782, HID_FIRSTSTART_NEXT,42780, @@ -6262,8 +6261,6 @@ filter_CheckBox_RID_PDF_TAB_GENER_CB_PDFA_1B_SELECT,867845145, filter_CheckBox_RID_PDF_TAB_GENER_CB_REDUCEIMAGERESOLUTION,867845134, filter_CheckBox_RID_PDF_TAB_GENER_CB_TAGGEDPDF,867845137, filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT,867877986, -filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENAB_ACCESS,867894416, -filter_CheckBox_RID_PDF_TAB_SECURITY_CB_ENDAB_COPY,867894415, filter_ComboBox_RID_PDF_TAB_GENER_CO_REDUCEIMAGERESOLUTION,867848207, filter_Edit_RID_PDF_TAB_GENER_ED_PAGES,867846149, filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT,867847702, @@ -6273,8 +6270,6 @@ filter_ModalDialog_DLG_OPTIONS,1090519040, filter_ModalDialog_RID_PDF_ERROR_DLG,1404878848, filter_NumericField_DLG_OPTIONS_NUM_FLD_QUALITY,1090525185, filter_NumericField_RID_PDF_TAB_OPNFTR_NUM_MAGNF_INITIAL_PAGE,867883100, -filter_PushButton_RID_PDF_TAB_SECURITY_BTN_OWNER_PWD,867897983, -filter_PushButton_RID_PDF_TAB_SECURITY_BTN_USER_PWD,867897976, filter_RadioButton_RID_PDF_TAB_GENER_RB_ALL,867844610, filter_RadioButton_RID_PDF_TAB_GENER_RB_JPEGCOMPRESSION,867844619, filter_RadioButton_RID_PDF_TAB_GENER_RB_LOSSLESSCOMPRESSION,867844618, @@ -6292,14 +6287,6 @@ filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONT,867877472, filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONTFAC,867877473, filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_DEFAULT,867877470, filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_SINGPG,867877471, -filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_ANY_NOCOPY,867893902, -filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_COMMENT,867893901, -filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_FILLFORM,867893900, -filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_INSDEL,867893899, -filter_RadioButton_RID_PDF_TAB_SECURITY_RB_CHANGES_NONE,867893898, -filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_HIGHRES,867893896, -filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_LOWRES,867893895, -filter_RadioButton_RID_PDF_TAB_SECURITY_RB_PRINT_NONE,867893894, formula_CheckBox_RID_FORMULADLG_FORMULA_BTN_MATRIX,2655437835, formula_CheckBox_RID_FORMULADLG_FORMULA_MODAL_BTN_MATRIX,1581728779, formula_Edit_RID_FORMULADLG_FORMULA_ED_REF,2655438867, diff --git a/source/text/shared/01/ref_pdf_export.xhp b/source/text/shared/01/ref_pdf_export.xhp index 424862e..b3c98a1 100644 --- a/source/text/shared/01/ref_pdf_export.xhp +++ b/source/text/shared/01/ref_pdf_export.xhp @@ -229,42 +229,43 @@ Open with Internet browser Cross-document links are opened with the Internet browser. The Internet browser must be able to handle the specified file type inside the hyperlink. + Security tab - + Set passwords Click to open a dialog where you enter the passwords. You can enter a password to open the file. You can enter an optional password that allows to edit the document. Printing - + Not permitted Printing the document is not permitted. - + Low resolution (150 dpi) The document can only be printed in low resolution (150 dpi). Not all PDF readers honor this setting. - + High resolution The document can be printed in high resolution. Changes - + Not permitted No changes of the content are permitted. - + Inserting, deleting, and rotating pages Only inserting, deleting, and rotating pages is permitted. - + Filling in form fields Only filling in form fields is permitted. - + Commenting, filling in form fields Only commenting and filling in form fields is permitted. - + Any except extracting pages All changes are permitted, except extracting pages. - + Enable copying of content Select to enable copying of content to the clipboard. - + Enable text access for accessibility tools Select to enable text access for accessibility tools. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bfe6d9f7ee31e4516a9116cac870d29d5c10990e Author: Caolán McNamara Date: Fri Jun 28 13:20:05 2013 +0100 Updated core Project: help e26aa35eb646a5f0e1256c72af000595c4845016 diff --git a/helpcontent2 b/helpcontent2 index 12227e8..e26aa35 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 12227e8292bb583346c7fca808ddb78fde0f5011 +Subproject commit e26aa35eb646a5f0e1256c72af000595c4845016 ___ 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' - unotools/source
unotools/source/misc/datetime.cxx |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 8fb464bc100bc0c8190a3147db1939df37f42929
Author: Lionel Elie Mamane
Date: Thu Jun 27 19:47:02 2013 +0200
fix crash when parsing empty string
the parsing of the hours would succeed, but the parsing of the minutes
would access past-the-end of the string.
Probably same crash when parsing HH or HHMM formats.
Change-Id: I248810e5c4c425186f33e573634883263caff312
Reviewed-on: https://gerrit.libreoffice.org/4591
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/unotools/source/misc/datetime.cxx
b/unotools/source/misc/datetime.cxx
index 93f60a6..b383dc5 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.cxx
@@ -424,8 +424,11 @@ bool ISO8601parseTime(const OUString &aTimeStr,
starutil::Time& rTime)
}
goto end;
}
+if(n >= aTimeStr.getLength())
+goto end;
}
}
+
// minutes
if (bSuccess && (bSuccess = getISO8601TimeToken(aTimeStr, n, tokInt,
bFrac, tokFrac)))
{
@@ -452,12 +455,14 @@ bool ISO8601parseTime(const OUString &aTimeStr,
starutil::Time& rTime)
}
goto end;
}
+if(n >= aTimeStr.getLength())
+goto end;
}
}
// seconds
if (bSuccess && (bSuccess = getISO8601TimeToken(aTimeStr, n, tokInt,
bFrac, tokFrac)))
{
-if ( bFrac && n < aTimeStr.getLength())
+if (n < aTimeStr.getLength())
// junk after ISO time
bSuccess = false;
// max 60 for leap seconds
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/drivers/jdbc/Timestamp.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit f4fcf5464c249fe15d5e8d3dd09df8b377bcd559 Author: Lionel Elie Mamane Date: Thu Jun 27 08:51:59 2013 +0200 fdo#66216 JDBC no fractional second in time format fractional second allowed in timestamp. But not in time. Don't ask why. Change-Id: I5415889ab4cf4835b8b0db7363b7d9eb0a332393 Reviewed-on: https://gerrit.libreoffice.org/4566 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index a1d1bcd..5337330 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -103,7 +103,8 @@ java_sql_Time::java_sql_Time( const ::com::sun::star::util::Time& _rOut ): java_ jvalue args[1]; // Convert parameters OUString sDateStr; -sDateStr = ::dbtools::DBTypeConversion::toTimeString(_rOut); +// java.sql.Time supports only whole seconds... +sDateStr = ::dbtools::DBTypeConversion::toTimeString(_rOut).copy(0, 8); args[0].l = convertwchar_tToJavaString(t.pEnv,sDateStr); // Turn off Java-Call for the constructor ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/commontools/dbconversion.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 82593374493c967bbb1ba15d005470d7f108ae87
Author: Lionel Elie Mamane
Date: Thu Jun 27 08:51:02 2013 +0200
fdo#66216 fix DBTypeConversion::toTime overflow
Change-Id: I0aba2344afde94226cfbac5b3221e827e6774b3a
Reviewed-on: https://gerrit.libreoffice.org/4565
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/connectivity/source/commontools/dbconversion.cxx
b/connectivity/source/commontools/dbconversion.cxx
index 513a8b0..f777420 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -355,7 +355,7 @@ namespace dbtools
Time DBTypeConversion::toTime(double dVal)
{
sal_Int32 nDays = (sal_Int32)dVal;
-sal_Int32 nNS = sal_Int32((dVal - (double)nDays) * fNanoSecondsPerDay
+ 0.5);
+sal_Int64 nNS = static_cast((dVal - (double)nDays) *
fNanoSecondsPerDay + 0.5);
sal_Int16 nSign;
if ( nNS < 0 )
@@ -369,7 +369,7 @@ namespace dbtools
Time xRet;
// normalize time
// we have to sal_Int32 here because otherwise we get an overflow
-sal_Int32 nNanoSeconds = nNS;
+sal_Int64 nNanoSeconds = nNS;
sal_Int32 nSeconds = nNanoSeconds / nanoSecInSec;
sal_Int32 nMinutes = nSeconds / secInMin;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - connectivity/source
connectivity/source/commontools/dbconversion.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit fe89aa916601e53637259c757a4da433fbc4feda
Author: Lionel Elie Mamane
Date: Thu Jun 27 08:50:37 2013 +0200
fdo#66216 fix DBTypeConversion::toTimeString format
std::ostringstream::width is not sticky
Change-Id: I32d77bec68506b7691a4f86dadb24e62fdc13d42
Reviewed-on: https://gerrit.libreoffice.org/4564
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/connectivity/source/commontools/dbconversion.cxx
b/connectivity/source/commontools/dbconversion.cxx
index 0150cdd..513a8b0 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -28,6 +28,8 @@
#include
#include
#include
+#include
+#include
#define MAX_DAYS3636532
@@ -83,11 +85,12 @@ namespace dbtools
OUString DBTypeConversion::toTimeString(const Time& rTime)
{
std::ostringstream ostr;
+using std::setw;
ostr.fill('0');
-ostr.width(2);
-ostr << rTime.Hours << ":" << rTime.Minutes << ":" << rTime.Seconds;
-ostr.width(9);
-ostr << "." << rTime.NanoSeconds;
+ostr << setw(2) << rTime.Hours << ":"
+ << setw(2) << rTime.Minutes << ":"
+ << setw(2) << rTime.Seconds << "."
+ << setw(9) << rTime.NanoSeconds;
return OUString::createFromAscii(ostr.str().c_str());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source include/connectivity
connectivity/source/commontools/CommonTools.cxx | 44
connectivity/source/commontools/FValue.cxx |6 +--
include/connectivity/CommonTools.hxx|5 --
3 files changed, 3 insertions(+), 52 deletions(-)
New commits:
commit d6bba47bcb3030163fffd0b8f01c03d038989dea
Author: Lionel Elie Mamane
Date: Thu Jun 27 09:28:48 2013 +0200
remove ::connectivity::to(Date)?(Time)?String; same as DBTypeConversion::*
Change-Id: I5f2ef1ecff7e2071b55c27b9dc60e7d92950435c
Reviewed-on: https://gerrit.libreoffice.org/4563
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/connectivity/source/commontools/CommonTools.cxx
b/connectivity/source/commontools/CommonTools.cxx
index 48357f2..414987e 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -111,50 +111,6 @@ namespace connectivity
return ( *pStr == 0 ) && ( *pWild == 0 );
}
//--
-OUString toDateString(const ::com::sun::star::util::Date& rDate)
-{
-sal_Char s[11];
-snprintf(s,
-sizeof(s),
-"%04d-%02d-%02d",
-(int)rDate.Year,
-(int)rDate.Month,
-(int)rDate.Day);
-s[10] = 0;
-return OUString::createFromAscii(s);
-}
-
-//--
-OUString toTimeString(const ::com::sun::star::util::Time& rTime)
-{
-sal_Char s[9];
-snprintf(s,
-sizeof(s),
-"%02d:%02d:%02d",
-(int)rTime.Hours,
-(int)rTime.Minutes,
-(int)rTime.Seconds);
-s[8] = 0;
-return OUString::createFromAscii(s);
-}
-
-//--
-OUString toDateTimeString(const ::com::sun::star::util::DateTime&
rDateTime)
-{
-sal_Char s[20];
-snprintf(s,
-sizeof(s),
-"%04d-%02d-%02d %02d:%02d:%02d",
-(int)rDateTime.Year,
-(int)rDateTime.Month,
-(int)rDateTime.Day,
-(int)rDateTime.Hours,
-(int)rDateTime.Minutes,
-(int)rDateTime.Seconds);
-s[19] = 0;
-return OUString::createFromAscii(s);
-}
-
#ifdef SOLAR_JAVA
::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const
Reference& _rxContext)
{
diff --git a/connectivity/source/commontools/FValue.cxx
b/connectivity/source/commontools/FValue.cxx
index f3aaeeb..bf78289 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -983,13 +983,13 @@ OUString ORowSetValue::getString( ) const
aRet = OUString::number(static_cast(*this));
break;
case DataType::DATE:
-aRet = connectivity::toDateString(*this);
+aRet = DBTypeConversion::toDateString(*this);
break;
case DataType::TIME:
-aRet = connectivity::toTimeString(*this);
+aRet = DBTypeConversion::toTimeString(*this);
break;
case DataType::TIMESTAMP:
-aRet = connectivity::toDateTimeString(*this);
+aRet = DBTypeConversion::toDateTimeString(*this);
break;
case DataType::BINARY:
case DataType::VARBINARY:
diff --git a/include/connectivity/CommonTools.hxx
b/include/connectivity/CommonTools.hxx
index c13b97d..294ec3f 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -53,11 +53,6 @@ namespace connectivity
{
return match(rWild.getStr(), rStr.getStr(), cEscape);
}
-
//--
-OOO_DLLPUBLIC_DBTOOLS OUString toDateString(const
::com::sun::star::util::Date& rDate);
-OOO_DLLPUBLIC_DBTOOLS OUString toTimeString(const
::com::sun::star::util::Time& rTime);
-OOO_DLLPUBLIC_DBTOOLS OUString toDateTimeString(const
::com::sun::star::util::DateTime& rDateTime);
-
// typedefs
typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper >
OWeakRefArray;
typedef ::com::sun::star::uno::Reference<
::com::sun::star::sdbcx::XColumnsSupplier>OSQLTable;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] fdo#43460 sc: use isEmpty()
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4316 Approvals: Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4316 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I062570091ebea0ad30f09b0358ab664a3ff949ef Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jelle van der Waa Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Tor Lillqvist ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sc/source
sc/source/core/data/documen3.cxx |2 +-
sc/source/core/data/postit.cxx |4 ++--
sc/source/core/tool/compiler.cxx |2 +-
sc/source/core/tool/dbdata.cxx |6 +++---
sc/source/core/tool/interpr2.cxx |2 +-
sc/source/filter/oox/pagesettings.cxx |2 +-
sc/source/filter/oox/querytablebuffer.cxx |4 ++--
sc/source/filter/xml/XMLStylesExportHelper.cxx |2 +-
sc/source/filter/xml/xmlexprt.cxx | 14 +++---
sc/source/filter/xml/xmltabi.cxx |2 +-
sc/source/ui/docshell/docsh.cxx|4 ++--
sc/source/ui/unoobj/chart2uno.cxx |4 ++--
sc/source/ui/vba/vbafont.cxx |2 +-
sc/source/ui/view/dbfunc3.cxx |2 +-
14 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit f042e22f535e3143332eb788f908f06900eeb40d
Author: Jelle van der Waa
Date: Mon Jun 17 16:56:12 2013 +0200
fdo#43460 sc: use isEmpty()
Change-Id: I062570091ebea0ad30f09b0358ab664a3ff949ef
Reviewed-on: https://gerrit.libreoffice.org/4316
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index a49ea83..e10a43f 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1941,7 +1941,7 @@ void ScDocument::DoMergeContents( SCTAB nTab, SCCOL
nStartCol, SCROW nStartRow,
aCellStr = GetString(nCol, nRow, nTab);
if (!aCellStr.isEmpty())
{
-if (aTotal.getLength())
+if (!aTotal.isEmpty())
aTotal.append(' ');
aTotal.append(aCellStr);
}
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index 3c03746..0e0cde3 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -777,13 +777,13 @@ SdrCaptionObj* ScNoteUtil::CreateTempCaption(
const ScPostIt* pNote = rDoc.GetNotes(rPos.Tab())->findByAddress( rPos );
if( pNote && !pNote->IsCaptionShown() )
{
-if( aBuffer.getLength() > 0 )
+if( !aBuffer.isEmpty() )
aBuffer.appendAscii( RTL_CONSTASCII_STRINGPARAM( "\n\n" )
).append( pNote->GetText() );
pNoteCaption = pNote->GetOrCreateCaption( rPos );
}
// create a caption if any text exists
-if( !pNoteCaption && (aBuffer.getLength() == 0) )
+if( !pNoteCaption && aBuffer.isEmpty() )
return 0;
// prepare visible rectangle (add default distance to all borders)
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index bdce061..3d6806c 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -5101,7 +5101,7 @@ void ScCompiler::CreateStringFromIndex(OUStringBuffer&
rBuffer,FormulaToken* _pT
default:
; // nothing
}
-if ( aBuffer.getLength() )
+if ( !aBuffer.isEmpty() )
rBuffer.append(aBuffer.makeStringAndClear());
else
rBuffer.append(ScGlobal::GetRscString(STR_NO_NAME_REF));
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 163e6fe..0b60852 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -234,19 +234,19 @@ OUString ScDBData::GetOperations() const
if (mpSortParam->maKeyState[0].bDoSort)
{
-if (aBuf.getLength())
+if (!aBuf.isEmpty())
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
aBuf.append(ScGlobal::GetRscString(STR_OPERATION_SORT));
}
if (mpSubTotal->bGroupActive[0] && !mpSubTotal->bRemoveOnly)
{
-if (aBuf.getLength())
+if (!aBuf.isEmpty())
aBuf.appendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
aBuf.append(ScGlobal::GetRscString(STR_OPERATION_SUBTOTAL));
}
-if (!aBuf.getLength())
+if (aBuf.isEmpty())
aBuf.append(ScGlobal::GetRscString(STR_OPERATION_NONE));
return aBuf.makeStringAndClear();
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index b5e8ee8..40a82f1 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3085,7 +3085,7 @@ void ScInterpreter::ScBahtText()
aText.insert(0, aBlock.makeStringAndClear());
}
-if (aText.getLength() > 0)
+if (!aText.isEmpty())
aText.append( RTL_CONSTASCII_STRINGPARAM(UTF8_TH_BAHT) );
// generate text for Satang value
diff --git a/sc/source/filter/oox/pagesettings.cxx
b/sc/source/filter/oox/pagesettings.cxx
index fd90cc5..9e9f941 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -786,7 +786,7 @@ void HeaderFooterParser::setAttributes()
void HeaderFooterParser::appendText()
{
-if( maBuffer.getLength() >
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - setup_native/source
setup_native/source/mac/ooo/DS_Store |binary setup_native/source/mac/ooo/DS_Store_Dev |binary setup_native/source/mac/sdk/DS_Store_SDK |binary 3 files changed New commits: commit b4b809f19ca8ca8fda1058258c24f156a882691b Author: Jürgen Schmidt Date: Fri Jun 28 11:00:43 2013 + #122620# rearrange icons in dmg diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/mac/ooo/DS_Store index 81ef0ca..c04303f 100644 Binary files a/setup_native/source/mac/ooo/DS_Store and b/setup_native/source/mac/ooo/DS_Store differ diff --git a/setup_native/source/mac/ooo/DS_Store_Dev b/setup_native/source/mac/ooo/DS_Store_Dev index 94009db..91370ab 100644 Binary files a/setup_native/source/mac/ooo/DS_Store_Dev and b/setup_native/source/mac/ooo/DS_Store_Dev differ diff --git a/setup_native/source/mac/sdk/DS_Store_SDK b/setup_native/source/mac/sdk/DS_Store_SDK index 26f09cb..07a90dc 100644 Binary files a/setup_native/source/mac/sdk/DS_Store_SDK and b/setup_native/source/mac/sdk/DS_Store_SDK differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cairo/cairo cairo/UnpackedTarball_cairo.mk
cairo/UnpackedTarball_cairo.mk |6 ++ cairo/cairo/no-flto-clang.patch | 11 +++ 2 files changed, 17 insertions(+) New commits: commit c6f67833bd79f267afb83ce51939f7f084337a44 Author: LuboÅ¡ LuÅák Date: Wed Jun 26 15:13:54 2013 +0200 prevent cairo from using -flto with clang, cairo uses it incorrectly The option should be used also at link time (as e.g. the gcc man page says), but cairo doesn't do so, and since -flto makes clang generate .o with LLVM bytecode, plain ld chokes on it. Change-Id: Ia5ce9a98afa4f88b8d0943a5971450d7009af913 Signed-off-by: Michael Stahl diff --git a/cairo/UnpackedTarball_cairo.mk b/cairo/UnpackedTarball_cairo.mk index fd14ffe..93cd015 100644 --- a/cairo/UnpackedTarball_cairo.mk +++ b/cairo/UnpackedTarball_cairo.mk @@ -41,4 +41,10 @@ ifneq (,$(filter ANDROID IOS,$(OS))) $(eval $(call gb_UnpackedTarball_add_file,cairo,.,cairo/cairo/dummy_pkg_config)) endif +ifeq ($(COM_GCC_IS_CLANG),TRUE) +$(eval $(call gb_UnpackedTarball_add_patches,cairo,\ + cairo/cairo/no-flto-clang.patch \ +)) +endif + # vim: set noet sw=4 ts=4: diff --git a/cairo/cairo/no-flto-clang.patch b/cairo/cairo/no-flto-clang.patch new file mode 100644 index 000..725f484 --- /dev/null +++ b/cairo/cairo/no-flto-clang.patch @@ -0,0 +1,11 @@ +--- misc/cairo-1.10.2/configure.sav2013-06-26 15:00:42.0 +0200 misc/cairo-1.10.2/configure2013-06-26 15:03:36.995117032 +0200 +@@ -17236,7 +17236,7 @@ MAYBE_WARN="-Wall -Wextra \ + MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ + -erroff=E_ENUM_TYPE_MISMATCH_OP" + +-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto" ++MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" + + MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2" + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] fdo#43460 sc: use isEmpty()
Hello Tor Lillqvist, LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/4316 to look at the new rebased patch set (#3). Change subject: fdo#43460 sc: use isEmpty() .. fdo#43460 sc: use isEmpty() Change-Id: I062570091ebea0ad30f09b0358ab664a3ff949ef --- M sc/source/core/data/documen3.cxx M sc/source/core/data/postit.cxx M sc/source/core/tool/compiler.cxx M sc/source/core/tool/dbdata.cxx M sc/source/core/tool/interpr2.cxx M sc/source/filter/oox/pagesettings.cxx M sc/source/filter/oox/querytablebuffer.cxx M sc/source/filter/xml/XMLStylesExportHelper.cxx M sc/source/filter/xml/xmlexprt.cxx M sc/source/filter/xml/xmltabi.cxx M sc/source/ui/docshell/docsh.cxx M sc/source/ui/unoobj/chart2uno.cxx M sc/source/ui/vba/vbafont.cxx M sc/source/ui/view/dbfunc3.cxx 14 files changed, 26 insertions(+), 26 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/4316/3 -- To view, visit https://gerrit.libreoffice.org/4316 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I062570091ebea0ad30f09b0358ab664a3ff949ef Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Jelle van der Waa Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Tor Lillqvist ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac |1 -
1 file changed, 1 deletion(-)
New commits:
commit 9722cd44beb3af9c68c5a3904127dc15c3c0cff1
Author: Isamu Mogi
Date: Fri Jun 21 15:30:21 2013 +
Remove debug output
From 8e784b59f1c1ce33dc95a6c591ee514383b28f3f
Change-Id: Iab0ac8ef53cf0d3d1f1f1ec23ee9a26a3d89f38a
Reviewed-on: https://gerrit.libreoffice.org/4435
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/configure.ac b/configure.ac
index e193a8a..1d4bbc1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4879,7 +4879,6 @@ find_winsdk()
find_msms()
{
-AC_MSG_NOTICE([checking msms
==])
for ver in 10.0 11.0; do
reg_get_value
HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver/Setup/VS/MSMDir
if test -n "$regvalue"; then
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source bin/moveglobalheaders.sh cui/source dbaccess/inc dbaccess/source desktop/source editeng/source extensions/source filter/source framework/source include/to
basctl/source/dlged/propbrw.cxx |2 +- bin/moveglobalheaders.sh|6 -- cui/source/customize/cfg.cxx|2 +- cui/source/dialogs/hlmarkwn.cxx |2 +- dbaccess/inc/pch/precompiled_dbu.hxx|1 - dbaccess/source/ui/app/AppControllerGen.cxx |2 +- dbaccess/source/ui/browser/dataview.cxx |2 +- dbaccess/source/ui/browser/sbagrid.cxx |6 -- dbaccess/source/ui/browser/unodatbr.cxx |2 +- dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx|2 +- dbaccess/source/ui/querydesign/QueryTextView.cxx|2 +- dbaccess/source/ui/querydesign/querycontainerwindow.cxx |2 +- desktop/source/app/app.cxx |2 +- editeng/source/items/textitem.cxx |2 +- editeng/source/uno/unonrule.cxx |2 +- extensions/source/abpilot/admininvokationimpl.cxx |2 +- extensions/source/abpilot/fieldmappingimpl.cxx |2 +- extensions/source/propctrlr/fontdialog.cxx |2 +- extensions/source/propctrlr/propcontroller.cxx |2 +- filter/source/msfilter/escherex.cxx |2 +- filter/source/msfilter/eschesdo.cxx |2 +- filter/source/msfilter/svdfppt.cxx |2 +- framework/source/classes/menumanager.cxx|2 +- framework/source/helper/persistentwindowstate.cxx |2 +- framework/source/helper/statusindicatorfactory.cxx |2 +- framework/source/helper/tagwindowasmodified.cxx |2 +- framework/source/helper/titlebarupdate.cxx |2 +- framework/source/helper/vclstatusindicator.cxx |2 +- framework/source/inc/pattern/window.hxx |2 +- framework/source/layoutmanager/helpers.cxx |2 +- framework/source/layoutmanager/layoutmanager.cxx|2 +- framework/source/layoutmanager/toolbarlayoutmanager.cxx |2 +- framework/source/loadenv/loadenv.cxx|2 +- framework/source/services/frame.cxx |2 +- framework/source/services/taskcreatorsrv.cxx|2 +- framework/source/tabwin/tabwindow.cxx |2 +- framework/source/uielement/addonstoolbarmanager.cxx |2 +- framework/source/uielement/addonstoolbarwrapper.cxx |2 +- framework/source/uielement/menubarmanager.cxx |2 +- framework/source/uielement/statusbarmanager.cxx |1 - framework/source/uielement/statusbarwrapper.cxx |2 +- framework/source/uielement/toolbarmanager.cxx |2 +- framework/source/uielement/toolbarsmenucontroller.cxx |2 +- framework/source/uielement/toolbarwrapper.cxx |2 +- include/toolkit/unohlp.hxx |3 --- reportdesign/source/ui/report/propbrw.cxx |2 +- sc/inc/pch/precompiled_sc.hxx |1 - sc/source/filter/excel/xlstyle.cxx |2 +- sc/source/ui/unoobj/targuno.cxx |2 +- sc/source/ui/vba/vbaeventshelper.cxx|2 +- sd/inc/pch/precompiled_sd.hxx |1 - sd/source/filter/eppt/epptso.cxx|2 +- sd/source/ui/slideshow/slideshow.cxx|2 +- sd/source/ui/slideshow/slideshowimpl.cxx|2 +- sd/source/ui/unoidl/unopage.cxx |2 +- sd/source/ui/view/ToolBarManager.cxx|2 +- sd/source/ui/view/drviews8.cxx |2 +- sfx2/source/doc/objmisc.cxx |2 +- sfx2/source/inet/inettbc.cxx|2 +- sfx2/source/menu/virtmenu.cxx |2 +- sfx2/source/statbar/stbitem.cxx |2 +- sfx2/source/view/viewfrm.cxx|2 +- sfx2/source/view/viewsh.cxx |2 +- svtools/inc/pch/precompiled_svt.hxx |1 - svtools/source/uno/contextmenuhelper.cxx|2 +- svtools/source/uno/toolboxcontroller.cxx|2 +- svx/inc/pch/precompiled_svx.hxx |1 - svx/inc/pch/precompiled_svxcore.hxx |2 -- svx/source/dialog/docrecovery.cxx |2 +- svx/source/dialog/srchdlg.cxx |2 +- svx/source/form/fmPropBrw.cxx |2 +- svx/source/form/fmtools.cxx |2 +- svx/source/unodraw/unoshap2.cxx |2 +- svx/source/unodraw/unoshape.cxx |2 +- svx/source/xoutdev/xattrbmp.cxx
[Libreoffice-commits] core.git: 2 commits - connectivity/source include/vcl rsc/inc rsc/source
connectivity/source/inc/dbase/DIndexPage.hxx | 29 --- connectivity/source/inc/dbase/dindexnode.hxx |4 ++- include/vcl/help.hxx |1 rsc/inc/vclrsc.hxx | 34 --- rsc/source/parser/rscibas.cxx| 13 ++ rsc/source/parser/rscicpx.cxx|4 +-- rsc/source/parser/rscinit.cxx|4 --- 7 files changed, 14 insertions(+), 75 deletions(-) New commits: commit 61fd1d2e7803516e88a18017ee5d6a34d6ca14fa Author: Thomas Arnhold Date: Fri Jun 28 06:52:03 2013 +0200 fdo#62699 remove rsc/inc/vclrsc.hxx Change-Id: I8a90bfcfff904d42a529644ae7b6f03d0ac762eb diff --git a/include/vcl/help.hxx b/include/vcl/help.hxx index 35d9cb3..7147233 100644 --- a/include/vcl/help.hxx +++ b/include/vcl/help.hxx @@ -49,7 +49,6 @@ class Window; #define QUICKHELP_NOEVADEPOINTER((sal_uInt16)0x4000) #define QUICKHELP_BIDI_RTL ((sal_uInt16)0x8000) -// By changes you must also change: rsc/vclrsc.hxx #define OOO_HELP_INDEX ".help:index" #define OOO_HELP_HELPONHELP ".help:helponhelp" diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx deleted file mode 100644 index 998eaee..000 --- a/rsc/inc/vclrsc.hxx +++ /dev/null @@ -1,34 +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 . - */ - -#ifndef _TOOLS_VCLRSC_HXX -#define _TOOLS_VCLRSC_HXX - -#include -#include -#include -#include -#include - -#include -#include - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index ddbdd87..a78072e 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -22,20 +22,23 @@ #include #include +#include #include #include -#include -#include #include +#include +#include +#include +#include +#include + +#include -#include #include #include #include #include #include - - #include #include diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index e278309..8df19d3 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -22,14 +22,14 @@ #include #include +#include +#include -#include #include #include #include #include #include - #include #include diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 8803a01..48710a6 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -22,8 +22,7 @@ #include #include - -#include +#include #include #include @@ -36,7 +35,6 @@ #include #include #include - #include #include commit ab3f90e051256bbf0d999551fedb5106d0367d3a Author: Thomas Arnhold Date: Fri Jun 28 06:40:32 2013 +0200 fdo#62699 remove pass-through header Change-Id: Ib2c6ae071525ba52ee754439c1405da79fa3eeaa diff --git a/connectivity/source/inc/dbase/DIndexPage.hxx b/connectivity/source/inc/dbase/DIndexPage.hxx deleted file mode 100644 index 1789a9a..000 --- a/connectivity/source/inc/dbase/DIndexPage.hxx +++ /dev/null @@ -1,29 +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 . - */ - -#ifndef _CONNECTIVITY_DBASE_INDEXPAGE_HXX_ -#define
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysis.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit f17627376bac18ad43e41a91d2f48a4c0d98ebef
Author: Andras Timar
Date: Fri Jun 28 13:13:50 2013 +0200
s/Extracts/Returns/ for the sake of consistency
Change-Id: I978229bc783c2d2314d6faa94693af85766d3546
diff --git a/scaddins/source/analysis/analysis.src
b/scaddins/source/analysis/analysis.src
index 958a9aa..82052a7 100644
--- a/scaddins/source/analysis/analysis.src
+++ b/scaddins/source/analysis/analysis.src
@@ -63,7 +63,7 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
{
String 1// description Yearfrac
{
-Text [ en-US ] = "Extracts the number of years (including
fractional part) between two dates";
+Text [ en-US ] = "Returns the number of years (including
fractional part) between two dates";
};
String 2 // name of parameter 1 Yearfrac
___
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' - 98/13b7fb44a2fb3c8b3c681b973b8b0fcf4639ad
98/13b7fb44a2fb3c8b3c681b973b8b0fcf4639ad |1 + 1 file changed, 1 insertion(+) New commits: commit d9b555ea0514fd077e6adff1648aa934e1e72e26 Author: Caolán McNamara Date: Fri Jun 28 11:53:26 2013 +0100 Notes added by 'git notes add' diff --git a/98/13b7fb44a2fb3c8b3c681b973b8b0fcf4639ad b/98/13b7fb44a2fb3c8b3c681b973b8b0fcf4639ad new file mode 100644 index 000..d0ce5f9 --- /dev/null +++ b/98/13b7fb44a2fb3c8b3c681b973b8b0fcf4639ad @@ -0,0 +1 @@ +prefer: 508a953c274c8a534c379ded04adc7df1e5fd5ba ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/table-style' - sw/inc sw/source
sw/inc/swtblfmt.hxx | 30 +-
sw/source/core/doc/swtblfmt.cxx | 31 ---
2 files changed, 45 insertions(+), 16 deletions(-)
New commits:
commit d418934c49ca39638898503895762fca69ba64c1
Author: Alex Ivan
Date: Fri Jun 28 13:44:54 2013 +0300
Store RowSplit and RepeatHeading in item pool
Removed m_aRepeatHeading and m_bRowSplit members from SwTableFmt.
Now stored in SfxItemPool.
Change-Id: I83f46ee38ce01db5dfae02e821d8e0a902a9cfc0
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index ef66a10..7783f7ba 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -19,11 +19,28 @@
#ifndef _SWTBLFMT_HXX
#define _SWTBLFMT_HXX
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
#include
+#include
+#include
#include
#include
#include
+#include
#include
#include
@@ -52,9 +69,6 @@ protected:
SwTableLineFmt* pOddColFmt;
SwTableLineFmt* pEvnColFmt;
-sal_uInt16 m_aRepeatHeading;
-sal_Bool m_bRowSplit;
-
public:
SwTableFmt& operator=( const SwTableFmt& rNew );
@@ -78,22 +92,20 @@ public:
SwTableLineFmt* GetOddColFmt() { return pOddColFmt; }
SwTableLineFmt* GetEvenColFmt() { return pEvnColFmt; }
-void SetRepeatHeading( const sal_uInt16& rNew ) { m_aRepeatHeading = rNew;
}
-void SetRowSplit( const sal_Bool& rNew ) { m_bRowSplit = rNew; }
-
-const sal_uInt16& GetRepeatHeading() const { return m_aRepeatHeading; }
-const sal_Bool& GetRowSplit() const { return m_bRowSplit; }
-
void SetBreak( const SvxFmtBreakItem& rNew );
void SetPageDesc( const SwFmtPageDesc& rNew );
void SetKeepWithNextPara( const SvxFmtKeepItem& rNew );
void SetLayoutSplit( const sal_Bool& rNew );
void SetCollapsingBorders( const sal_Bool& rNew );
+void SetRowSplit( const sal_Bool& rNew );
+void SetRepeatHeading( const sal_uInt16& rNew );
void SetShadow( const SvxShadowItem& rNew );
const SvxFmtKeepItem& GetKeepWithNextPara() const;
sal_Bool GetLayoutSplit() const;
sal_Bool GetCollapsingBorders() const;
+sal_Bool GetRowSplit() const;
+sal_uInt16 GetRepeatHeading() const;
TYPEINFO(); // Already in base class Content.
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index 3421db4..a14b961 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -22,13 +22,13 @@
SwTableFmt::SwTableFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
-, m_aRepeatHeading( 0 )
-, m_bRowSplit( sal_True )
{
SetBreak( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
SetKeepWithNextPara( SvxFmtKeepItem( sal_False, RES_KEEP ) );
SetLayoutSplit( sal_True );
SetCollapsingBorders( sal_True );
+SetRowSplit( sal_True );
+SetRepeatHeading( 0 );
SetShadow( SvxShadowItem( RES_SHADOW ) );
pFstLineFmt = NULL;
@@ -45,13 +45,13 @@ SwTableFmt::SwTableFmt( SwAttrPool& rPool, const sal_Char*
pFmtNm,
SwTableFmt::SwTableFmt( SwAttrPool& rPool, const String &rFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
-, m_aRepeatHeading( 0 )
-, m_bRowSplit( sal_True )
{
SetBreak( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
SetKeepWithNextPara( SvxFmtKeepItem( sal_False, RES_KEEP ) );
SetLayoutSplit( sal_True );
SetCollapsingBorders( sal_True );
+SetRowSplit( sal_True );
+SetRepeatHeading( 0 );
SetShadow( SvxShadowItem( RES_SHADOW ) );
pFstLineFmt = NULL;
@@ -70,9 +70,6 @@ SwTableFmt& SwTableFmt::operator=( const SwTableFmt& rNew )
if (&rNew == this)
return *this;
-m_aRepeatHeading = rNew.m_aRepeatHeading;
-m_bRowSplit = rNew.m_bRowSplit;
-
pFstLineFmt = rNew.pFstLineFmt;
pLstLineFmt = rNew.pLstLineFmt;
pOddLineFmt = rNew.pOddLineFmt;
@@ -111,6 +108,16 @@ void SwTableFmt::SetCollapsingBorders( const sal_Bool&
rNew )
SetFmtAttr( SfxBoolItem( RES_COLLAPSING_BORDERS, rNew ) );
}
+void SwTableFmt::SetRowSplit( const sal_Bool& rNew )
+{
+SetFmtAttr( SwFmtRowSplit( rNew ) );
+}
+
+void SwTableFmt::SetRepeatHeading( const sal_uInt16& rNew )
+{
+SetFmtAttr( SfxUInt16Item( FN_PARAM_TABLE_HEADLINE, rNew ) );
+}
+
void SwTableFmt::SetShadow( const SvxShadowItem& rNew )
{
SetFmtAttr( rNew );
@@ -131,6 +138,16 @@ sal_Bool SwTableFmt::GetCollapsingBorders() const
return (static_cast( GetFmtAttr(
RES_COLLAPSING_BORDERS ) )).GetValue();
}
+sal_Bool SwTableFmt::GetRowSplit() const
+{
+return SwFmt::GetRowSplit().GetValue();
+}
+
+sal_uInt16 SwTableFmt:
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysis.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d4f92f1a1dae7c89fb9e9e46080b344b99634e24
Author: Andras Timar
Date: Fri Jun 28 12:39:18 2013 +0200
fix confusing help text of IMPOWER function
Change-Id: I7f69b3809790b6313b4487935745eec73a34a465
diff --git a/scaddins/source/analysis/analysis.src
b/scaddins/source/analysis/analysis.src
index 7722099..958a9aa 100644
--- a/scaddins/source/analysis/analysis.src
+++ b/scaddins/source/analysis/analysis.src
@@ -1037,7 +1037,7 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
{
String 1// description Impower
{
-Text [ en-US ] = "Returns a complex number raised to an integer
power";
+Text [ en-US ] = "Returns a complex number raised to a real power";
};
String 2 // name of parameter 1 Impower
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/04060116.xhp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 12227e8292bb583346c7fca808ddb78fde0f5011
Author: Andras Timar
Date: Fri Jun 28 12:19:53 2013 +0200
fix confusing help text of IMPOWER function
Change-Id: I25a474bb4787c1427035d304b586222f8813270a
diff --git a/source/text/scalc/01/04060116.xhp
b/source/text/scalc/01/04060116.xhp
index 47e9e80..92448cf 100644
--- a/source/text/scalc/01/04060116.xhp
+++ b/source/text/scalc/01/04060116.xhp
@@ -78,7 +78,7 @@
IMPOWER
- The result is the
integer power of a complex number.
+ The result is the
ComplexNumber raised to the power of
Number.
Syntax
IMPOWER("ComplexNumber"; Number)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 709a196f7fd70b588f2bc63bca0f71b1ae0083a8 Author: Andras Timar Date: Fri Jun 28 12:19:53 2013 +0200 Updated core Project: help 12227e8292bb583346c7fca808ddb78fde0f5011 diff --git a/helpcontent2 b/helpcontent2 index e2321b4..12227e8 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit e2321b4d8fd5c889e817efdce243d8255f9e167a +Subproject commit 12227e8292bb583346c7fca808ddb78fde0f5011 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: source/text
source/text/scalc/01/func_yearfrac.xhp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e2321b4d8fd5c889e817efdce243d8255f9e167a Author: Andras Timar Date: Fri Jun 28 12:09:44 2013 +0200 fix confusing help text of YEARFRAC function Change-Id: Id964089b73357490e898f29e9ee3c26deb57fa87 diff --git a/source/text/scalc/01/func_yearfrac.xhp b/source/text/scalc/01/func_yearfrac.xhp index 6dafd3c..2943a1d 100644 --- a/source/text/scalc/01/func_yearfrac.xhp +++ b/source/text/scalc/01/func_yearfrac.xhp @@ -33,7 +33,7 @@ YEARFRAC - The result is a number between 0 and 1, representing the fraction of a year between StartDate and EndDate. +The result is the number of the years (including fractional part) between StartDate and EndDate. Syntax YEARFRAC(StartDate; EndDate; Basis) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d1f2b19a5a2beab8d14815475120f467aa6d4da7 Author: Andras Timar Date: Fri Jun 28 12:09:44 2013 +0200 Updated core Project: help e2321b4d8fd5c889e817efdce243d8255f9e167a diff --git a/helpcontent2 b/helpcontent2 index d8c5b17..e2321b4 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit d8c5b1703bfae6f629c3f2db8b2730133bd1782b +Subproject commit e2321b4d8fd5c889e817efdce243d8255f9e167a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scaddins/source
scaddins/source/analysis/analysis.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7547804ff28d9adcfc5a9a0a84b88de13bb8cc15
Author: Andras Timar
Date: Fri Jun 28 12:06:58 2013 +0200
fix confusing help text of YEARFRAC function
Change-Id: I2ea80005662c58ec74c0991026a2bb5e11399f31
diff --git a/scaddins/source/analysis/analysis.src
b/scaddins/source/analysis/analysis.src
index 9236b67..7722099 100644
--- a/scaddins/source/analysis/analysis.src
+++ b/scaddins/source/analysis/analysis.src
@@ -63,7 +63,7 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
{
String 1// description Yearfrac
{
-Text [ en-US ] = "Returns the number of whole days between 'start
date' and 'end date' as a year fraction";
+Text [ en-US ] = "Extracts the number of years (including
fractional part) between two dates";
};
String 2 // name of parameter 1 Yearfrac
@@ -93,7 +93,7 @@ Resource RID_ANALYSIS_FUNCTION_DESCRIPTIONS
String 7 // description of parameter 3 Yearfrac
{
-Text [ en-US ] = "Basis for determining the interest days";
+Text [ en-US ] = "Basis indicates the day-count convention to use
in the calculation";
};
};
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - fpicker/source
fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit 9813b7fb44a2fb3c8b3c681b973b8b0fcf4639ad Author: Andre Fischer Date: Fri Jun 28 09:11:27 2013 + 121772: Prevent a crash when no plugin filter is present. diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx index 28383c0..f44ba31 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx @@ -767,6 +767,9 @@ void VistaFilePickerImpl::impl_sta_setFiltersOnDialog() aLock.clear(); // <- SYNCHRONIZED +if (lFilters.empty()) +return; + COMDLG_FILTERSPEC *pFilt = &lFilters[0]; iDialog->SetFileTypes(lFilters.size(), pFilt/*&lFilters[0]*/); iDialog->SetFileTypeIndex(nCurrentFilter + 1); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/inc sc/qa sc/source
sc/inc/formulacell.hxx |7 ---
sc/inc/formularesult.hxx |2 --
sc/inc/token.hxx | 14 --
sc/qa/unit/data/contentCSV/cachedValue.csv |2 +-
sc/source/core/tool/formularesult.cxx | 17 -
sc/source/filter/xml/xmlcelli.cxx |5 +
6 files changed, 2 insertions(+), 45 deletions(-)
New commits:
commit 0b6233afdc65030fd7c4a57c5a2155f0d32b18df
Author: Markus Mohrhard
Date: Sun Jun 23 21:47:18 2013 +0200
we don't need this hack without inherited number formats, fdo#66076
Change-Id: If315ce28a4182019002141c7330475e0843f9a40
(cherry picked from commit 3f0b5770790dfcb408d169df1265546d6e8e3ece)
Reviewed-on: https://gerrit.libreoffice.org/4593
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index c6d3aa7..747d67f 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -261,13 +261,6 @@ public:
const formula::FormulaGrammar::Grammar
eGrammar )
{ aResult.SetHybridFormula( r); eTempGrammar =
eGrammar; }
-/**
- * For import only: use for formula cells that return a number
- * formatted as some kind of string
- */
-void SetHybridValueString( double nVal, const OUString& r )
-{ aResult.SetHybridValueString( nVal, r ); }
-
void SetResultMatrix( SCCOL nCols, SCROW nRows, const ScConstMatrixRef&
pMat, formula::FormulaToken* pUL )
{
aResult.SetMatrix(nCols, nRows, pMat, pUL);
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index b337d2f..a88f82d 100644
--- a/sc/inc/formularesult.hxx
+++ b/sc/inc/formularesult.hxx
@@ -177,8 +177,6 @@ public:
SetHybridFormula() for formula string to be compiled later. */
SC_DLLPUBLIC void SetHybridFormula( const String & rFormula );
-void SetHybridValueString( double nVal, const OUString& rStr );
-
SC_DLLPUBLIC void SetMatrix( SCCOL nCols, SCROW nRows, const
ScConstMatrixRef& pMat, formula::FormulaToken* pUL );
/** Get the const ScMatrixFormulaCellToken* if token is of that type, else
diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index abd3cd5..109980f 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -430,20 +430,6 @@ public:
virtual FormulaToken* Clone() const { return new ScHybridCellToken(*this);
}
};
-class SC_DLLPUBLIC ScHybridValueCellToken : public ScToken
-{
-private:
-double mfValue;
-String maString;
-public:
-ScHybridValueCellToken (double f, const OUString& rStr ):
-ScToken( formula::svHybridValueCell ),
-mfValue( f ), maString( rStr ) {}
-
-virtual double GetDouble() const { return mfValue; }
-virtual const String & GetString() const { return maString; }
-};
-
// Simplify argument passing to RefUpdate methods with ScSingleRefToken or
// ScDoubleRefToken
class SingleDoubleRefModifier
diff --git a/sc/qa/unit/data/contentCSV/cachedValue.csv
b/sc/qa/unit/data/contentCSV/cachedValue.csv
index 183391b..7fed884 100644
--- a/sc/qa/unit/data/contentCSV/cachedValue.csv
+++ b/sc/qa/unit/data/contentCSV/cachedValue.csv
@@ -1,2 +1,2 @@
1.00,200.00%,$3.00,1/3/00,00:00,6.00E+000,7 1/5,TRUE,9,1000%,01-10
-1,200.00%,$3.00,01/03/00,120:00:00,6.00E+000,7 1/5,TRUE,9,1000.00%,01/10/00
+1,200.00%,$3.00,01/03/00,12:00:00 AM,6.00E+000,7 1/5,TRUE,9,1000.00%,01/10/00
diff --git a/sc/source/core/tool/formularesult.cxx
b/sc/source/core/tool/formularesult.cxx
index e0ca0be..a7c70e6 100644
--- a/sc/source/core/tool/formularesult.cxx
+++ b/sc/source/core/tool/formularesult.cxx
@@ -430,23 +430,6 @@ void ScFormulaResult::SetHybridFormula( const String &
rFormula )
mbToken = true;
}
-void ScFormulaResult::SetHybridValueString( double nVal, const OUString& rStr )
-{
-if(GetType() == formula::svMatrixCell)
-{
-SetDouble(nVal);
-return;
-}
-
-ResetToDefaults();
-if (mbToken && mpToken)
-mpToken->DecRef();
-
-mpToken = new ScHybridValueCellToken( nVal, rStr );
-mpToken->IncRef();
-mbToken = true;
-}
-
void ScFormulaResult::SetMatrix( SCCOL nCols, SCROW nRows, const
ScConstMatrixRef& pMat, formula::FormulaToken* pUL )
{
ResetToDefaults();
diff --git a/sc/source/filter/xml/xmlcelli.cxx
b/sc/source/filter/xml/xmlcelli.cxx
index 1e838a0..0fef98f 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -993,10 +993,7 @@ void
ScXMLTableRowCellContext::SetFormulaCell(ScFormulaCell* pFCell) const
}
else if (!rtl::math::isNan(fValue))
{
-if (mbEditEngineHasText)
-pFCell->SetHybridValueString(fValue, mpEditEngine->GetText(0));
-else
-pFCell->SetHybridDouble(fValue);
+pFCell->SetHybridDouble(fValue);
pFCell->ResetDirty();
}
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/node.hxx | 16 +++-
starmath/source/mathmlexport.cxx | 24 +++-
starmath/source/mathtype.cxx |1 +
starmath/source/node.cxx |1 +
starmath/source/ooxmlexport.cxx|4 ++--
starmath/source/parse.cxx | 32 ++--
starmath/source/rtfexport.cxx |4 ++--
starmath/source/visitors.cxx |2 +-
starmath/source/wordexportbase.cxx |1 +
9 files changed, 64 insertions(+), 21 deletions(-)
New commits:
commit 43cf39adff66d20862956869d11fbcc184eb5702
Author: Frédéric Wang
Date: Thu Jun 27 21:35:28 2013 +0200
fdo#66088 Export some math symbols as elements.
Change-Id: Ib08717c3d4d41abc7bce4cd6bc2e63bda7db6086
Reviewed-on: https://gerrit.libreoffice.org/4595
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index b1640a3..2416d6e 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -73,7 +73,7 @@ enum SmNodeType
/*10*/ NBINDIAGONAL, NSUBSUP,NMATRIX,NPLACE, NTEXT,
/*15*/ NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR,
/*20*/ NLINE, NEXPRESSION,NPOLYLINE, NROOT,
NROOTSYMBOL,
-/*25*/ NRECTANGLE, NVERTICAL_BRACE
+/*25*/ NRECTANGLE, NVERTICAL_BRACE, NMATHIDENT
};
@@ -579,6 +579,20 @@ public:
void Accept(SmVisitor* pVisitor);
};
+
+
+/** Math Identifier
+ *
+ * This behaves essentially the same as SmMathSymbolNode and is only used to
+ * represent math symbols that should be exported as elements rather than
+ * elements.
+ */
+class SmMathIdentifierNode : public SmMathSymbolNode
+{
+public:
+SmMathIdentifierNode(const SmToken &rNodeToken)
+: SmMathSymbolNode(NMATHIDENT, rNodeToken) {}
+};
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index d23662c..fb1e6c3 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -871,7 +871,26 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int
nLevel)
void SmXMLExport::ExportMath(const SmNode *pNode, int /*nLevel*/)
{
const SmMathSymbolNode *pTemp = static_cast(pNode);
-SvXMLElementExport aMath(*this, XML_NAMESPACE_MATH, XML_MO, sal_True,
sal_False);
+SvXMLElementExport *pMath = 0;
+
+if (pNode->GetType() == NMATH)
+{
+// Export NMATH symbols as elements
+pMath = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MO,
sal_True, sal_False);
+}
+else
+{
+// Export NMATHIDENT and NPLACE symbols as elements:
+// - These math symbols should not be drawn slanted. Hence we should
+// attach a mathvariant="normal" attribute to single-char elements
+// that are not mathematical alphanumeric symbol. For simplicity and to
+// work around browser limitations, we always attach such an attribute.
+// - The MathML specification suggests to use empty elements as
+// placeholders but they won't be visible in most MathML rendering
+// engines so let's use an empty square for NPLACE instead.
+AddAttribute(XML_NAMESPACE_MATH, XML_MATHVARIANT, XML_NORMAL);
+pMath = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI,
sal_True, sal_False);
+}
sal_Unicode nArse[2];
nArse[0] = pTemp->GetText()[0];
sal_Unicode cTmp = ConvertMathToMathML( nArse[0] );
@@ -880,6 +899,8 @@ void SmXMLExport::ExportMath(const SmNode *pNode, int
/*nLevel*/)
OSL_ENSURE(nArse[0] != 0x,"Non existent symbol");
nArse[1] = 0;
GetDocHandler()->characters(nArse);
+
+delete pMath;
}
void SmXMLExport::ExportText(const SmNode *pNode, int /*nLevel*/)
@@ -1520,6 +1541,7 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int
nLevel)
}
}
break;
+case NMATHIDENT :
case NPLACE:
ExportMath(pNode, nLevel);
break;
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 8b958a1..3de5817 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -1997,6 +1997,7 @@ sal_uInt8 MathType::HandleNodes(SmNode *pNode,int nLevel)
}
break;
case NMATH:
+case NMATHIDENT:
HandleMath(pNode,nLevel);
break;
case NSUBSUP:
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index d3ae705..ccfc4b0 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -621,6 +621,7 @@ void SmNode::DumpAsDot(std::ostream &out, OUString* label,
int number, int& id,
case NROOTSYMBOL: out<<"SmRootSymbolNode"; break;
case NRECTANGLE: out<<"S
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlexport.cxx | 32 +++-
starmath/source/parse.cxx| 16
2 files changed, 43 insertions(+), 5 deletions(-)
New commits:
commit 4f294a90877d2f91bb88c7d6cd5b74e8e546a025
Author: Frédéric Wang
Date: Tue Jun 25 22:33:13 2013 +0200
fdo#66081 - reduce the number of nested 's in MathML
Change-Id: I768db4719119e53961c9cfa6a864daad7f1f7873
Reviewed-on: https://gerrit.libreoffice.org/4520
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index e18a69e..d23662c 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -734,7 +734,37 @@ void SmXMLExport::ExportLine(const SmNode *pNode, int
nLevel)
void SmXMLExport::ExportBinaryHorizontal(const SmNode *pNode, int nLevel)
{
-ExportExpression(pNode, nLevel);
+sal_uLong nGroup = pNode->GetToken().nGroup;
+
+SvXMLElementExport* pRow = new SvXMLElementExport(*this,
+XML_NAMESPACE_MATH, XML_MROW, sal_True, sal_True);
+
+// Unfold the binary tree structure as long as the nodes are SmBinHorNode
+// with the same nGroup. This will reduce the number of nested
+// elements e.g. we only need three levels to export
+//
+// "a*b*c*d+e*f*g*h+i*j*k*l = a*b*c*d+e*f*g*h+i*j*k*l =
+// a*b*c*d+e*f*g*h+i*j*k*l = a*b*c*d+e*f*g*h+i*j*k*l"
+//
+// See https://www.libreoffice.org/bugzilla/show_bug.cgi?id=66081
+::std::stack< const SmNode* > s;
+s.push(pNode);
+while (!s.empty())
+{
+const SmNode *node = s.top();
+s.pop();
+if (node->GetType() != NBINHOR || node->GetToken().nGroup != nGroup)
+{
+ExportNodes(node, nLevel+1);
+continue;
+}
+const SmBinHorNode* binNode = static_cast(node);
+s.push(binNode->RightOperand());
+s.push(binNode->Symbol());
+s.push(binNode->LeftOperand());
+}
+
+delete pRow;
}
void SmXMLExport::ExportUnaryHorizontal(const SmNode *pNode, int nLevel)
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index cc35a66..cdb6865 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1108,10 +1108,18 @@ void SmParser::Expression()
RelationArray[n - 1] = lcl_popOrZero(m_aNodeStack);
}
-SmExpressionNode *pSNode = new SmExpressionNode(m_aCurToken);
-pSNode->SetSubNodes(RelationArray);
-pSNode->SetUseExtraSpaces(bUseExtraSpaces);
-m_aNodeStack.push(pSNode);
+if (n > 1)
+{
+SmExpressionNode *pSNode = new SmExpressionNode(m_aCurToken);
+pSNode->SetSubNodes(RelationArray);
+pSNode->SetUseExtraSpaces(bUseExtraSpaces);
+m_aNodeStack.push(pSNode);
+}
+else
+{
+// This expression has only one node so just push this node.
+m_aNodeStack.push(RelationArray[0]);
+}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/parse.hxx|2
starmath/source/parse.cxx | 128 --
2 files changed, 91 insertions(+), 39 deletions(-)
New commits:
commit 16a0d06f900027401716ddaba25e5c8998562b2d
Author: Frédéric Wang
Date: Mon Jun 24 23:14:42 2013 +0200
fdo#55853 - improve parsing of concatenated numbers and identifiers.
Change-Id: Ic1cce4cec27f4ca5c3be1daf50888bef788cd6f7
Reviewed-on: https://gerrit.libreoffice.org/4494
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index a1bd731..1630099 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -228,7 +228,7 @@ protected:
voidOpSubSup();
voidPower();
voidBlank();
-voidTerm();
+voidTerm(bool bGroupNumberIdent);
voidEscape();
voidOperator();
voidOper();
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5a0098b..cc35a66 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -374,12 +374,12 @@ void SmParser::Replace( sal_uInt16 nPos, sal_uInt16 nLen,
const String &rText )
// First character may be any alphabetic
const sal_Int32 coStartFlags =
-KParseTokens::ANY_LETTER_OR_NUMBER |
+KParseTokens::ANY_LETTER |
KParseTokens::IGNORE_LEADING_WS;
-// Continuing characters may be any alphanumeric or dot.
+// Continuing characters may be any alphabetic
const sal_Int32 coContFlags =
-((coStartFlags | KParseTokens::ASC_DOT) & ~KParseTokens::IGNORE_LEADING_WS)
+(coStartFlags & ~KParseTokens::IGNORE_LEADING_WS)
| KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING;
// First character for numbers, may be any numeric or dot
@@ -389,7 +389,7 @@ const sal_Int32 coNumStartFlags =
KParseTokens::IGNORE_LEADING_WS;
// Continuing characters for numbers, may be any numeric or dot.
const sal_Int32 coNumContFlags =
-(coNumStartFlags | KParseTokens::ASC_DOT) &
~KParseTokens::IGNORE_LEADING_WS;
+coNumStartFlags & ~KParseTokens::IGNORE_LEADING_WS;
void SmParser::NextToken()
{
@@ -399,7 +399,6 @@ void SmParser::NextToken()
ParseResult aRes;
xub_StrLen nRealStart;
boolbCont;
-boolbNumStart = false;
CharClass aCC(SM_MOD()->GetSysLocale().GetLanguageTag());
do
{
@@ -408,29 +407,23 @@ void SmParser::NextToken()
aCC.getType( m_aBufferString, m_nBufferIndex ))
++m_nBufferIndex;
-sal_Int32 nStartFlags = coStartFlags;
-sal_Int32 nContFlags = coContFlags;
-sal_Unicode cFirstChar = m_aBufferString.GetChar( m_nBufferIndex );
-aRes = aCC.parseAnyToken( m_aBufferString, m_nBufferIndex,
-nStartFlags, aEmptyStr,
-nContFlags, aEmptyStr );
-
-// #i45779# parse numbers correctly
-// i.e. independent from the locale setting.
-// (note that #i11752# remains fixed)
-if ((aRes.TokenType & KParseType::IDENTNAME) &&
CharClass::isAsciiDigit( cFirstChar ))
+// Try to parse a number. This should be independent from the locale
+// setting, so temporarily set the language to English.
+// See https://issues.apache.org/ooo/show_bug.cgi?id=45779
+LanguageTag aOldLoc(aCC.getLanguageTag());
+aCC.setLanguageTag(LanguageTag(m_aDotLoc));
+aRes = aCC.parsePredefinedToken(KParseType::ASC_NUMBER,
+m_aBufferString, m_nBufferIndex,
+coNumStartFlags, aEmptyStr,
+coNumContFlags, aEmptyStr);
+aCC.setLanguageTag(aOldLoc);
+
+if (aRes.TokenType == 0)
{
-ParseResult aTmpRes;
-LanguageTag aOldLoc( aCC.getLanguageTag() );
-aCC.setLanguageTag( LanguageTag( m_aDotLoc ));
-aTmpRes = aCC.parsePredefinedToken(
-KParseType::ASC_NUMBER,
-m_aBufferString, m_nBufferIndex,
-KParseTokens::ASC_DIGIT, aEmptyStr,
-KParseTokens::ASC_DIGIT | KParseTokens::ASC_DOT,
aEmptyStr );
-aCC.setLanguageTag( aOldLoc );
-if (aTmpRes.TokenType & KParseType::ASC_NUMBER)
-aRes.TokenType = aTmpRes.TokenType;
+// Try again with the default token parsing.
+aRes = aCC.parseAnyToken(m_aBufferString, m_nBufferIndex,
+ coStartFlags, aEmptyStr,
+ coContFlags, aEmptyStr);
}
nRealStart = m_nBufferIndex + sal::static_int_cast< xub_StrLen
>(aRes.LeadingWhiteSpace);
@@ -476,8 +469,7 @@ void SmParser::NextToken()
m_aCurToken.nLevel = 0;
m_aCurToken.aText = "";
}
-else if ((aRes.TokenTyp
[Libreoffice-commits] core.git: starmath/source
starmath/source/parse.cxx | 52 --
1 file changed, 23 insertions(+), 29 deletions(-)
New commits:
commit 2ca754cba469533b1ed160b2fadbbe035cf1db34
Author: Frédéric Wang
Date: Sun Jun 23 13:44:35 2013 +0200
Remove unused String::Copy in Math (try to fix fdo#36634)
Change-Id: I4a5618a7ef17a74edd036c34d748715d186f6528
Reviewed-on: https://gerrit.libreoffice.org/4457
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 9ae5dff..5a0098b 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -448,8 +448,7 @@ void SmParser::NextToken()
}
else if (aRes.TokenType & KParseType::ONE_SINGLE_CHAR)
{
-String aName( m_aBufferString.Copy( nRealStart, 2 ));
-if ( aName.EqualsAscii( "%%" ))
+if (m_aBufferString.EqualsAscii("%%", nRealStart, 2))
{
//SkipComment
m_nBufferIndex = nRealStart + 2;
@@ -549,17 +548,15 @@ void SmParser::NextToken()
else if (aRes.TokenType & KParseType::BOOLEAN)
{
sal_Int32 &rnEndPos = aRes.EndPos;
-String aName( m_aBufferString.Copy( nRealStart,
-sal::static_int_cast< xub_StrLen >(rnEndPos -
nRealStart) ));
-if (2 >= aName.Len())
+if (rnEndPos - nRealStart <= 2)
{
-sal_Unicode ch = aName.GetChar( 0 );
+sal_Unicode ch = m_aBufferString.GetChar(nRealStart);
switch (ch)
{
case '<':
{
-if (m_aBufferString.Copy( nRealStart, 2 ).
-EqualsAscii( "<<" ))
+if (m_aBufferString.
+EqualsAscii("<<", nRealStart, 2))
{
m_aCurToken.eType= TLL;
m_aCurToken.cMathChar = MS_LL;
@@ -569,8 +566,8 @@ void SmParser::NextToken()
rnEndPos = nRealStart + 2;
}
-else if (m_aBufferString.Copy( nRealStart, 2 ).
-EqualsAscii( "<=" ))
+else if (m_aBufferString.
+ EqualsAscii("<=", nRealStart, 2))
{
m_aCurToken.eType= TLE;
m_aCurToken.cMathChar = MS_LE;
@@ -580,8 +577,8 @@ void SmParser::NextToken()
rnEndPos = nRealStart + 2;
}
-else if (m_aBufferString.Copy( nRealStart, 2 ).
-EqualsAscii( "<>" ))
+else if (m_aBufferString.
+ EqualsAscii("<>", nRealStart, 2))
{
m_aCurToken.eType= TNEQ;
m_aCurToken.cMathChar = MS_NEQ;
@@ -591,8 +588,8 @@ void SmParser::NextToken()
rnEndPos = nRealStart + 2;
}
-else if (m_aBufferString.Copy( nRealStart, 3 ).
-EqualsAscii( "" ))
+else if (m_aBufferString.
+ EqualsAscii("", nRealStart, 3))
{
m_aCurToken.eType= TPLACE;
m_aCurToken.cMathChar = MS_PLACE;
@@ -614,8 +611,8 @@ void SmParser::NextToken()
break;
case '>':
{
-if (m_aBufferString.Copy( nRealStart, 2 ).
-EqualsAscii( ">=" ))
+if (m_aBufferString.
+EqualsAscii(">=", nRealStart, 2))
{
m_aCurToken.eType= TGE;
m_aCurToken.cMathChar = MS_GE;
@@ -625,8 +622,8 @@ void SmParser::NextToken()
rnEndPos = nRealStart + 2;
}
-else if (m_aBufferString.Copy( nRealStart, 2 ).
-EqualsAscii( ">>" ))
+else if (m_aBufferString.
+ EqualsAscii(">>", nRealStart, 2))
{
m_aCurToken.eType= TGG;
m_aCurToken.cMathChar = MS_GG;
@@ -654,12 +651,9 @@ void SmParser::NextToken()
else if (aRes.TokenType & KParseType::ONE_SINGLE_CHAR)
{
sal_Int32 &rnEndPos = aRes.EndPos;
-String aName( m_aBufferString.Copy( nRealStart,
-sal::static_int_cast< xub_StrLen >(rnEndPos -
nRealStart) ) );
-
-if (1 == aName.Len())
+
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlexport.cxx | 19 ---
starmath/source/mathmlimport.cxx |2 ++
2 files changed, 18 insertions(+), 3 deletions(-)
New commits:
commit 1418694edad8720dcd4884fd3e759c05a1f4cae9
Author: Frédéric Wang
Date: Sun Jun 23 13:28:36 2013 +0200
fdo#66075 - Formula editor: export blanks as MathML elements.
Change-Id: I5cc0ed9a1273b5fb59d5dbaf63a382c844820ff9
Reviewed-on: https://gerrit.libreoffice.org/4454
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index f9e6589..e18a69e 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -882,15 +882,28 @@ void SmXMLExport::ExportText(const SmNode *pNode, int
/*nLevel*/)
delete pText;
}
-void SmXMLExport::ExportBlank(const SmNode * /*pNode*/, int /*nLevel*/)
+void SmXMLExport::ExportBlank(const SmNode *pNode, int /*nLevel*/)
{
-//!! exports an empty tag since for example "~_~" is allowed in
+const SmBlankNode *pTemp = static_cast(pNode);
+//!! exports an element. Note that for example "~_~" is allowed in
//!! Math (so it has no sense at all) but must not result in an empty
//!! tag in MathML !!
+if (pTemp->GetBlankNum() != 0)
+{
+// Attach a width attribute. We choose the (somewhat arbitrary) values
+// ".5em" for a small gap '`' and "2em" for a large gap '~'.
+// (see SmBlankNode::IncreaseBy for how pTemp->nNum is set).
+OUStringBuffer sStrBuf;
+::sax::Converter::convertDouble(sStrBuf, pTemp->GetBlankNum() * .5);
+sStrBuf.append(OUString("em"));
+AddAttribute(XML_NAMESPACE_MATH, XML_WIDTH, sStrBuf.getStr());
+}
+
SvXMLElementExport *pText;
-pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MI,
sal_True, sal_False);
+pText = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MSPACE,
+sal_True, sal_False);
GetDocHandler()->characters( OUString() );
delete pText;
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index 608ab7a..beaaf3d 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -1418,6 +1418,8 @@ public:
void SmXMLSpaceContext_Impl::StartElement(
const uno::Reference & /*xAttrList*/ )
{
+// There is not any syntax in Math to specify blank nodes of arbitrary
+// size. Hence we always interpret an as a large gap "~".
SmToken aToken;
aToken.cMathChar = '\0';
aToken.eType = TBLANK;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff starmath/source xmloff/source
include/xmloff/xmltoken.hxx |4 +++
starmath/source/mathmlexport.cxx | 48 ++-
starmath/source/mathmlexport.hxx |1
starmath/source/mathmlimport.cxx | 38 ++
starmath/source/mathmlimport.hxx |5
xmloff/source/core/xmltoken.cxx |4 +++
6 files changed, 99 insertions(+), 1 deletion(-)
New commits:
commit 3b3ec32358aebd81ef5385f48dbf3ee4c93649e8
Author: Frédéric Wang
Date: Sun Jun 23 21:32:37 2013 +0200
fdo#66086 - MathML export: wideslash, widebslash and overstrike
Change-Id: I1e8da340ffdacab133b0cff6d6344fe56da34bf8
Reviewed-on: https://gerrit.libreoffice.org/4465
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index a40da2c..5993b74 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -295,6 +295,7 @@ namespace xmloff { namespace token {
XML_BELOW,
XML_BETWEEN_DATE_TIMES,
XML_BEVEL,
+XML_BEVELLED,
XML_BIBILIOGRAPHIC_TYPE,
XML_BIBLIOGRAPHY,
XML_BIBLIOGRAPHY_CONFIGURATION,
@@ -941,6 +942,7 @@ namespace xmloff { namespace token {
XML_HIGHLIGHTED_RANGE,
XML_HINT,
XML_HORIZONTAL,
+XML_HORIZONTALSTRIKE,
XML_HORIZONTAL_LINES,
// XML_HORIZONTAL_ON_LEFT_PAGES and XML_HORIZONTAL_ON_RIGHT_PAGES
// are replaced by XML_HORIZONTAL_ON_EVEN and XML_HORIZONTAL_ON_ODD.
@@ -1166,6 +1168,7 @@ namespace xmloff { namespace token {
XML_MEASURE_VERTICAL_ALIGN,
XML_MEDIAN,
XML_MEDIUM,
+XML_MENCLOSE,
XML_MERROR,
XML_MESSAGE_TYPE,
XML_META,
@@ -1262,6 +1265,7 @@ namespace xmloff { namespace token {
XML_NORMALS_KIND,
XML_NOT,
XML_NOT_EQUAL_DATE,
+XML_NOTATION,
XML_NOTE,
XML_NOTES,
XML_NOTIN,
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 8df9d28..f9e6589 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -766,6 +766,42 @@ void SmXMLExport::ExportBinaryVertical(const SmNode
*pNode, int nLevel)
ExportNodes(pNode->GetSubNode(2), nLevel);
}
+void SmXMLExport::ExportBinaryDiagonal(const SmNode *pNode, int nLevel)
+{
+OSL_ENSURE(pNode->GetNumSubNodes()==3, "Bad Slash");
+
+if (pNode->GetToken().eType == TWIDESLASH)
+{
+// wideslash
+// export the node as
+AddAttribute(XML_NAMESPACE_MATH, XML_BEVELLED, XML_TRUE);
+SvXMLElementExport aFraction(*this, XML_NAMESPACE_MATH, XML_MFRAC,
+sal_True, sal_True);
+ExportNodes(pNode->GetSubNode(0), nLevel);
+ExportNodes(pNode->GetSubNode(1), nLevel);
+}
+else
+{
+// widebslash
+// We can not use to a backslash, so just use \
+SvXMLElementExport *pRow = new SvXMLElementExport(*this,
+XML_NAMESPACE_MATH, XML_MROW, sal_True, sal_True);
+
+ExportNodes(pNode->GetSubNode(0), nLevel);
+
+{ // Scoping for creation
+SvXMLElementExport aMo(*this, XML_NAMESPACE_MATH, XML_MO,
+sal_True,sal_True);
+sal_Unicode nArse[2] = {MS_BACKSLASH,0x00};
+GetDocHandler()->characters(nArse);
+}
+
+ExportNodes(pNode->GetSubNode(1), nLevel);
+
+delete pRow;
+}
+}
+
void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel)
{
SvXMLElementExport *pTable=0;
@@ -1090,7 +1126,14 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode,
int nLevel)
pElement = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
XML_MUNDER,
sal_True,sal_True);
}
-else if (pNode->GetToken().eType != TOVERSTRIKE)
+else if (pNode->GetToken().eType == TOVERSTRIKE)
+{
+// export as
+AddAttribute(XML_NAMESPACE_MATH, XML_NOTATION, XML_HORIZONTALSTRIKE);
+pElement = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
+XML_MENCLOSE, sal_True, sal_True);
+}
+else
{
AddAttribute(XML_NAMESPACE_MATH, XML_ACCENT,
XML_TRUE);
@@ -1449,6 +1492,9 @@ void SmXMLExport::ExportNodes(const SmNode *pNode, int
nLevel)
case NBINVER:
ExportBinaryVertical(pNode, nLevel);
break;
+case NBINDIAGONAL:
+ExportBinaryDiagonal(pNode, nLevel);
+break;
case NSUBSUP:
ExportSubSupScript(pNode, nLevel);
break;
diff --git a/starmath/source/mathmlexport.hxx b/starmath/source/mathmlexport.hxx
index 52b558e..3cbaaae 100644
--- a/starmath/source/mathmlexport.hxx
+++ b/starmath/source/mathmlexport.hxx
@@ -92,6 +92,7 @@ protected:
void ExportUnaryHorizontal(const SmNode *pNode, int nLevel);
void ExportBrace(const SmNode *pNode, int nLevel);
void ExportBinaryVertical(const SmNode *pNode, int nLevel);
+void Exp
[Libreoffice-commits] core.git: starmath/inc starmath/source
starmath/inc/types.hxx |6 --
starmath/source/mathmlexport.cxx |9 +
starmath/source/node.cxx |6 --
starmath/source/ooxmlimport.cxx |2 ++
4 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 6231979ce1b89ce36e0a68139c96c5c1c1e704bb
Author: Frédéric Wang
Date: Sat Jun 22 20:03:59 2013 +0200
fdo#66024 - Formula Editor: make wide accents stretchy when exported to
MathML
Change-Id: Ifd0adc51d79e0673661b5646d27f657768ea5b20
Reviewed-on: https://gerrit.libreoffice.org/4450
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index ca2bea9..530736b 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -139,8 +139,10 @@ enum MathSymbol
MS_GRAVE= (sal_Unicode) 0x0300,
MS_ACUTE= (sal_Unicode) 0x0301,
-MS_HAT = (sal_Unicode) 0x0302,
-MS_TILDE= (sal_Unicode) 0x0303,
+MS_HAT = (sal_Unicode) 0x005E,
+MS_COMBHAT = (sal_Unicode) 0x0302,
+MS_TILDE= (sal_Unicode) 0x007E,
+MS_COMBTILDE= (sal_Unicode) 0x0303,
MS_BAR = (sal_Unicode) 0x0304,
MS_BREVE= (sal_Unicode) 0x0306,
MS_CIRCLE = (sal_Unicode) 0x030A,
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index b2a9b38..8df9d28 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -1121,6 +1121,15 @@ void SmXMLExport::ExportAttributes(const SmNode *pNode,
int nLevel)
break;
case TOVERSTRIKE:
break;
+case TWIDETILDE:
+case TWIDEHAT:
+case TWIDEVEC:
+{
+// make these wide accents stretchy
+AddAttribute(XML_NAMESPACE_MATH, XML_STRETCHY, XML_TRUE);
+ExportNodes(pNode->GetSubNode(0), nLevel+1);
+}
+break;
default:
ExportNodes(pNode->GetSubNode(0), nLevel+1);
break;
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index e0c7282..d3ae705 100644
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -2820,10 +2820,12 @@ void SmAttributNode::CreateTextFromNode(String &rText)
case MS_VEC: // COMBINING RIGHT ARROW ABOVE
rText += "vec ";
break;
-case MS_TILDE: // COMBINING TILDE
+case MS_TILDE: // TILDE
+case MS_COMBTILDE: // COMBINING TILDE
rText += "tilde ";
break;
-case MS_HAT: // COMBINING CIRCUMFLEX ACCENT
+case MS_HAT: // CIRCUMFLEX ACCENT
+case MS_COMBHAT: // COMBINING CIRCUMFLEX ACCENT
rText += "hat ";
break;
case MS_BAR: // COMBINING MACRON
diff --git a/starmath/source/ooxmlimport.cxx b/starmath/source/ooxmlimport.cxx
index a844195..cb355b7 100644
--- a/starmath/source/ooxmlimport.cxx
+++ b/starmath/source/ooxmlimport.cxx
@@ -192,9 +192,11 @@ OUString SmOoxmlImport::handleAcc()
acc = "widevec";
break;
case MS_TILDE:
+case MS_COMBTILDE:
acc = "widetilde";
break;
case MS_HAT:
+case MS_COMBHAT:
acc = "widehat";
break;
case MS_DOT:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] DOCX import fix for table with auto size
Hello LibreOffice gerrit bot, Björn Michaelsen, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/4546 to look at the new patch set (#2). Change subject: DOCX import fix for table with auto size .. DOCX import fix for table with auto size Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739 Reviewed-on: https://gerrit.libreoffice.org/4496 --- A sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx M sw/qa/extras/ooxmlimport/ooxmlimport.cxx M writerfilter/source/dmapper/DomainMapperTableManager.cxx M writerfilter/source/dmapper/DomainMapperTableManager.hxx 4 files changed, 55 insertions(+), 2 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/4546/2 -- To view, visit https://gerrit.libreoffice.org/4546 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Adam CloudOn Gerrit-Reviewer: Björn Michaelsen Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Miklos Vajna ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] DOCX import fix for table with auto size
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4546 -- To view, visit https://gerrit.libreoffice.org/4546 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Adam CloudOn Gerrit-Reviewer: Björn Michaelsen Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Miklos Vajna ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 12 ++
writerfilter/source/dmapper/DomainMapperTableManager.cxx| 44
+-
writerfilter/source/dmapper/DomainMapperTableManager.hxx|1
4 files changed, 55 insertions(+), 2 deletions(-)
New commits:
commit 74c5ed19f430327988194cdcd6bdff09591a93fa
Author: Adam Co
Date: Wed Jun 26 11:08:56 2013 +0300
DOCX import fix for table with auto size
Change-Id: Ic86f4f142e579bdef3e954492e1c1e382a545739
Reviewed-on: https://gerrit.libreoffice.org/4496
diff --git a/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx
b/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx
new file mode 100644
index 000..557edcb
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/table-auto-column-fixed-size.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4f23d92..985bd66 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -121,6 +121,7 @@ public:
void testN820788();
void testN820504();
void testFdo43641();
+void testTableAutoColumnFixedSize();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -208,6 +209,7 @@ void Test::run()
{"n820788.docx", &Test::testN820788},
{"n820504.docx", &Test::testN820504},
{"fdo43641.docx", &Test::testFdo43641},
+{"table-auto-column-fixed-size.docx",
&Test::testTableAutoColumnFixedSize},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1462,6 +1464,16 @@ void Test::testFdo43641()
CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(928694)),
xLine->getSize().Width);
}
+void Test::testTableAutoColumnFixedSize()
+{
+uno::Reference xTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTextTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+
+// Width was not recognized during import when table size was 'auto'
+CPPUNIT_ASSERT_EQUAL(sal_Int32(TWIP_TO_MM100(3996)),
getProperty(xTextTable, "Width"));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 48d1e31..6aabf59 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -57,6 +57,7 @@ DomainMapperTableManager::DomainMapperTableManager(bool
bOOXML) :
m_bRowSizeTypeInserted(false),
m_bTableSizeTypeInserted(false),
m_nLayoutType(0),
+m_nMaxFixedWidth(0),
m_pTablePropsHandler( new TablePropertiesHandler( bOOXML ) )
{
m_pTablePropsHandler->SetTableManager( this );
@@ -132,8 +133,47 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm)
}
else if(
sal::static_int_cast(pMeasureHandler->getUnit()) ==
NS_ooxml::LN_Value_ST_TblWidth_auto )
{
-pPropMap->setValue(
TablePropertyMap::TABLE_WIDTH_TYPE, text::SizeType::VARIABLE );
-pPropMap->setValue( TablePropertyMap::TABLE_WIDTH,
100 );
+/*
+This attribute specifies the width type of table.
This is used as part of the table layout
+algorithm specified by the tblLayout element.(See
17.4.64 and 17.4.65 of the ISO/IEC 29500-1:2011.)
+If this valus is 'auto', the table layout has to
uses the preferred widths on the table items to generate
+the final sizing of the table, but then must use
the contents of each cell to determine final column widths.
+(See 17.18.87 of the ISO/IEC 29500-1:2011.)
+*/
+bool bFixed = false;
+sal_Int32 nRowFixedWidth = 0;
+if (!m_aCellWidths.empty())
+{
+// Step 1. Check whether any cell has fixed
width in the given row of table.
+::std::vector< IntVectorPtr >::iterator itr;
+for (itr = m_aCellWidths.begin(); itr !=
m_aCellWidths.end(); itr ++)
+{
+IntVectorPtr itrVal = (*itr);
+for
(std::vector::const_iterator aValIter = itrVal->begin(); aValIter !=
itrVal->end(); ++aValIter)
+{
+// Sum the width of cells to find the
total width of given row
+
[Libreoffice-commits] core.git: Branch 'feature/cmis' - sfx2/uiconfig
sfx2/uiconfig/ui/documentinfopage.ui | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit e493b8eb5881609e31047a66a5d17282fc8607a0 Author: Cao Cuong Ngo Date: Fri Jun 28 11:37:39 2013 +0200 Properties dialog Change the Location GtkLabel in general tab to multiple lines. However for unknown reason the text become all "*". Change-Id: Ia9553f93303ed5f831f61adda0f060a889e7086a diff --git a/sfx2/uiconfig/ui/documentinfopage.ui b/sfx2/uiconfig/ui/documentinfopage.ui index eeccbd0..8ea0bf3 100644 --- a/sfx2/uiconfig/ui/documentinfopage.ui +++ b/sfx2/uiconfig/ui/documentinfopage.ui @@ -5,6 +5,7 @@ True False True +True 6 6 18 @@ -210,9 +211,11 @@ _Apply user data +False True False True +False True 0 True @@ -227,9 +230,11 @@ Reset +False True True True +False 2 @@ -241,9 +246,11 @@ Di_gital Signature... +False True True True +False True @@ -334,8 +341,11 @@ True False -0 +left True +True +True +60 1 @@ -378,9 +388,11 @@ Change _Password +False True True True +False True @@ -461,9 +473,11 @@ _Read-only +False True True False +False True 0 True ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: config_host.mk.in configure.ac external/Module_external.mk external/Package_msvc_dlls_debug.mk
config_host.mk.in |2 --
configure.ac| 17 -
external/Module_external.mk |1 -
external/Package_msvc_dlls_debug.mk | 16
4 files changed, 36 deletions(-)
New commits:
commit 7f4a622f9fbf27774efa908348e682df7280713b
Author: Michael Stahl
Date: Fri Jun 21 00:06:27 2013 +0200
stop copying MSVC debug runtime DLLs
This is apparently not necessary with MSVC 2012; builds and all tests
run here without those DLLs in the solver.
Change-Id: If352fb3702d7dae57deb19959eab8eb0fedea318
Reviewed-on: https://gerrit.libreoffice.org/4414
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/config_host.mk.in b/config_host.mk.in
index c0f4e6b..f3470f3 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -347,8 +347,6 @@ export MSPUB_CFLAGS=$(gb_SPACE)@MSPUB_CFLAGS@
export MSPUB_LIBS=$(gb_SPACE)@MSPUB_LIBS@
export MSVC_DLLS=@MSVC_DLLS@
export MSVC_DLL_PATH=@MSVC_DLL_PATH@
-export MSVC_DEBUG_DLLS=@MSVC_DEBUG_DLLS@
-export MSVC_DEBUG_DLL_PATH=@MSVC_DEBUG_DLL_PATH@
export MSVC_USE_DEBUG_RUNTIME=@MSVC_USE_DEBUG_RUNTIME@
export MSVC80_DLLS=@MSVC80_DLLS@
export MSVC80_DLL_PATH=@MSVC80_DLL_PATH@
diff --git a/configure.ac b/configure.ac
index 42d1569..e193a8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4909,28 +4909,13 @@ AC_MSG_NOTICE([checking msms
===
find_msvc_x64_dlls()
{
-if test "$CPUNAME" = "INTEL"; then
-vsarch=x86
-else
-vsarch=x64
-fi
-
msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
-
MSVC_DEBUG_DLL_PATH="$VC_PRODUCT_DIR/redist/Debug_NonRedist/$vsarch/Microsoft.VC${VCVER}.DebugCRT"
msvcdlls="msvcp${VCVER}.dll msvcr${VCVER}.dll"
-MSVC_DEBUG_DLLS="msvcp${VCVER}d.dll msvcr${VCVER}d.dll"
for dll in $msvcdlls; do
if ! test -f "$msvcdllpath/$dll"; then
AC_MSG_ERROR([can not find $dll in $msvcdllpath])
fi
done
-if test -n "$MSVC_USE_DEBUG_RUNTIME"; then
-for dll in $MSVC_DEBUG_DLLS; do
-if ! test -f "$MSVC_DEBUG_DLL_PATH/$dll"; then
-AC_MSG_ERROR([can not find $dll in $MSVC_DEBUG_DLL_PATH])
-fi
-done
-fi
}
if test "$build_os" = "cygwin"; then
@@ -6243,8 +6228,6 @@ fi
AC_SUBST(MSVC_DLL_PATH)
AC_SUBST(MSVC_DLLS)
-AC_SUBST(MSVC_DEBUG_DLL_PATH)
-AC_SUBST(MSVC_DEBUG_DLLS)
AC_SUBST(MSM_PATH)
AC_SUBST(MERGE_MODULES)
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 8cda13e..907b23b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -26,7 +26,6 @@ $(eval $(call gb_Module_add_targets,external,\
Package_dbghelp \
$(if $(MSM_PATH),Package_msms) \
Package_msvc_dlls \
- $(if $(MSVC_USE_DEBUG_RUNTIME),Package_msvc_dlls_debug) \
$(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
))
endif
diff --git a/external/Package_msvc_dlls_debug.mk
b/external/Package_msvc_dlls_debug.mk
deleted file mode 100644
index 3e84764..000
--- a/external/Package_msvc_dlls_debug.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DEBUG_DLL_PATH)))
-
-$(eval $(call gb_Package_add_files,msvc_dlls,bin,\
- $(MSVC_DEBUG_DLLS) \
-))
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: readlicense_oo/odt
readlicense_oo/odt/CREDITS.odt |binary 1 file changed New commits: commit 62d5b496b87b3beb6273da9643a1883fcd8afece Author: Christian Lohmaier Date: Mon Jun 24 12:58:54 2013 +0200 credits: add back "developers not committing code since 2010-09-28" done so by bringing back the relevant part that was removed in https://bitbucket.org/spaetz/gitanaly/commits/9854ae0b40d5f8c2ab4d0dcb59b2c4639cd179fb Change-Id: I31c1e918854c0e8a3bd354b41c8a1cbf2a5af003 Reviewed-on: https://gerrit.libreoffice.org/4474 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt index 606deea..2fae554 100644 Binary files a/readlicense_oo/odt/CREDITS.odt and b/readlicense_oo/odt/CREDITS.odt differ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua
vcl/aqua/source/gdi/salnativewidgets.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit afa685c2a3bca8fb73a1c2cde536a2da4cd43b13 Author: Jason Hulme Date: Fri Jun 14 23:23:37 2013 -0700 fdo#31525 Dialogues now have an appropriate background in OSX The proper background is now set using HIThemeBackground. Change-Id: I71e4287273f7345a18eee4c4fc494eea10f2deb2 Reviewed-on: https://gerrit.libreoffice.org/4287 Reviewed-by: Thorsten Behrens Tested-by: Thorsten Behrens diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index 3365c04..3de4118 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -522,7 +522,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, HIThemeBackgroundDrawInfo aThemeBackgroundInfo; aThemeBackgroundInfo.version = 0; aThemeBackgroundInfo.state = getState( nState ); -aThemeBackgroundInfo.kind = kThemeBrushDialogBackgroundInactive; +aThemeBackgroundInfo.kind = kThemeBrushDialogBackgroundActive; // FIXME: without this magical offset there is a 2 pixel black border on the right and bottom rc.size.width += 2; rc.size.height += 2; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: scripting/source
scripting/source/basprov/basprov.cxx |1
scripting/source/inc/util/MiscUtils.hxx |2 -
scripting/source/inc/util/util.hxx| 26 --
scripting/source/protocolhandler/scripthandler.cxx|1
scripting/source/provider/ActiveMSPList.cxx |1
scripting/source/provider/BrowseNodeFactoryImpl.cxx |1
scripting/source/provider/MasterScriptProvider.cxx|1
scripting/source/provider/MasterScriptProviderFactory.cxx |2 -
scripting/source/provider/ProviderCache.cxx |1
scripting/source/provider/ScriptImpl.cxx |1
scripting/source/provider/ScriptingContext.cxx|1
11 files changed, 38 deletions(-)
New commits:
commit 349d3b2bb5b771b9e6d42693c64ba7fa29379322
Author: Thomas Arnhold
Date: Thu Jun 27 13:21:47 2013 +0200
remove an unused header
Change-Id: I2821879670e23e7b1ce9749acab1970098a0a38d
Reviewed-on: https://gerrit.libreoffice.org/4597
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/scripting/source/basprov/basprov.cxx
b/scripting/source/basprov/basprov.cxx
index ed0c1f9..04e279f 100644
--- a/scripting/source/basprov/basprov.cxx
+++ b/scripting/source/basprov/basprov.cxx
@@ -47,7 +47,6 @@
#include
#include
-#include
#include
diff --git a/scripting/source/inc/util/MiscUtils.hxx
b/scripting/source/inc/util/MiscUtils.hxx
index ccb44f8..5780964 100644
--- a/scripting/source/inc/util/MiscUtils.hxx
+++ b/scripting/source/inc/util/MiscUtils.hxx
@@ -37,8 +37,6 @@
#include
#include
-#include "util.hxx"
-
namespace sf_misc
{
diff --git a/scripting/source/inc/util/util.hxx
b/scripting/source/inc/util/util.hxx
deleted file mode 100644
index 5dd38b8..000
--- a/scripting/source/inc/util/util.hxx
+++ /dev/null
@@ -1,26 +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 .
- */
-
-
-#ifndef _COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_
-#define _COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_
-
-#endif //_COM_SUN_STAR_SCRIPTING_UTIL_UTIL_HXX_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scripting/source/protocolhandler/scripthandler.cxx
b/scripting/source/protocolhandler/scripthandler.cxx
index 43128f2..5d70b30 100644
--- a/scripting/source/protocolhandler/scripthandler.cxx
+++ b/scripting/source/protocolhandler/scripthandler.cxx
@@ -44,7 +44,6 @@
#include
#include
#include
-#include
#include
#include "com/sun/star/uno/XComponentContext.hpp"
diff --git a/scripting/source/provider/ActiveMSPList.cxx
b/scripting/source/provider/ActiveMSPList.cxx
index 448294c..5b3b71e 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index cfb53af..a57c9f7 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -38,7 +38,6 @@
#include "BrowseNodeFactoryImpl.hxx"
#include "ActiveMSPList.hxx"
#include
-#include
#include
#include
diff --git a/scripting/source/provider/MasterScriptProvider.cxx
b/scripting/source/provider/MasterScriptProvider.cxx
index 32c89b4..a473394 100644
--- a/scripting/source/provider/MasterScriptProvider.cxx
+++ b/scripting/source/provider/MasterScriptProvider.cxx
@@ -40,7 +40,6 @@
#include
#include
-#include
#include
#include "ActiveMSPList.hxx"
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx
b/scripting/source/provider/MasterScriptProviderFactory.cxx
index aac8b34..a917072 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -23,8 +23,6 @@
#include
#include
-#include
-
#include "MasterScriptProviderFactory.hxx"
using namespace ::com::sun::star;
diff --git a/scripting/source/provider/ProviderCache.cxx
b/scripting/source/pr
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - basctl/source
basctl/source/basicide/basobj2.cxx | 41 -
1 file changed, 32 insertions(+), 9 deletions(-)
New commits:
commit 2d7dff2d677475c7e29e5340d0ebef8545aefd97
Author: Noel Power
Date: Thu Jun 27 13:58:48 2013 +0100
improve performance switching modules in large Libraries fdo#66148
object catalog when updated, updates ( all ) entries and was parsing
the source for every method in every module
Change-Id: Id68e3c24d597d29a86d3507a7dc20745c96dd2a2
(cherry picked from commit 61027ca6eb450fb20bfe9209ba180fe0606baeab)
Reviewed-on: https://gerrit.libreoffice.org/4598
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index 7e62558..d5e4b91 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -42,7 +42,7 @@
#include
#include
#include
-
+#include "basic/basmgr.hxx"
namespace basctl
{
@@ -405,13 +405,25 @@ Sequence< OUString > GetMethodNames( const
ScriptDocument& rDocument, const OUSt
OUString aOUSource;
if ( rDocument.getModule( rLibName, rModName, aOUSource ) )
{
-SbModuleRef xModule = new SbModule( rModName );
-xModule->SetSource32( aOUSource );
-sal_uInt16 nCount = xModule->GetMethods()->Count();
+BasicManager* pBasMgr = rDocument.getBasicManager();
+StarBASIC* pSb = pBasMgr ? pBasMgr->GetLib( rLibName ) : NULL;
+SbModule* pMod = pSb ? pSb->FindModule( rModName ) : NULL;
+
+SbModuleRef xModule;
+// Only reparse modules if ScriptDocument source is out of sync
+// with basic's Module
+if ( !pMod || ( pMod && pMod->GetSource() != aOUSource ) )
+{
+xModule = new SbModule( rModName );
+xModule->SetSource32( aOUSource );
+pMod = xModule;
+}
+
+sal_uInt16 nCount = pMod->GetMethods()->Count();
sal_uInt16 nRealCount = nCount;
for ( sal_uInt16 i = 0; i < nCount; i++ )
{
-SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i );
+SbMethod* pMethod = (SbMethod*)pMod->GetMethods()->Get( i );
if( pMethod->IsHidden() )
--nRealCount;
}
@@ -420,7 +432,7 @@ Sequence< OUString > GetMethodNames( const ScriptDocument&
rDocument, const OUSt
sal_uInt16 iTarget = 0;
for ( sal_uInt16 i = 0 ; i < nCount; ++i )
{
-SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i );
+SbMethod* pMethod = (SbMethod*)pMod->GetMethods()->Get( i );
if( pMethod->IsHidden() )
continue;
SAL_WARN_IF( !pMethod, "basctl.basicide","Method not found!
(NULL)" );
@@ -445,9 +457,20 @@ bool HasMethod (
OUString aOUSource;
if ( rDocument.hasModule( rLibName, rModName ) && rDocument.getModule(
rLibName, rModName, aOUSource ) )
{
-SbModuleRef xModule = new SbModule( rModName );
-xModule->SetSource32( aOUSource );
-SbxArray* pMethods = xModule->GetMethods();
+// Check if we really need to scan the source ( again )
+BasicManager* pBasMgr = rDocument.getBasicManager();
+StarBASIC* pSb = pBasMgr ? pBasMgr->GetLib( rLibName ) : NULL;
+SbModule* pMod = pSb ? pSb->FindModule( rModName ) : NULL;
+SbModuleRef xModule;
+// Only reparse modules if ScriptDocument source is out of sync
+// with basic's Module
+if ( !pMod || ( pMod && pMod->GetSource() != aOUSource ))
+{
+xModule = new SbModule( rModName );
+xModule->SetSource32( aOUSource );
+pMod = xModule;
+}
+SbxArray* pMethods = pMod->GetMethods();
if ( pMethods )
{
SbMethod* pMethod = (SbMethod*)pMethods->Find( rMethName,
SbxCLASS_METHOD );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - basctl/source
basctl/source/basicide/basobj2.cxx | 41 -
1 file changed, 32 insertions(+), 9 deletions(-)
New commits:
commit 7f50f4092b7beafa5545a9a783dde760b260df4c
Author: Noel Power
Date: Thu Jun 27 13:58:48 2013 +0100
improve performance switching modules in large Libraries fdo#66148
object catalog when updated, updates ( all ) entries and was parsing
the source for every method in every module
Change-Id: Id68e3c24d597d29a86d3507a7dc20745c96dd2a2
(cherry picked from commit 61027ca6eb450fb20bfe9209ba180fe0606baeab)
Reviewed-on: https://gerrit.libreoffice.org/4599
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index 25d43a0..9785230 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -42,7 +42,7 @@
#include
#include
#include
-
+#include "basic/basmgr.hxx"
namespace basctl
{
@@ -405,13 +405,25 @@ Sequence< OUString > GetMethodNames( const
ScriptDocument& rDocument, const OUSt
OUString aOUSource;
if ( rDocument.getModule( rLibName, rModName, aOUSource ) )
{
-SbModuleRef xModule = new SbModule( rModName );
-xModule->SetSource32( aOUSource );
-sal_uInt16 nCount = xModule->GetMethods()->Count();
+BasicManager* pBasMgr = rDocument.getBasicManager();
+StarBASIC* pSb = pBasMgr ? pBasMgr->GetLib( rLibName ) : NULL;
+SbModule* pMod = pSb ? pSb->FindModule( rModName ) : NULL;
+
+SbModuleRef xModule;
+// Only reparse modules if ScriptDocument source is out of sync
+// with basic's Module
+if ( !pMod || ( pMod && pMod->GetSource() != aOUSource ) )
+{
+xModule = new SbModule( rModName );
+xModule->SetSource32( aOUSource );
+pMod = xModule;
+}
+
+sal_uInt16 nCount = pMod->GetMethods()->Count();
sal_uInt16 nRealCount = nCount;
for ( sal_uInt16 i = 0; i < nCount; i++ )
{
-SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i );
+SbMethod* pMethod = (SbMethod*)pMod->GetMethods()->Get( i );
if( pMethod->IsHidden() )
--nRealCount;
}
@@ -420,7 +432,7 @@ Sequence< OUString > GetMethodNames( const ScriptDocument&
rDocument, const OUSt
sal_uInt16 iTarget = 0;
for ( sal_uInt16 i = 0 ; i < nCount; ++i )
{
-SbMethod* pMethod = (SbMethod*)xModule->GetMethods()->Get( i );
+SbMethod* pMethod = (SbMethod*)pMod->GetMethods()->Get( i );
if( pMethod->IsHidden() )
continue;
DBG_ASSERT( pMethod, "Method not found! (NULL)" );
@@ -445,9 +457,20 @@ bool HasMethod (
OUString aOUSource;
if ( rDocument.hasModule( rLibName, rModName ) && rDocument.getModule(
rLibName, rModName, aOUSource ) )
{
-SbModuleRef xModule = new SbModule( rModName );
-xModule->SetSource32( aOUSource );
-SbxArray* pMethods = xModule->GetMethods();
+// Check if we really need to scan the source ( again )
+BasicManager* pBasMgr = rDocument.getBasicManager();
+StarBASIC* pSb = pBasMgr ? pBasMgr->GetLib( rLibName ) : NULL;
+SbModule* pMod = pSb ? pSb->FindModule( rModName ) : NULL;
+SbModuleRef xModule;
+// Only reparse modules if ScriptDocument source is out of sync
+// with basic's Module
+if ( !pMod || ( pMod && pMod->GetSource() != aOUSource ))
+{
+xModule = new SbModule( rModName );
+xModule->SetSource32( aOUSource );
+pMod = xModule;
+}
+SbxArray* pMethods = pMod->GetMethods();
if ( pMethods )
{
SbMethod* pMethod = (SbMethod*)pMethods->Find( rMethName,
SbxCLASS_METHOD );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/frmtool.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 296c2af27a189e8406957ac44eb412ec3f9a74fd
Author: Julien Nabet
Date: Wed Jun 26 22:31:11 2013 +0200
fdo#66101: lowriter crashed when trying to open .docx file
Change-Id: I516bcb4bc18806d5a83f94c0776bd0f918a1e927
Reviewed-on: https://gerrit.libreoffice.org/4550
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index 9123987..06dc22c 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1913,7 +1913,7 @@ static bool lcl_hasTabFrm(const SwTxtFrm* pTxtFrm)
if (pObject->IsA(TYPE(SwFlyFrm)))
{
SwFlyFrm* pFly = (SwFlyFrm*)pObject;
-if (pFly->Lower()->IsTabFrm())
+if (pFly->Lower() && pFly->Lower()->IsTabFrm())
return true;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bitmap3.cxx | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
New commits:
commit 344d80ee1d3829b28c18135ac4f0500d4b69aedd
Author: Norbert Thiebaud
Date: Wed Jun 26 03:17:24 2013 -0500
coverity#1028110 Dereference before null check
Change-Id: Ie5fb6a0ecad185c1849f55111c17692c280d9454
Reviewed-on: https://gerrit.libreoffice.org/4531
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 250f188..8d5e6a4 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.cxx
@@ -1297,8 +1297,6 @@ sal_Bool Bitmap::ImplScaleSuper(
{
BitmapColor aCol0, aCol1, aColRes;
BitmapReadAccess* pAcc = AcquireReadAccess();
-longnW = pAcc->Width() ;
-longnH = pAcc->Height() ;
Bitmap aOutBmp( Size( nDstW, nDstH ), 24 );
BitmapWriteAccess* pWAcc = aOutBmp.AcquireWriteAccess();
long* pMapIX = new long[ nDstW ];
@@ -1316,6 +1314,8 @@ sal_Bool Bitmap::ImplScaleSuper(
if( pAcc && pWAcc )
{
+longnW = pAcc->Width() ;
+longnH = pAcc->Height() ;
const doublefRevScaleX = ( nDstW > 1L ) ? ( (double) ( nW - 1
) / ( nDstW - 1 ) ) : 0.0;
const doublefRevScaleY = ( nDstH > 1L ) ? ( (double) ( nH - 1
) / ( nDstH - 1 ) ) : 0.0;
@@ -1488,7 +1488,7 @@ sal_Bool Bitmap::ImplScaleSuper(
}
}
}
-}
+}
else
{
if( scaleX >= fScaleThresh && scaleY >= fScaleThresh )
@@ -2075,9 +2075,14 @@ sal_Bool Bitmap::ImplScaleSuper(
delete[] pMapFX;
delete[] pMapFY;
-ReleaseAccess( pAcc );
-aOutBmp.ReleaseAccess( pWAcc );
-
+if(pAcc)
+{
+ReleaseAccess( pAcc );
+}
+if(pWAcc)
+{
+aOutBmp.ReleaseAccess( pWAcc );
+}
if( bRet )
{
ImplAdaptBitCount(aOutBmp);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/dibtools.cxx |9 +
1 file changed, 1 insertion(+), 8 deletions(-)
New commits:
commit 776de8a2394e6adecc9b46920f3e84f522b5c149
Author: Norbert Thiebaud
Date: Wed Jun 26 03:27:08 2013 -0500
coverity#1027396 : Logically dead code
Change-Id: Ia1d0358b95e036f3866487db12cb42e0e81d76cf
Reviewed-on: https://gerrit.libreoffice.org/4532
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx
index c4b3bfe..6a15ade 100644
--- a/vcl/source/gdi/dibtools.cxx
+++ b/vcl/source/gdi/dibtools.cxx
@@ -,14 +,7 @@ bool ImplWriteDIBBits(SvStream& rOStm, BitmapReadAccess&
rAcc, BitmapReadAccess*
if(bWriteAlpha)
{
-if(pAccAlpha)
-{
-*pTmp++ = (sal_uInt8)0xff -
(sal_uInt8)pAccAlpha->GetPixelIndex( nY, nX );
-}
-else
-{
-*pTmp++ = (sal_uInt8)0xff;
-}
+*pTmp++ = (sal_uInt8)0xff -
(sal_uInt8)pAccAlpha->GetPixelIndex( nY, nX );
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] MSVC build fixes
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4581 Approvals: LibreOffice gerrit bot: Verified Fridrich Strba: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4581 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I189fe3635f94fdd6b91bd7930c7abf02e70368aa Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Tor Lillqvist Gerrit-Reviewer: Fridrich Strba Gerrit-Reviewer: LibreOffice gerrit bot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/source
sd/source/ui/view/drtxtob1.cxx | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
New commits:
commit 335891b6b20a90734e2af8bddf9ba535cc3a8e93
Author: Faisal M. Al-Otaibi
Date: Fri Jun 28 10:54:55 2013 +0200
fix crash when use increase font on table in impress
Change-Id: Id6c8cac4543d97657cb66b979f5dc4b5f903473a
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 572fbed..6ad4cf1 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -328,15 +328,17 @@ void TextObjectBar::Execute( SfxRequest &rReq )
if( pFontList )
{
FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV,
pFontList, mpView );
+if( pOLV )
+{
+SfxItemSet aSet( pOLV->GetEditView().GetAttribs() );
+SfxItemSet aNewAttrs
(pOLV->GetEditView().GetEmptyItemSet() );
-SfxItemSet aSet( pOLV->GetEditView().GetAttribs() );
-SfxItemSet aNewAttrs (pOLV->GetEditView().GetEmptyItemSet() );
-
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
-aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ),
EE_CHAR_FONTHEIGHT );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ),
EE_CHAR_FONTHEIGHT_CJK );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ),
EE_CHAR_FONTHEIGHT_CTL );
-mpView->SetAttributes( aNewAttrs );
+mpView->SetAttributes( aNewAttrs );
+}
Invalidate();
// to refresh preview (in outline mode), slot has to be
invalidated:
mpViewShell->GetViewFrame()->GetBindings().Invalidate(
SID_PREVIEW_STATE, sal_True, sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/oox oox/source
include/oox/core/fragmenthandler2.hxx|2 ++
oox/source/shape/LockedCanvasContext.cxx | 16 ++--
oox/source/shape/LockedCanvasContext.hxx |8
oox/source/shape/ShapeContextHandler.cxx |2 +-
4 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit bc8f89931ab4cc0537e7710b6bc375c844ba6e68
Author: Tor Lillqvist
Date: Thu Jun 20 20:30:11 2013 +0300
Also LockedCanvasContext needs to be a ContextHandler2 now then
Change-Id: Idcc55370efbcd85f9f7142803e4cb61f3742e7fc
Reviewed-on: https://gerrit.libreoffice.org/4579
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/include/oox/core/fragmenthandler2.hxx
b/include/oox/core/fragmenthandler2.hxx
index 5f2e8b6..6f0822d 100644
--- a/include/oox/core/fragmenthandler2.hxx
+++ b/include/oox/core/fragmenthandler2.hxx
@@ -111,6 +111,8 @@ public:
virtual voidfinalizeImport();
};
+typedef ::rtl::Reference< FragmentHandler2 > FragmentHandler2Ref;
+
//
} // namespace core
diff --git a/oox/source/shape/LockedCanvasContext.cxx
b/oox/source/shape/LockedCanvasContext.cxx
index 0f1e9b4..2c9c92e 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -14,8 +14,8 @@ using namespace com::sun::star;
namespace oox { namespace shape {
-LockedCanvasContext::LockedCanvasContext( ContextHandler& rParent )
-: ContextHandler( rParent )
+LockedCanvasContext::LockedCanvasContext( ContextHandler2Helper& rParent )
+: ContextHandler2( rParent )
{
}
@@ -28,10 +28,8 @@ oox::drawingml::ShapePtr LockedCanvasContext::getShape()
return mpShape;
}
-uno::Reference< xml::sax::XFastContextHandler >
LockedCanvasContext::createFastChildContext( sal_Int32 aElementToken, const
uno::Reference< xml::sax::XFastAttributeList >& /*xAttribs*/ ) throw
(xml::sax::SAXException, uno::RuntimeException)
+::oox::core::ContextHandlerRef LockedCanvasContext::onCreateContext( sal_Int32
aElementToken, const ::oox::AttributeList& /*rAttribs*/ )
{
-uno::Reference< xml::sax::XFastContextHandler > xRet;
-
switch( getBaseToken( aElementToken ) )
{
case XML_lockedCanvas:
@@ -45,22 +43,20 @@ uno::Reference< xml::sax::XFastContextHandler >
LockedCanvasContext::createFastC
oox::drawingml::ShapePtr pMasterShape;
mpShape.reset(new
oox::drawingml::Shape("com.sun.star.drawing.CustomShape"));
mpShape->setLockedCanvas(true);
-xRet = new oox::drawingml::ShapeContext( *this, pMasterShape,
mpShape );
+return new oox::drawingml::ShapeContext( *this, pMasterShape,
mpShape );
}
-break;
case XML_grpSp:
{
oox::drawingml::ShapePtr pMasterShape;
mpShape.reset(new
oox::drawingml::Shape("com.sun.star.drawing.GroupShape"));
mpShape->setLockedCanvas(true);
-xRet = new oox::drawingml::ShapeGroupContext( *this, pMasterShape,
mpShape );
+return new oox::drawingml::ShapeGroupContext( *this, pMasterShape,
mpShape );
}
-break;
default:
SAL_WARN("oox", "LockedCanvasContext::createFastChildContext:
unhandled element:" << getBaseToken(aElementToken));
break;
}
-return xRet;
+return 0;
}
} }
diff --git a/oox/source/shape/LockedCanvasContext.hxx
b/oox/source/shape/LockedCanvasContext.hxx
index c93d49d..e3ea631 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -10,19 +10,19 @@
#ifndef OOX_SHAPE_LOCKEDCANVASCONTEXT
#define OOX_SHAPE_LOCKEDCANVASCONTEXT
-#include "oox/core/contexthandler.hxx"
+#include "oox/core/contexthandler2.hxx"
#include "oox/drawingml/shape.hxx"
namespace oox { namespace shape {
/// Locked canvas is kind of a container for drawingml shapes: it can even
contain group shapes.
-class LockedCanvasContext : public oox::core::ContextHandler
+class LockedCanvasContext : public oox::core::ContextHandler2
{
public:
-LockedCanvasContext( oox::core::ContextHandler& rParent );
+LockedCanvasContext( oox::core::ContextHandler2Helper& rParent );
virtual ~LockedCanvasContext();
-virtual com::sun::star::uno::Reference<
com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext( sal_Int32 Element, const
com::sun::star::uno::Reference< com::sun::star::xml::sax::XFastAttributeList >&
Attribs ) throw (com::sun::star::xml::sax::SAXException,
com::sun::star::uno::RuntimeException);
+virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 Element,
const ::oox::AttributeList& rAttribs ) SAL_OVERRIDE;
oox::drawingml::ShapePtr getShape();
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index 1208af5..179c10a 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeC
[Libreoffice-commits] core.git: include/oox oox/source sc/source
include/oox/drawingml/connectorshapecontext.hxx |2
include/oox/drawingml/graphicshapecontext.hxx | 10 +-
include/oox/drawingml/shapecontext.hxx|6 -
include/oox/drawingml/shapegroupcontext.hxx |4
include/oox/drawingml/table/tablecontext.hxx |2
include/oox/ppt/pptgraphicshapecontext.hxx|2
include/oox/ppt/pptshapecontext.hxx |2
include/oox/ppt/pptshapegroupcontext.hxx |2
oox/source/drawingml/connectorshapecontext.cxx|2
oox/source/drawingml/diagram/constraintlistcontext.cxx|6 -
oox/source/drawingml/diagram/constraintlistcontext.hxx|6 -
oox/source/drawingml/diagram/diagramdefinitioncontext.cxx | 14 +--
oox/source/drawingml/diagram/diagramdefinitioncontext.hxx |6 -
oox/source/drawingml/diagram/diagramfragmenthandler.cxx |4
oox/source/drawingml/diagram/diagramfragmenthandler.hxx |2
oox/source/drawingml/diagram/layoutnodecontext.cxx| 61 ++
oox/source/drawingml/diagram/layoutnodecontext.hxx|6 -
oox/source/drawingml/graphicshapecontext.cxx | 10 +-
oox/source/drawingml/shapecontext.cxx |4
oox/source/drawingml/shapegroupcontext.cxx|4
oox/source/drawingml/table/tablecontext.cxx |2
oox/source/ppt/extdrawingfragmenthandler.cxx |2
oox/source/ppt/extdrawingfragmenthandler.hxx |3
oox/source/ppt/pptgraphicshapecontext.cxx |2
oox/source/ppt/pptshapecontext.cxx|2
oox/source/ppt/pptshapegroupcontext.cxx |2
oox/source/shape/ShapeContextHandler.cxx |4
oox/source/shape/ShapeContextHandler.hxx |6 -
oox/source/shape/ShapeDrawingFragmentHandler.cxx |2
oox/source/shape/ShapeDrawingFragmentHandler.hxx |4
sc/source/filter/inc/drawingfragment.hxx |4
sc/source/filter/oox/drawingfragment.cxx |4
32 files changed, 95 insertions(+), 97 deletions(-)
New commits:
commit 32ce3c6b0a945078868fb2ae35c9260e4e4c3649
Author: Tor Lillqvist
Date: Thu Jun 13 22:44:43 2013 +0300
More OOXML Markup Compatibility and Extensibility (MCE) support
Change many classes in oox to be based on ContextHandler2 instead of
ContextHandler. That supposedly adds MCE support.
This is a minimal initial effort. It compiles and links but doesn't work
(CppunitTest_chart2_export fails). Follow-up coming...
Change-Id: If89117abd48cfead468633fd7fce1ea785f6f420
Reviewed-on: https://gerrit.libreoffice.org/4577
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/include/oox/drawingml/connectorshapecontext.hxx
b/include/oox/drawingml/connectorshapecontext.hxx
index 48a03ae..e320147 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -29,7 +29,7 @@ namespace oox { namespace drawingml {
class OOX_DLLPUBLIC ConnectorShapeContext : public ShapeContext
{
public:
-ConnectorShapeContext( ::oox::core::ContextHandler& rParent, ShapePtr
pMasterShapePtr, ShapePtr pGroupShapePtr );
+ConnectorShapeContext( ::oox::core::ContextHandler2Helper& rParent,
ShapePtr pMasterShapePtr, ShapePtr pGroupShapePtr );
virtual ~ConnectorShapeContext();
virtual ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext( ::sal_Int32 Element, const
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException);
};
diff --git a/include/oox/drawingml/graphicshapecontext.hxx
b/include/oox/drawingml/graphicshapecontext.hxx
index c5984d5..8d85fd0 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace drawingml {
class OOX_DLLPUBLIC GraphicShapeContext : public ShapeContext
{
public:
-GraphicShapeContext( ::oox::core::ContextHandler& rParent, ShapePtr
pMasterShapePtr, ShapePtr pShapePtr );
+GraphicShapeContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr
pMasterShapePtr, ShapePtr pShapePtr );
virtual ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastContextHandler > SAL_CALL
createFastChildContext( ::sal_Int32 Element, const
::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XFastAttributeList >& Attribs ) throw
(::com::sun::star::xml::sax::SAXException,
::com::sun::star::uno::RuntimeException);
@@ -42,7 +42,7 @@ public:
class OOX_DLLPUBLIC GraphicalObjectFrameContext : public ShapeContext
{
public:
-GraphicalObjectFrameContext( ::oox::
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/qa
sc/qa/unit/data/xls/border.xls |binary
sc/qa/unit/data/xlsx/border.xlsx |binary
sc/qa/unit/subsequent_filters-test.cxx | 25 ++---
3 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 74e313801cf5e30c5dcbaa607904d7441b6dff4b
Author: Noel Power
Date: Tue Jun 25 10:28:27 2013 +0100
unit test for commit:1680a8cd4f4393ec15c4f85cb63b6654117d56d1 (fdo#56960)
expand the existing borders import check to cater for xlsx ( and
testing for fine/hair border styles )
Change-Id: Ic5c3cd46e0049dbce9997f0881c4d98e0d64e00c
(cherry picked from commit 69dcacedaccd1d698a54eed615ee8739747bc975)
Reviewed-on: https://gerrit.libreoffice.org/4503
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sc/qa/unit/data/xls/border.xls b/sc/qa/unit/data/xls/border.xls
index b314f7d..876839b 100644
Binary files a/sc/qa/unit/data/xls/border.xls and
b/sc/qa/unit/data/xls/border.xls differ
diff --git a/sc/qa/unit/data/xlsx/border.xlsx b/sc/qa/unit/data/xlsx/border.xlsx
new file mode 100755
index 000..e33c083
Binary files /dev/null and b/sc/qa/unit/data/xlsx/border.xlsx differ
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 6ec36e2..367fd42 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -95,6 +95,7 @@ public:
void testMatrixXLS();
void testBorderODS();
void testBorderXLS();
+void testBorderXLSX();
void testBordersOoo33();
void testBugFixesODS();
void testBugFixesXLS();
@@ -154,6 +155,7 @@ public:
CPPUNIT_TEST(testMatrixXLS);
CPPUNIT_TEST(testBorderODS);
CPPUNIT_TEST(testBorderXLS);
+CPPUNIT_TEST(testBorderXLSX);
CPPUNIT_TEST(testBordersOoo33);
CPPUNIT_TEST(testBugFixesODS);
CPPUNIT_TEST(testBugFixesXLS);
@@ -202,7 +204,7 @@ public:
private:
void testPassword_Impl(const OUString& rFileNameBase);
-
+void testBorderImpl( sal_uLong nFormatType );
uno::Reference m_xCalcComponent;
};
@@ -744,9 +746,9 @@ void ScFiltersTest::testBorderODS()
xDocSh->DoClose();
}
-void ScFiltersTest::testBorderXLS()
+void ScFiltersTest::testBorderImpl( sal_uLong nFormatType )
{
-ScDocShellRef xDocSh = loadDoc("border.", XLS);
+ScDocShellRef xDocSh = loadDoc("border.", nFormatType );
CPPUNIT_ASSERT_MESSAGE("Failed to load border.xls", xDocSh.Is());
ScDocument* pDoc = xDocSh->GetDocument();
@@ -773,7 +775,24 @@ void ScFiltersTest::testBorderXLS()
CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(),
table::BorderLineStyle::SOLID);
CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),30L);
+
+pDoc->GetBorderLines( 7, 9, 0, &pLeft, &pTop, &pRight, &pBottom );
+CPPUNIT_ASSERT(pRight);
+CPPUNIT_ASSERT_EQUAL(pRight->GetBorderLineStyle(),
+table::BorderLineStyle::FINE_DASHED);
+CPPUNIT_ASSERT_EQUAL(pRight->GetWidth(),1L);
+}
+
+void ScFiltersTest::testBorderXLS()
+{
+testBorderImpl( XLS );
}
+
+void ScFiltersTest::testBorderXLSX()
+{
+testBorderImpl( XLSX );
+}
+
struct Border
{
sal_Int16 column;
___
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' - svx/source
svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e497a5620f3865cfcb07446692a6f1e12ff14370
Author: Noel Power
Date: Tue Jun 25 14:40:45 2013 +0100
fix text position for custom shapes with zoom != 100% fdo#59862
custom shapes that had text suffered from strange display at zoom
levels != 100%, this was because there was a bug in the code to
correct the textposition
Change-Id: I8d1817cc6be91b3e6379200eb21eb2966d3c2aa9
(cherry picked from commit 443c13e92c6f900a41e6e383684623ead3e088f5)
Reviewed-on: https://gerrit.libreoffice.org/4514
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
index 654ed86..7aa29cb 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx
@@ -46,9 +46,11 @@ namespace sdr
basegfx::B2DRange
ViewContactOfSdrObjCustomShape::getCorrectedTextBoundRect() const
{
-const Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect());
+Rectangle aObjectBound(GetCustomShapeObj().GetGeoRect());
+aObjectBound += GetCustomShapeObj().GetGridOffset();
Rectangle aTextBound(aObjectBound);
GetCustomShapeObj().GetTextBounds(aTextBound);
+aTextBound += GetCustomShapeObj().GetGridOffset();
basegfx::B2DRange aTextRange(aTextBound.Left(), aTextBound.Top(),
aTextBound.Right(), aTextBound.Bottom());
const basegfx::B2DRange aObjectRange(aObjectBound.Left(),
aObjectBound.Top(), aObjectBound.Right(), aObjectBound.Bottom());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
