[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 2 commits - solenv/gbuild sw/qa
solenv/gbuild/AllLangResTarget.mk|3 ++-
sw/qa/extras/inc/swmodeltestbase.hxx |2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
New commits:
commit aa990e919a021a8c8349b029a00c36be1fd0e112
Author: Miklos Vajna
Date: Sun Jun 16 11:13:30 2013 +0200
SwModelTestBase: fix for leaking temporary files
This alone pushes down the number of created /tmp/lu* from 527 to 2
after a single run. Regression from
9b53538a076a2370df975655c8579dfe09cff09b.
Change-Id: I5ea2e3da0b89223fb32469af3d59a2a3b246d00f
Helped-by: Markus Mohrhard
Signed-off-by: LuboÅ¡ LuÅák
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 3f0fab8..5963a1b 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -264,6 +264,8 @@ protected:
void load(const char* pDir, const char* pName, bool bCalcLayout = true)
{
+if (mxComponent.is())
+mxComponent->dispose();
// Output name early, so in the case of a hang, the name of the
hanging input file is visible.
fprintf(stderr, "%s,", pName);
m_nStartTime = osl_getGlobalTimer();
commit b5fc4b0ca32d97348df0c427852cb02c8b778be5
Author: Khaled Hosny
Date: Thu Jun 27 21:12:56 2013 +0200
Remove temporary files
No more gbuild.XX files filling /tmp
Change-Id: I2f3cd388ccd9a09bc72e40c0d43d845bc8e38cd7
Signed-off-by: LuboÅ¡ LuÅák
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 01c93f8..6d1b47d 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -229,7 +229,8 @@ $(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,$(3)) && \
- $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
+ $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
&& \
+ rm -f $${RESPONSEFILE}
endef
endif
___
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' - 8 commits - offapi/com sc/Module_sc.mk sc/qa sc/source translations
offapi/com/sun/star/accessibility/XAccessibleText.idl |2
offapi/com/sun/star/animations/XAnimateColor.idl|2
offapi/com/sun/star/awt/UnoControlButtonModel.idl |2
offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl |2
offapi/com/sun/star/awt/UnoControlDialogModel.idl |2
offapi/com/sun/star/awt/UnoControlImageControlModel.idl |2
offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl |2
offapi/com/sun/star/awt/UnoControlRoadmapModel.idl |2
offapi/com/sun/star/awt/XPopupMenu.idl | 10 ++--
offapi/com/sun/star/modules.idl |2
sc/Module_sc.mk |2
sc/qa/unit/data/xls/shared-formula.xls |binary
sc/qa/unit/data/xlsx/shared-formula.xlsx|binary
sc/qa/unit/filters-test.cxx | 36 ++
sc/qa/unit/subsequent_filters-test.cxx | 37 --
sc/qa/unit/ucalc.cxx| 40
sc/source/core/tool/formulagroup.cxx|2
sc/source/ui/optdlg/calcoptionsdlg.cxx |2
translations|2
19 files changed, 75 insertions(+), 74 deletions(-)
New commits:
commit 2578d3ab4991d14b1fe31cfaa18302a141579de9
Author: Kohei Yoshida
Date: Thu Jun 27 22:23:58 2013 -0400
Test loading of xls and xlsx with shared formulas.
To make sure I won't break this. And I moved the xlsx version of the
test from the slow check to the normal test, which gets run for the normal
build target.
Change-Id: Id65f79796b11c0ab039842f1c1c158e9af310757
diff --git a/sc/qa/unit/data/xls/shared-formula.xls
b/sc/qa/unit/data/xls/shared-formula.xls
new file mode 100644
index 000..a9be6b7
Binary files /dev/null and b/sc/qa/unit/data/xls/shared-formula.xls differ
diff --git a/sc/qa/unit/data/xlsx/shared-formula.xlsx
b/sc/qa/unit/data/xlsx/shared-formula.xlsx
index d1b4f52..64d0501 100644
Binary files a/sc/qa/unit/data/xlsx/shared-formula.xlsx and
b/sc/qa/unit/data/xlsx/shared-formula.xlsx differ
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index a024437..d72c29e 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -65,6 +65,8 @@ public:
void testContentXLSX();
void testContentLotus123();
void testContentDIF();
+void testSharedFormulaXLS();
+void testSharedFormulaXLSX();
#if TEST_BUG_FILES
//goes recursively through all files in this dir and tries to open them
void testDir(osl::Directory& rDir, sal_Int32 nType);
@@ -83,6 +85,8 @@ public:
CPPUNIT_TEST(testContentXLSX);
CPPUNIT_TEST(testContentLotus123);
CPPUNIT_TEST(testContentDIF);
+CPPUNIT_TEST(testSharedFormulaXLS);
+CPPUNIT_TEST(testSharedFormulaXLSX);
CPPUNIT_TEST(testLegacyCellAnchoredRotatedShape);
#if TEST_BUG_FILES
@@ -325,7 +329,39 @@ void ScFiltersTest::testContentDIF()
ScDocument* pDoc = xDocSh->GetDocument();
CPPUNIT_ASSERT(pDoc);
+xDocSh->DoClose();
+}
+
+void ScFiltersTest::testSharedFormulaXLS()
+{
+ScDocShellRef xDocSh = loadDoc("shared-formula.", XLS);
+ScDocument* pDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+xDocSh->DoHardRecalc(true);
+// Check the results of formula cells in the shared formula range.
+for (SCROW i = 1; i <= 18; ++i)
+{
+double fVal = pDoc->GetValue(ScAddress(1,i,0));
+double fCheck = i*10.0;
+CPPUNIT_ASSERT_EQUAL(fCheck, fVal);
+}
+xDocSh->DoClose();
+}
+void ScFiltersTest::testSharedFormulaXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("shared-formula.", XLSX);
+ScDocument* pDoc = xDocSh->GetDocument();
+CPPUNIT_ASSERT(pDoc);
+xDocSh->DoHardRecalc(true);
+// Check the results of formula cells in the shared formula range.
+for (SCROW i = 1; i <= 18; ++i)
+{
+double fVal = pDoc->GetValue(ScAddress(1,i,0));
+double fCheck = i*10.0;
+CPPUNIT_ASSERT_EQUAL(fCheck, fVal);
+}
+xDocSh->DoClose();
}
void impl_testLegacyCellAnchoredRotatedShape( ScDocument* pDoc, Rectangle&
aRect, ScDrawObjData& aAnchor, long TOLERANCE = 30 /* 30 hmm */ )
diff --git a/sc/qa/unit/subsequent_filters-test.cxx
b/sc/qa/unit/subsequent_filters-test.cxx
index 8861a9d..13c1bdd 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -114,7 +114,6 @@ public:
void testNewCondFormatXLSX();
//change this test file only in excel and not in calc
-void testSharedFormulaXLSX();
void testCellValueXLSX();
//misc tests unrelated to the import filters
@@ -168,7 +167,6 @@ public:
CPPUNIT_TEST(testRepeatedColumnsODS);
CPPUNIT_TEST(testDataValidityODS);
CPPUNIT_TEST(testBrokenQuotesCSV);
-CPPUNIT_TEST(testSharedFormulaXLSX);
CPPUNIT_TEST(testCel
[Libreoffice-commits] core.git: sc/Module_sc.mk
sc/Module_sc.mk |2 ++ 1 file changed, 2 insertions(+) New commits: commit e33844c30991488a3283787dadc2cd036d2679b9 Author: Kohei Yoshida Date: Thu Jun 27 20:11:14 2013 -0400 These test were removed by accident. Change-Id: I11ec1972c714b867f3b1be71a45b8e3d65cce656 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 74888f0..0b3970f 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -37,6 +37,8 @@ endif $(eval $(call gb_Module_add_check_targets,sc,\ CppunitTest_sc_ucalc \ +CppunitTest_sc_filters_test \ +CppunitTest_sc_rangelst_test \ )) $(eval $(call gb_Module_add_slowcheck_targets,sc, \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: solenv/gbuild
solenv/gbuild/AllLangResTarget.mk |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 10d6d5ae49622d3bda5ea8137eb2f66347a2753c
Author: Khaled Hosny
Date: Thu Jun 27 21:12:56 2013 +0200
Remove temporary files
No more gbuild.XX files filling /tmp
Change-Id: I2f3cd388ccd9a09bc72e40c0d43d845bc8e38cd7
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 0791f01..3ad5065 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -228,7 +228,8 @@ $(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(1)) && \
RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,$(3)) && \
- $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
+ $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
&& \
+ rm -f $${RESPONSEFILE}
endef
endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/qa
sc/qa/unit/ucalc.cxx | 40
1 file changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 4ba92ec1d565848c86c5e802b30f17862ad6505f
Author: Kohei Yoshida
Date: Thu Jun 27 18:38:06 2013 -0400
Specify type for cppunit macros.
Change-Id: Ia639be24af7dd480fbe45530673ff01b700de324
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index c66f3c0..be470b1 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6312,15 +6312,15 @@ void Test::testSharedFormulas()
m_pDoc->SetString(aPos, "=A11*2");
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(9, pFC->GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(2, pFC->GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_cast(9), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pFC->GetSharedLength());
aPos.SetRow(8); // B9
m_pDoc->SetString(aPos, "=A9*2");
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(8, pFC->GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(3, pFC->GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_cast(8), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(3), pFC->GetSharedLength());
aPos.SetRow(12); // B13
m_pDoc->SetString(aPos, "=A13*2");
@@ -6332,8 +6332,8 @@ void Test::testSharedFormulas()
m_pDoc->SetString(aPos, "=A12*2");
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(8, pFC->GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(5, pFC->GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_cast(8), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(5), pFC->GetSharedLength());
// Insert formulas to B15:B16.
aPos.SetRow(14); // B15
@@ -6342,16 +6342,16 @@ void Test::testSharedFormulas()
m_pDoc->SetString(aPos, "=A16*2");
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(14, pFC->GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(2, pFC->GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_cast(14), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(2), pFC->GetSharedLength());
// Insert a formula to B14, and B9:B16 should be shared.
aPos.SetRow(13); // B14
m_pDoc->SetString(aPos, "=A14*2");
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(8, pFC->GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(8, pFC->GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_cast(8), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(8), pFC->GetSharedLength());
// Insert an incompatible formula to B12, to split the shared range to
B9:B11 and B13:B16.
aPos.SetRow(11); // B12
@@ -6362,14 +6362,14 @@ void Test::testSharedFormulas()
aPos.SetRow(8); // B9
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(8, pFC->GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(3, pFC->GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_cast(8), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(3), pFC->GetSharedLength());
aPos.SetRow(12); // B13
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(12, pFC->GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(4, pFC->GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_cast(12), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(4), pFC->GetSharedLength());
// Extend B13:B16 to B13:B20.
aPos.SetRow(16); // B17
@@ -6382,8 +6382,8 @@ void Test::testSharedFormulas()
m_pDoc->SetString(aPos, "=A20*2");
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(12, pFC->GetSharedTopRow());
-CPPUNIT_ASSERT_EQUAL(8, pFC->GetSharedLength());
+CPPUNIT_ASSERT_EQUAL(static_cast(12), pFC->GetSharedTopRow());
+CPPUNIT_ASSERT_EQUAL(static_cast(8), pFC->GetSharedLength());
#if 0
// Insert empty rows at B16 to split B13:B20 into B13:B15 and B21:B25.
@@ -6392,14 +6392,14 @@ void Test::testSharedFormulas()
aPos.SetRow(12); // B13
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
-CPPUNIT_ASSERT_EQUAL(12, pF
[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/chart/AccessibleChartElement.idl |2 +- offapi/com/sun/star/sheet/AccessibleCell.idl |6 +++--- offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl |6 +++--- offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl |2 +- offapi/com/sun/star/sheet/AccessibleSpreadsheetDocumentView.idl |6 +++--- offapi/com/sun/star/sheet/AccessibleSpreadsheetPageView.idl |4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) New commits: commit c0a4f68fb2eb22c5ad12bce75ba41b3c5ac21329 Author: Julien Nabet Date: Thu Jun 27 23:32:45 2013 +0200 Fix some idl descriptions Change-Id: I86c6e4e439658818fce5328e6380a258292f2e9b diff --git a/offapi/com/sun/star/chart/AccessibleChartElement.idl b/offapi/com/sun/star/chart/AccessibleChartElement.idl index f6d732f..0ca36a2 100644 --- a/offapi/com/sun/star/chart/AccessibleChartElement.idl +++ b/offapi/com/sun/star/chart/AccessibleChartElement.idl @@ -101,7 +101,7 @@ service AccessibleChartElement ::com::sun::star::accessibility::AccessibleStateType::EDITABLE ::com::sun::star::accessibility::AccessibleStateType::ENABLED is always set.* - ::com::sun::star::accessibility::AccessibleStateType::MULTILINE + ::com::sun::star::accessibility::AccessibleStateType::MULTI_LINE is set for all titles. ::com::sun::star::accessibility::AccessibleStateType::OPAQUE is set for all elements that do have a transparency diff --git a/offapi/com/sun/star/sheet/AccessibleCell.idl b/offapi/com/sun/star/sheet/AccessibleCell.idl index fd5c4fe..24a841c 100644 --- a/offapi/com/sun/star/sheet/AccessibleCell.idl +++ b/offapi/com/sun/star/sheet/AccessibleCell.idl @@ -59,15 +59,15 @@ service AccessibleCell or the table is protected, otherwise it is true. ::com::sun::star::accessibility::AccessibleStateType::ENABLED is always true. - ::com::sun::star::accessibility::AccessibleStateType::MULTILINE + ::com::sun::star::accessibility::AccessibleStateType::MULTI_LINE is always true. - ::com::sun::star::accessibility::AccessibleStateType::MULTISELECTABLE + ::com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE is always true. ::com::sun::star::accessibility::AccessibleStateType::OPAQUE is false if the cell has no background color or graphic, otherwise it is true. - ::com::sun::star::accessibility::AccessibleStateType::RESIZEABLE + ::com::sun::star::accessibility::AccessibleStateType::RESIZABLE is false if the table is protected, otherwise is it true. ::com::sun::star::accessibility::AccessibleStateType::SELECTABLE diff --git a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl index d3d1f86..4362e36 100644 --- a/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl +++ b/offapi/com/sun/star/sheet/AccessiblePageHeaderFooterAreasView.idl @@ -76,16 +76,16 @@ service AccessiblePageHeaderFooterAreasView So it is left out of the list. ::com::sun::star::accessibility::AccessibleStateType::ENABLED is always true. - ::com::sun::star::accessibility::AccessibleStateType::MULTILINE + ::com::sun::star::accessibility::AccessibleStateType::MULTI_LINE makes no sense on a document and so it is left out of the list. - ::com::sun::star::accessibility::AccessibleStateType::MULTISELECTABLE + ::com::sun::star::accessibility::AccessibleStateType::MULTI_SELECTABLE is always false, because in a page preview a selection is not possible. So it is left out of the list. ::com::sun::star::accessibility::AccessibleStateType::OPAQUE is always true. - ::com::sun::star::accessibility::AccessibleStateType::RESIZEABLE + ::com::sun::star::accessibility::AccessibleStateType::RESIZABLE is always false, because you can resize the window of the page preview, but not the page preview itself. So it is left out of the diff --git a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl index bf23bd1..f260873 100644 --- a/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl +++ b/offapi/com/sun/star/sheet/AccessibleSpreadsheet.idl @@ -84,7 +84,7 @@ service Acce
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/formulagroup.cxx |2 +-
sc/source/ui/optdlg/calcoptionsdlg.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1adf99bf2320a29694fe300749f685d3893ad179
Author: Kohei Yoshida
Date: Thu Jun 27 17:29:16 2013 -0400
Revert "These should be ifdef, per compiler warnings."
This reverts commit fcf4a2ea98c59c4d9d95c4c3b437aa02f414acd3.
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index 436..f9d251b 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -111,7 +111,7 @@ FormulaGroupInterpreter
*FormulaGroupInterpreter::getStatic()
if ( !msInstance )
{
-#ifdef HAVE_FEATURE_OPENCL
+#if HAVE_FEATURE_OPENCL
if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
msInstance = sc::opencl::createFormulaGroupInterpreter();
#endif
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 26434bf..11ec4cb 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -199,7 +199,7 @@ void ScCalcOptionsDialog::FillOptionsList()
}
pModel->Insert(createBoolItem(maCaptionEmptyStringAsZero,maConfig.mbEmptyStringAsZero));
-#ifdef HAVE_FEATURE_OPENCL
+#if HAVE_FEATURE_OPENCL
pModel->Insert(createBoolItem(maCaptionOpenCLEnabled,maConfig.mbOpenCLEnabled));
#endif
___
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/awt/XPopupMenu.idl | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 51a777926c4bac73f8ee68c1ddc26de40497fa73 Author: Julien Nabet Date: Thu Jun 27 23:15:58 2013 +0200 Fix some idl descriptions Change-Id: Iaef8cb2dc86422d4f8cdaaf6d3aa9392e06caf4a diff --git a/offapi/com/sun/star/awt/XPopupMenu.idl b/offapi/com/sun/star/awt/XPopupMenu.idl index e39a1f2..57b1c0a 100644 --- a/offapi/com/sun/star/awt/XPopupMenu.idl +++ b/offapi/com/sun/star/awt/XPopupMenu.idl @@ -102,7 +102,7 @@ published interface XPopupMenu: XMenu /** queries if the PopupMenu is being. Returns `TRUE` only if the PopupMenu is being executed -as a result of invoking XPopupMenu::execute(); that is, +as a result of invoking XPopupMenu::execute(); that is, for a PopupMenu activated by a MenuBar item, this methods returns `FALSE`. @@ -110,15 +110,15 @@ published interface XPopupMenu: XMenu `TRUE` if the PopupMenu is being executed, `FALSE` otherwise. -@see XPopupMenu::execute() +@see XPopupMenu::execute() */ boolean isInExecute(); /** ends the execution of the PopupMenu. -XPopupMenu::execute() +com::sun::star::awt::XPopupMenu::execute() will then return 0. -@see XPopupMenu::execute() +@see com::sun::star::awt::XPopupMenu::execute() */ void endExecute(); @@ -143,7 +143,7 @@ published interface XPopupMenu: XMenu The KeyEvent is only used as a container to transport the shortcut information, so that in this case -EventObject::Source is . +::com::sun::star::lang::EventObject::Source is NULL. @param nItemId specifies the menu item identifier for which the KeyEvent should be retrieved. ___ 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/accessibility/XAccessibleText.idl |2 +- offapi/com/sun/star/animations/XAnimateColor.idl|2 +- offapi/com/sun/star/awt/UnoControlButtonModel.idl |2 +- offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl |2 +- offapi/com/sun/star/awt/UnoControlDialogModel.idl |2 +- offapi/com/sun/star/awt/UnoControlImageControlModel.idl |2 +- offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl |2 +- offapi/com/sun/star/awt/UnoControlRoadmapModel.idl |2 +- offapi/com/sun/star/modules.idl |2 +- 9 files changed, 9 insertions(+), 9 deletions(-) New commits: commit 8872ab76700c9402b472feb71783fa8f5308f6d5 Author: Julien Nabet Date: Thu Jun 27 23:10:33 2013 +0200 Fix some idl descriptions Change-Id: I49a767e9212a859db7856158141a38e6f2974e56 diff --git a/offapi/com/sun/star/accessibility/XAccessibleText.idl b/offapi/com/sun/star/accessibility/XAccessibleText.idl index 5dad20f..ec1b61b 100644 --- a/offapi/com/sun/star/accessibility/XAccessibleText.idl +++ b/offapi/com/sun/star/accessibility/XAccessibleText.idl @@ -450,7 +450,7 @@ interface XAccessibleText : ::com::sun::star::uno::XInterface @throws ::com::sun::star::lang::IndexOutOfBoundsException if the index is invalid -@throws ::com::sun::star::lang::InvalidArgumentException +@throws ::com::sun::star::lang::IllegalArgumentException if the given text type is not valid. */ TextSegment getTextBehindIndex([in] long nIndex, [in] short nTextType) diff --git a/offapi/com/sun/star/animations/XAnimateColor.idl b/offapi/com/sun/star/animations/XAnimateColor.idl index 5bf3084..d02b65f1 100644 --- a/offapi/com/sun/star/animations/XAnimateColor.idl +++ b/offapi/com/sun/star/animations/XAnimateColor.idl @@ -45,7 +45,7 @@ interface XAnimateColor : XAnimate [attribute] short ColorInterpolation; /** defines the direction which is used to perform the interpolation -inside the color space defined with #ColorSpace. +inside the color space defined with #ColorInterpolation. Values could be `TRUE` for clockwise and `FALSE` for counterclockwise. diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl index 9c6f6f2..3a5f01c 100644 --- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl +++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl @@ -126,7 +126,7 @@ published service UnoControlButtonModel /** specifies a graphic to be displayed at the button -If this property is present, it interacts with the #ImageURLin the +If this property is present, it interacts with the #ImageURL in the following way: If #ImageURL is set, #Graphic will be reset to an object as loaded from the given image URL, or `NULL` if #ImageURL diff --git a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl index f80ec5b..dbec167 100644 --- a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl +++ b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl @@ -101,7 +101,7 @@ published service UnoControlCheckBoxModel /** specifies a graphic to be displayed besides the label of the control -If this property is present, it interacts with the #ImageURLin the +If this property is present, it interacts with the #ImageURL in the following way: If #ImageURL is set, #Graphic will be reset to an object as loaded from the given image URL, or `NULL` if #ImageURL diff --git a/offapi/com/sun/star/awt/UnoControlDialogModel.idl b/offapi/com/sun/star/awt/UnoControlDialogModel.idl index 0d4cefd..424230b 100644 --- a/offapi/com/sun/star/awt/UnoControlDialogModel.idl +++ b/offapi/com/sun/star/awt/UnoControlDialogModel.idl @@ -132,7 +132,7 @@ published service UnoControlDialogModel /** specifies a graphic to be displayed as a background image -If this property is present, it interacts with the #ImageURLin the +If this property is present, it interacts with the #ImageURL in the following way: If #ImageURL is set, #Graphic will be reset to an object as loaded from the given image URL, or `NULL` if #ImageURL diff --git a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl index 76f5e7d..764f057 100644 --- a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl +++ b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl @@ -84,7 +84,7 @@ published service UnoControlImageControlModel /** specifies a graphic to be displayed on the control -If this property is present, it interacts with the #ImageURLin the +If this property is present, it interacts with the #ImageURL in the following way: If #ImageURL is set, #Graphic wil
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/documen2.cxx |2 -- 1 file changed, 2 deletions(-) New commits: commit 431bd5a6b739aaa280d113b58088876d0795d4d8 Author: Kohei Yoshida Date: Thu Jun 27 16:47:17 2013 -0400 We don't need these header includes. Change-Id: Ia2f7226fa3c7dc5ac98bd23833e67d7262cd8b9b diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 6244eac..b1b3160 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -86,8 +86,6 @@ #include "macromgr.hxx" #include "formulacell.hxx" #include "clipcontext.hxx" -#include "interpre.hxx" -#include "formulagroup.hxx" using namespace com::sun::star; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/formulagroup.cxx |2 +-
sc/source/ui/optdlg/calcoptionsdlg.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit fcf4a2ea98c59c4d9d95c4c3b437aa02f414acd3
Author: Kohei Yoshida
Date: Thu Jun 27 16:44:24 2013 -0400
These should be ifdef, per compiler warnings.
Change-Id: I302d9ca63bc289fce99bf3e64d9aa3fcbcabf694
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index f9d251b..436 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -111,7 +111,7 @@ FormulaGroupInterpreter
*FormulaGroupInterpreter::getStatic()
if ( !msInstance )
{
-#if HAVE_FEATURE_OPENCL
+#ifdef HAVE_FEATURE_OPENCL
if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
msInstance = sc::opencl::createFormulaGroupInterpreter();
#endif
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 11ec4cb..26434bf 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -199,7 +199,7 @@ void ScCalcOptionsDialog::FillOptionsList()
}
pModel->Insert(createBoolItem(maCaptionEmptyStringAsZero,maConfig.mbEmptyStringAsZero));
-#if HAVE_FEATURE_OPENCL
+#ifdef HAVE_FEATURE_OPENCL
pModel->Insert(createBoolItem(maCaptionOpenCLEnabled,maConfig.mbOpenCLEnabled));
#endif
___
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/tool/formulagroup.cxx |2 +-
sc/source/ui/optdlg/calcoptionsdlg.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1f5c360c8464d43d0fd0a4816af723bfd001841d
Author: Kohei Yoshida
Date: Thu Jun 27 16:44:24 2013 -0400
These should be ifdef, per compiler warnings.
Change-Id: I302d9ca63bc289fce99bf3e64d9aa3fcbcabf694
diff --git a/sc/source/core/tool/formulagroup.cxx
b/sc/source/core/tool/formulagroup.cxx
index f9d251b..436 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -111,7 +111,7 @@ FormulaGroupInterpreter
*FormulaGroupInterpreter::getStatic()
if ( !msInstance )
{
-#if HAVE_FEATURE_OPENCL
+#ifdef HAVE_FEATURE_OPENCL
if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
msInstance = sc::opencl::createFormulaGroupInterpreter();
#endif
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx
b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 11ec4cb..26434bf 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -199,7 +199,7 @@ void ScCalcOptionsDialog::FillOptionsList()
}
pModel->Insert(createBoolItem(maCaptionEmptyStringAsZero,maConfig.mbEmptyStringAsZero));
-#if HAVE_FEATURE_OPENCL
+#ifdef HAVE_FEATURE_OPENCL
pModel->Insert(createBoolItem(maCaptionOpenCLEnabled,maConfig.mbOpenCLEnabled));
#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bb0477558433b964003d83ac2f6804c274a5b0f7 Author: Andras Timar Date: Thu Jun 27 21:37:38 2013 +0200 Updated core Project: translations 05ab1fefb5b317f213960a06fcab7dc1afdcb7e0 diff --git a/translations b/translations index 379fd93..05ab1fe 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 379fd9390159208a5c453ee611d1425537bb91b8 +Subproject commit 05ab1fefb5b317f213960a06fcab7dc1afdcb7e0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: source/sl
source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po | 4 source/sl/helpcontent2/source/text/shared/02.po| 12 - source/sl/helpcontent2/source/text/shared/guide.po | 4 source/sl/helpcontent2/source/text/shared/optionen.po | 12 - source/sl/sd/source/ui/app.po | 6 source/sl/svx/source/dialog.po | 92 +- 6 files changed, 110 insertions(+), 20 deletions(-) New commits: commit 05ab1fefb5b317f213960a06fcab7dc1afdcb7e0 Author: Andras Timar Date: Thu Jun 27 21:37:38 2013 +0200 sync libreoffice-4-1 and master Change-Id: Ice8bb498f8a6bee4bb6b5c460ac3e0a0deaecb92 diff --git a/source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po b/source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po index a92089d..bc30a99 100644 --- a/source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po +++ b/source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.0\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2013-06-16 22:46+0200\n" +"POT-Creation-Date: 2013-06-22 14:14+0200\n" "PO-Revision-Date: 2013-06-17 01:35+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" diff --git a/source/sl/helpcontent2/source/text/shared/02.po b/source/sl/helpcontent2/source/text/shared/02.po index bc7a17e..29198b4 100644 --- a/source/sl/helpcontent2/source/text/shared/02.po +++ b/source/sl/helpcontent2/source/text/shared/02.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.1\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2013-06-13 17:25+0200\n" -"PO-Revision-Date: 2013-06-10 13:05+0200\n" +"POT-Creation-Date: 2013-06-22 14:15+0200\n" +"PO-Revision-Date: 2013-06-23 00:14+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" +"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" @@ -49,7 +49,7 @@ msgctxt "" "2\n" "help.text" msgid "Click the Print File Directly icon to print the active document with the current default print settings. These can be found in the Printer Setup dialog, which you can call with the Printer Settings menu command." -msgstr " Kliknite ikono Neposredni natis datoteke, da natisnete aktivni dokument s trenutnimi privzetimi nastavitvami tiskalnika. Te nastavitve najdete v pogovornem oknu Nastavitev tiskalnika, v katerem lahko prikliÄete menijski ukaz Nastavitve tiskalnika." +msgstr " Kliknite ikono Neposredno natisni datoteko, da natisnete aktivni dokument s trenutnimi privzetimi nastavitvami tiskalnika. Te nastavitve najdete v pogovornem oknu Nastavitev tiskalnika, v katerem lahko prikliÄete menijski ukaz Nastavitve tiskalnika." #: 0111.xhp msgctxt "" @@ -18905,8 +18905,8 @@ msgctxt "" "querypropdlg.xhp\n" "par_id3152820\n" "help.text" -msgid "In the Query Properties dialog, set properties belong to SQL Query, that you need your current task." -msgstr "V pogovornem oknu Lastnosti poizvedbe nastavite lastnosti poizvedbe SQL, ki ustrezajo trenutni nalogi." +msgid "In the Query Properties dialog you can set two properties of the SQL Query, i.e. whether to return distinct values, and whether to limit the result set." +msgstr "V pogovornem oknu Lastnosti poizvedbe nastavite dve lastnosti poizvedbe SQL, t.j. ali naj poizvedba vrne le razliÄne vrednosti in ali naj bo nabor rezultatov Å¡tevilÄno omejen." #: querypropdlg.xhp msgctxt "" diff --git a/source/sl/helpcontent2/source/text/shared/guide.po b/source/sl/helpcontent2/source/text/shared/guide.po index 5c85838..e6961d2 100644 --- a/source/sl/helpcontent2/source/text/shared/guide.po +++ b/source/sl/helpcontent2/source/text/shared/guide.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.1\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2013-06-16 22:46+0200\n" +"POT-Creation-Date: 2013-06-22 14:15+02
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 109a4cf34547b875832f888054625677ee282268 Author: Andras Timar Date: Fri Jun 21 21:47:35 2013 +0200 Updated core Project: translations 379fd9390159208a5c453ee611d1425537bb91b8 diff --git a/translations b/translations index 56f4367..379fd93 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 56f43677e90d28489fa3dbbd5bc5f35a5483e354 +Subproject commit 379fd9390159208a5c453ee611d1425537bb91b8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: [Libreoffice-qa] BSA Versions - Update
On Thu, Jun 27, 2013 at 12:44 PM, Bjoern Michaelsen < bjoern.michael...@canonical.com> wrote: > Hi, > > On Thu, Jun 27, 2013 at 11:57:44AM -0700, Joel Madero wrote: > > I have added Bjoern to this as he's the one who might be impacted most > > because of the Ubuntu issue. > > Can we maybe make the wording more explicit e.g. "reached EOL at TDF"(*)? > That > makes it easier to dispell urban myths that its not supported elsewhere. > Same > for RHEL which AFAIK has the endless joy of supporting 3.4 on one of their > releases. > Where would this wording go? I think that's good to let people know but trying to figure out where to put it as the list versions are all pretty short. A tooltip might be useful, any thoughts here Robinson? We were talking about this quite a bit earlier. Best, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/mtvelements.hxx |2 +-
sc/source/core/data/column2.cxx |6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 1ebf50a6fc3f444fe04ff53dc7eb68090821d640
Author: Kohei Yoshida
Date: Thu Jun 27 15:38:34 2013 -0400
Turn off column debug and remove warnings.
Change-Id: Ic7dd79c1e420e87dcaff4126d60763ff8cbe9344
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx
index 2c58997..0ebf8be 100644
--- a/sc/inc/mtvelements.hxx
+++ b/sc/inc/mtvelements.hxx
@@ -15,7 +15,7 @@
#include "svl/broadcast.hxx"
#include "editeng/editobj.hxx"
-#define DEBUG_COLUMN_STORAGE 1
+#define DEBUG_COLUMN_STORAGE 0
#if DEBUG_COLUMN_STORAGE
#ifdef NDEBUG
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 7205672..3704c6d 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -1532,15 +1532,15 @@ void ScColumn::RegroupFormulaCells()
{
}
-void ScColumn::RegroupFormulaCells( SCROW nRow )
+void ScColumn::RegroupFormulaCells( SCROW /*nRow*/ )
{
}
-void ScColumn::RegroupFormulaCells( SCROW nRow1, SCROW nRow2 )
+void ScColumn::RegroupFormulaCells( SCROW /*nRow1*/, SCROW /*nRow2*/ )
{
}
-void ScColumn::FormulaCellsUndecided( SCROW nRow1, SCROW nRow2 )
+void ScColumn::FormulaCellsUndecided( SCROW /*nRow1*/, SCROW /*nRow2*/ )
{
}
___
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/formulacell.cxx | 18 +-
sc/source/core/tool/compiler.cxx| 24
2 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit d2ac8eef9e437a409efd7ca79a2b0f3cadecade7
Author: Kohei Yoshida
Date: Thu Jun 27 15:12:10 2013 -0400
Rename a variable to something more meaningful.
Change-Id: I860e5301e3fec3f06f318b28787f71b63dbaf0ab
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 224bbea..e432d79 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2100,7 +2100,7 @@ bool ScFormulaCell::UpdateReference(
if (pUndoDoc)
pOldCode.reset(pCode->Clone());
-ScRangeData* pRangeData = NULL;
+ScRangeData* pSharedCode = NULL;
bool bValChanged = false;
bool bRangeModified = false;// any range, not only shared formula
bool bRefSizeChanged = false;
@@ -2110,7 +2110,7 @@ bool ScFormulaCell::UpdateReference(
// Update cell or range references.
ScCompiler aComp(pDocument, aPos, *pCode);
aComp.SetGrammar(pDocument->GetGrammar());
-pRangeData = aComp.UpdateReference(eUpdateRefMode, aOldPos, rRange,
+pSharedCode = aComp.UpdateReference(eUpdateRefMode, aOldPos, rRange,
nDx, nDy, nDz,
bValChanged, bRefSizeChanged);
bRangeModified = aComp.HasModifiedRange();
@@ -2215,7 +2215,7 @@ bool ScFormulaCell::UpdateReference(
bHasRelName = HasRelNameReference();
// Reference changed and new listening needed?
// Except in Insert/Delete without specialties.
-bNewListening = (bRangeModified || pRangeData || bColRowNameCompile
+bNewListening = (bRangeModified || pSharedCode || bColRowNameCompile
|| (bValChanged && (eUpdateRefMode != URM_INSDEL ||
bInDeleteUndo || bRefSizeChanged)) ||
(bHasRelName && eUpdateRefMode != URM_COPY))
@@ -2231,14 +2231,14 @@ bool ScFormulaCell::UpdateReference(
bool bNeedDirty = false;
// NeedDirty for changes except for Copy and Move/Insert without RelNames
-if ( bRangeModified || pRangeData || bColRowNameCompile ||
+if ( bRangeModified || pSharedCode || bColRowNameCompile ||
(bValChanged && eUpdateRefMode != URM_COPY &&
(eUpdateRefMode != URM_MOVE || bHasRelName) &&
(!bIsInsert || bHasRelName || bInDeleteUndo ||
bRefSizeChanged)) || bOnRefMove)
bNeedDirty = true;
-if (pUndoDoc && (bValChanged || pRangeData || bOnRefMove))
+if (pUndoDoc && (bValChanged || pSharedCode || bOnRefMove))
{
// Copy the cell to aUndoPos, which is its current position in the
document,
// so this works when UpdateReference is called before moving the cells
@@ -2258,13 +2258,13 @@ bool ScFormulaCell::UpdateReference(
bValChanged = false;
-if ( pRangeData )
+if ( pSharedCode )
{ // Replace shared formula with own formula
pDocument->RemoveFromFormulaTree( this ); // update formula count
delete pCode;
-pCode = pRangeData->GetCode()->Clone();
+pCode = pSharedCode->GetCode()->Clone();
// #i18937# #i110008# call MoveRelWrap, but with the old position
-ScCompiler::MoveRelWrap(*pCode, pDocument, aOldPos,
pRangeData->GetMaxCol(), pRangeData->GetMaxRow());
+ScCompiler::MoveRelWrap(*pCode, pDocument, aOldPos,
pSharedCode->GetMaxCol(), pSharedCode->GetMaxRow());
ScCompiler aComp2(pDocument, aPos, *pCode);
aComp2.SetGrammar(pDocument->GetGrammar());
aComp2.UpdateSharedFormulaReference( eUpdateRefMode, aOldPos, rRange,
@@ -2297,7 +2297,7 @@ bool ScFormulaCell::UpdateReference(
}
}
-if ( bNeedDirty && (!(eUpdateRefMode == URM_INSDEL && bHasRelName) ||
pRangeData) )
+if ( bNeedDirty && (!(eUpdateRefMode == URM_INSDEL && bHasRelName) ||
pSharedCode) )
{ // Cut off references, invalid or similar?
sc::AutoCalcSwitch(*pDocument, false);
SetDirty();
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 4748aef..d22c54f 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4222,25 +4222,25 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode
eUpdateRefMode,
}
}
// Check for SharedFormulas.
-ScRangeData* pRangeData = NULL;
+ScRangeData* pSharedCode = NULL;
pArr->Reset();
-for( FormulaToken* j = pArr->GetNextName(); j && !pRangeData;
+for( FormulaToken* j = pArr->GetNextName(); j && !pSharedCode;
j = pArr->GetNextName() )
{
if( j->GetOpCode() == ocName )
{
ScRangeData* pName = GetRangeData( *j);
if (pName && pName-
[Libreoffice-commits] translations.git: source/sl
source/sl/dictionaries/is.po | 4 source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po | 8 source/sl/helpcontent2/source/text/scalc/02.po | 4 source/sl/helpcontent2/source/text/scalc/guide.po | 4 source/sl/helpcontent2/source/text/schart/01.po| 4 source/sl/helpcontent2/source/text/shared/00.po| 4 source/sl/helpcontent2/source/text/shared/01.po| 22 +- source/sl/helpcontent2/source/text/shared/02.po| 4 source/sl/helpcontent2/source/text/shared/05.po| 4 source/sl/helpcontent2/source/text/shared/guide.po | 12 - source/sl/helpcontent2/source/text/shared/optionen.po | 6 source/sl/helpcontent2/source/text/simpress/02.po | 4 source/sl/helpcontent2/source/text/swriter/00.po | 4 source/sl/helpcontent2/source/text/swriter/01.po | 12 + source/sl/helpcontent2/source/text/swriter/02.po | 4 source/sl/officecfg/registry/data/org/openoffice/Office/UI.po | 8 source/sl/sc/uiconfig/scalc/ui.po | 4 source/sl/starmath/source.po | 86 +- source/sl/svx/source/dialog.po | 38 source/sl/sw/uiconfig/swriter/ui.po| 4 source/sl/wizards/source/importwizard.po | 4 21 files changed, 186 insertions(+), 58 deletions(-) New commits: commit 56f43677e90d28489fa3dbbd5bc5f35a5483e354 Author: Andras Timar Date: Mon Jun 17 10:57:25 2013 +0200 updated Slovenian translation Change-Id: I10d4becdd5efbe92da302d7b516fce7e1c9c1780 diff --git a/source/sl/dictionaries/is.po b/source/sl/dictionaries/is.po index 034eb3f..28d2ce8 100644 --- a/source/sl/dictionaries/is.po +++ b/source/sl/dictionaries/is.po @@ -3,14 +3,14 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.1\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2013-06-10 10:39+0200\n" +"POT-Creation-Date: 2013-06-13 17:25+0200\n" "PO-Revision-Date: 2013-06-10 12:53+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" -"Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sl\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" "X-Generator: Virtaal 0.7.1\n" "X-Accelerator-Marker: ~\n" diff --git a/source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po b/source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po index f7b1080..a92089d 100644 --- a/source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po +++ b/source/sl/dictionaries/pt_BR/dialog/registry/data/org/openoffice/Office.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.0\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2013-06-10 10:39+0200\n" -"PO-Revision-Date: 2013-06-10 12:56+0200\n" +"POT-Creation-Date: 2013-06-16 22:46+0200\n" +"PO-Revision-Date: 2013-06-17 01:35+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "Language: sl\n" @@ -32,5 +32,5 @@ msgctxt "" "..OptionsDialog.Nodes.LanguageSettings.Leaves.org.openoffice.lightproof.pt_BR\n" "Label\n" "value.text" -msgid "Portuguese sentence checking" -msgstr "Preverjanje portugalskih povedi" +msgid "Grammar checking (Portuguese)" +msgstr "Preverjanje slovnice (portugalÅ¡Äina)" diff --git a/source/sl/helpcontent2/source/text/scalc/02.po b/source/sl/helpcontent2/source/text/scalc/02.po index dfa0a36..16ce998 100644 --- a/source/sl/helpcontent2/source/text/scalc/02.po +++ b/source/sl/helpcontent2/source/text/scalc/02.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: LibreOffice 4.0\n" "Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"; -"POT-Creation-Date: 2013-05-17 10:49+0200\n" -"PO-Revision-Date: 2013-05-03 18:14+0200\n" +"POT-Creation-Date: 2013-06-16 22:46+0200\n" +"PO-Revision-Date: 2013-06-14 01:58+0200\n" "Last-Translator: Martin Srebotnjak \n" "Language-Team: sl.libreoffice.org\n" "MIME-Version: 1.0\n" diff --git a/source/sl/helpcontent2/source/text/scalc/guide.po b/source/sl/helpcontent2/source/text/scalc/guide.po index 33b33402..bee
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgnode.hxx |9 ++---
svgio/inc/svgio/svgreader/svgtools.hxx |8 +---
svgio/source/svgreader/svgnode.cxx | 32
svgio/source/svgreader/svgtools.cxx|4 ++--
4 files changed, 33 insertions(+), 20 deletions(-)
New commits:
commit 1d405e396361d2a01b29e97ed9f8f0199614fefa
Author: Thorsten Behrens
Date: Thu Jun 27 20:41:29 2013 +0200
Fix fdo#65847 - avoid infinite recursion in style resolution.
That was previously asking back the node for the font size, which
was again asking the SvgNumber, which was ...
In this case, if the node has relative sizes, this is always
relative to the parent.
Change-Id: Iaa81d0238d9eb73f5af24df347d12d7cb8ba8c0a
(cherry picked from commit d9b09a3ff38b2cf11ee0b9f9f03d47375f2b11e8)
Reviewed-on: https://gerrit.libreoffice.org/4594
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx
b/svgio/inc/svgio/svgreader/svgnode.hxx
index 759859b..7274489 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -103,9 +103,12 @@ namespace svgio
const SvgNodeVector& getChildren() const { return maChildren; }
/// InfoProvider support for %, em and ex values
-virtual const basegfx::B2DRange* getCurrentViewPort() const;
-virtual double getCurrentFontSize() const;
-virtual double getCurrentXHeight() const;
+virtual const basegfx::B2DRange* getCurrentViewPort() const
SAL_OVERRIDE;
+virtual double getCurrentFontSizeInherited() const SAL_OVERRIDE;
+virtual double getCurrentXHeightInherited() const SAL_OVERRIDE;
+
+double getCurrentFontSize() const;
+double getCurrentXHeight() const;
/// Id access
const OUString* getId() const { return mpId; }
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx
b/svgio/inc/svgio/svgreader/svgtools.hxx
index 0dbedf8..138a065 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -62,10 +62,12 @@ namespace svgio
class InfoProvider
{
public:
-virtual ~InfoProvider() {}
+virtual ~InfoProvider() {}
virtual const basegfx::B2DRange* getCurrentViewPort() const = 0;
-virtual double getCurrentFontSize() const = 0;
-virtual double getCurrentXHeight() const = 0;
+/// return font size of node inherited from parents
+virtual double getCurrentFontSizeInherited() const = 0;
+/// return xheight of node inherited from parents
+virtual double getCurrentXHeightInherited() const = 0;
};
enum SvgUnit
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index ff44050..262ec56 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -342,13 +342,9 @@ namespace svgio
}
}
-double SvgNode::getCurrentFontSize() const
+double SvgNode::getCurrentFontSizeInherited() const
{
-if(getSvgStyleAttributes())
-{
-return getSvgStyleAttributes()->getFontSize().solve(*this,
xcoordinate);
-}
-else if(getParent())
+if(getParent())
{
return getParent()->getCurrentFontSize();
}
@@ -358,14 +354,17 @@ namespace svgio
}
}
-double SvgNode::getCurrentXHeight() const
+double SvgNode::getCurrentFontSize() const
{
if(getSvgStyleAttributes())
-{
-// for XHeight, use FontSize currently
-return getSvgStyleAttributes()->getFontSize().solve(*this,
ycoordinate);
-}
-else if(getParent())
+return getSvgStyleAttributes()->getFontSize().solve(*this,
xcoordinate);
+
+return getCurrentFontSizeInherited();
+}
+
+double SvgNode::getCurrentXHeightInherited() const
+{
+if(getParent())
{
return getParent()->getCurrentXHeight();
}
@@ -375,6 +374,15 @@ namespace svgio
}
}
+double SvgNode::getCurrentXHeight() const
+{
+if(getSvgStyleAttributes())
+// for XHeight, use FontSize currently
+return getSvgStyleAttributes()->getFontSize().solve(*this,
ycoordinate);
+
+return getCurrentXHeightInherited();
+}
+
void SvgNode::setId(const OUString* pfId)
{
if(mpId)
diff --git a/svgio/source/svgreader/svgtools.cxx
b/svgio/source/svgreader/svgtools.cxx
index 8e107a7..dd871ac 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -159
[Libreoffice-commits] core.git: translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit db56d99f7b66c9f3fe38581829077e7008174c7b Author: Andras Timar Date: Mon Jun 17 10:57:25 2013 +0200 Updated core Project: translations 56f43677e90d28489fa3dbbd5bc5f35a5483e354 diff --git a/translations b/translations index 27c79c7..56f4367 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 27c79c7d3fa134bf63e6397000b3fc31ad758567 +Subproject commit 56f43677e90d28489fa3dbbd5bc5f35a5483e354 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/filter/xcl97/xcl97esc.cxx | 43 +++-
1 file changed, 23 insertions(+), 20 deletions(-)
New commits:
commit 9edbfa59a8793b7878c47af4f0467d9b585ce993
Author: Norbert Thiebaud
Date: Wed Jun 26 01:44:00 2013 -0500
coverity#1027641 Dereference after null check
Change-Id: I63ea1016e8946ca6b269f56f591a3a5cc7a99e6d
Reviewed-on: https://gerrit.libreoffice.org/4527
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx
b/sc/source/filter/xcl97/xcl97esc.cxx
index bcdec46..8e380d4 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -319,28 +319,31 @@ EscherExHostAppData* XclEscherEx::StartShape( const
Reference< XShape >& rxShape
}
}
}
-//add for exporting OCX control
-//for OCX control import from MS office file,we need keep the id value as
MS office file.
-//GetOldRoot().pObjRecs->Add( pCurrXclObj ) statement has generated the id
value as obj id rule;
-//but we trick it here.
-sal_uInt16 nObjType = pObj->GetObjIdentifier();
-if( nObjType == OBJ_UNO && pCurrXclObj )
+if(pObj)
{
-Reference< XPropertySet > xPropSet( rxShape, UNO_QUERY );
-Any aAny;
-try
-{
-aAny =
xPropSet->getPropertyValue(rtl::OUString::createFromAscii("ObjIDinMSO"));
-}
-catch(const Exception&)
-{
-OSL_TRACE("XclEscherEx::StartShape, this control can't get the
property ObjIDinMSO!");
-}
-sal_uInt16 nObjIDinMSO = 0x;
-aAny >>= nObjIDinMSO;
-if( nObjIDinMSO != 0x && nMsCtlType == 2) //OCX
+//add for exporting OCX control
+//for OCX control import from MS office file,we need keep the id value
as MS office file.
+//GetOldRoot().pObjRecs->Add( pCurrXclObj ) statement has generated
the id value as obj id rule;
+//but we trick it here.
+sal_uInt16 nObjType = pObj->GetObjIdentifier();
+if( nObjType == OBJ_UNO && pCurrXclObj )
{
-pCurrXclObj->SetId(nObjIDinMSO);
+Reference< XPropertySet > xPropSet( rxShape, UNO_QUERY );
+Any aAny;
+try
+{
+aAny =
xPropSet->getPropertyValue(rtl::OUString::createFromAscii("ObjIDinMSO"));
+}
+catch(const Exception&)
+{
+OSL_TRACE("XclEscherEx::StartShape, this control can't get the
property ObjIDinMSO!");
+}
+sal_uInt16 nObjIDinMSO = 0x;
+aAny >>= nObjIDinMSO;
+if( nObjIDinMSO != 0x && nMsCtlType == 2) //OCX
+{
+pCurrXclObj->SetId(nObjIDinMSO);
+}
}
}
if ( !pCurrXclObj )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Drop help for removed Embed standard fonts option
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4496 Approvals: Caolán McNamara: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4496 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iddb13afd25483de4753e315b5524fa6cca8b5f93 Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Khaled Hosny Gerrit-Reviewer: Caolán McNamara ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
New commits:
commit 435be554c5025f2309c016170d5225ac086c727b
Author: Michael Stahl
Date: Mon Jun 24 19:05:45 2013 +0200
fdo#60444: Revert "fdo#58029 - substantially accelerate re-rendering..."
This reverts commit 6c98ad71478cb72b51634b32d6e553ccaec30190.
This breaks selection of transparent form controls (fdo#60444), because
the Update method is not called on the children.
Change-Id: Id0b6a34a15aa1ed7bd5aa0d7b5626e60bee57e30
(cherry picked from commit f022f39638fbe970f1b839c757dcccd3baa69445)
Reviewed-on: https://gerrit.libreoffice.org/4490
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 6b394be..64ac99d 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -348,15 +348,28 @@ namespace sdr
if(bTargetIsWindow)
{
Window& rWindow = static_cast< Window& >(rmOutputDevice);
-if(rWindow.IsChildTransparentModeEnabled())
+
+if(rWindow.IsChildTransparentModeEnabled() &&
rWindow.GetChildCount())
{
-// Get VCL to invalidate it's children - more
efficiently. fdo#58029
const Rectangle aRegionRectanglePixel(
maBufferRememberedRangePixel.getMinX(),
maBufferRememberedRangePixel.getMinY(),
maBufferRememberedRangePixel.getMaxX(),
maBufferRememberedRangePixel.getMaxY());
-rWindow.Invalidate(aRegionRectanglePixel,
-
INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN|INVALIDATE_UPDATE);
+for(sal_uInt16 a(0); a < rWindow.GetChildCount(); a++)
+{
+Window* pCandidate = rWindow.GetChild(a);
+
+if(pCandidate && pCandidate->IsPaintTransparent())
+{
+const Rectangle
aCandidatePosSizePixel(pCandidate->GetPosPixel(), pCandidate->GetSizePixel());
+
+
if(aCandidatePosSizePixel.IsOver(aRegionRectanglePixel))
+{
+
pCandidate->Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
+pCandidate->Update();
+}
+}
+}
}
}
___
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' - svx/inc svx/source sw/source
svx/inc/svx/sdrpaintwindow.hxx|6
svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 29 +-
svx/source/svdraw/sdrpaintwindow.cxx | 27
sw/source/core/view/viewsh.cxx| 28 +
4 files changed, 42 insertions(+), 48 deletions(-)
New commits:
commit 904de3293692949eba25229b27a6e1afaabc183b
Author: Michael Stahl
Date: Mon Jun 24 19:50:30 2013 +0200
fdo#58029: replace quadratic child window loop with linear
... which should speed things up without introducing problems.
(Window::GetChild(n) is inefficient because the children are a linked
list)
Change-Id: I343d51a6866c5014cbca4c256b0c15f938958c39
(cherry picked from commit 38dcfadda85058a0ee87292c8943aec82e34b81e)
Reviewed-on: https://gerrit.libreoffice.org/4491
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/inc/svx/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx
index fa2f6e9..1eed124 100644
--- a/svx/inc/svx/sdrpaintwindow.hxx
+++ b/svx/inc/svx/sdrpaintwindow.hxx
@@ -41,6 +41,12 @@ namespace sdr
#endif
+/// paint the transparent children of rWin that overlap rPixelRect
+/// (for example, transparent form controls like check boxes)
+void SVX_DLLPUBLIC
+PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect);
+
+
class SdrPreRenderDevice
{
// The original OutputDevice
diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
index 64ac99d..56159a2 100644
--- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
+++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
@@ -349,28 +350,12 @@ namespace sdr
{
Window& rWindow = static_cast< Window& >(rmOutputDevice);
-if(rWindow.IsChildTransparentModeEnabled() &&
rWindow.GetChildCount())
-{
-const Rectangle aRegionRectanglePixel(
-maBufferRememberedRangePixel.getMinX(),
maBufferRememberedRangePixel.getMinY(),
-maBufferRememberedRangePixel.getMaxX(),
maBufferRememberedRangePixel.getMaxY());
-
-for(sal_uInt16 a(0); a < rWindow.GetChildCount(); a++)
-{
-Window* pCandidate = rWindow.GetChild(a);
-
-if(pCandidate && pCandidate->IsPaintTransparent())
-{
-const Rectangle
aCandidatePosSizePixel(pCandidate->GetPosPixel(), pCandidate->GetSizePixel());
-
-
if(aCandidatePosSizePixel.IsOver(aRegionRectanglePixel))
-{
-
pCandidate->Invalidate(INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN);
-pCandidate->Update();
-}
-}
-}
-}
+const Rectangle aRegionRectanglePixel(
+maBufferRememberedRangePixel.getMinX(),
+maBufferRememberedRangePixel.getMinY(),
+maBufferRememberedRangePixel.getMaxX(),
+maBufferRememberedRangePixel.getMaxY());
+PaintTransparentChildren(rWindow, aRegionRectanglePixel);
}
// #i80730# restore visibility of VCL cursor
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index cf9548d..f5cedd8 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -23,6 +23,33 @@
#include
#include
+
+void PaintTransparentChildren(Window & rWindow, Rectangle const& rPixelRect)
+{
+if (rWindow.IsChildTransparentModeEnabled())
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+while (pCandidate)
+{
+if (pCandidate->IsPaintTransparent())
+{
+const Rectangle aCandidatePosSizePixel(
+pCandidate->GetPosPixel(),
+pCandidate->GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(rPixelRect))
+{
+pCandidate->Invalidate(
+INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
+// important: actually paint the child here!
+pCandidate->Update();
+}
+}
+pCandidate = pCandidate->GetWindow( WINDOW_NEXT );
+
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 73077b16a78e7245d22a0c7c92b24eda39243189 Author: Khaled Hosny Date: Tue Jun 25 00:01:49 2013 +0200 Updated core Project: help d8c5b1703bfae6f629c3f2db8b2730133bd1782b Drop help for removed Embed standard fonts option Change-Id: Iddb13afd25483de4753e315b5524fa6cca8b5f93 Reviewed-on: https://gerrit.libreoffice.org/4496 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/helpcontent2 b/helpcontent2 index f92fe45..d8c5b17 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit f92fe458ddf0b7a79a11f426eff8f271639c6ada +Subproject commit d8c5b1703bfae6f629c3f2db8b2730133bd1782b ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/core/view/viewsh.cxx | 74 ++---
1 file changed, 41 insertions(+), 33 deletions(-)
New commits:
commit 31a53b30b040021e503f779fd63d62ef723d82b0
Author: Michael Stahl
Date: Mon Jun 24 18:09:35 2013 +0200
fdo#43765, fdo#57884, fdo#58052, fdo#63949: disappearing form controls
Transparent form controls in Writer may not be painted properly, if
painted from ViewShell::ImplUnlockPaint(true), called from
SwLayIdle::SwLayIdle.
The problem is that SdrPaintWindow::OutputPreRenderDevice will paint
the background of the transparent form controls (thus over-painting the
controls), so it has to be followed by painting the controls themselves.
(cherry picked from commit cfa994ccbd6ee681f5ab3648ce068c4881b495f5)
Conflicts:
sw/source/core/view/viewsh.cxx
Change-Id: Icda4ad835a398bbd50139be32ff5014a34f23bd5
Reviewed-on: https://gerrit.libreoffice.org/4489
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index e50adf9..a3418ef 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -106,6 +106,44 @@ void ViewShell::ToggleHeaderFooterEdit()
}
//
+
+static void
+lcl_PaintTransparentFormControls(ViewShell & rShell, SwRect const& rRect)
+{
+// Direct paint has been performed: the background of transparent child
+// windows has been painted, so need to paint the child windows now.
+if (rShell.GetWin())
+{
+Window& rWindow = *(rShell.GetWin());
+if (rWindow.IsChildTransparentModeEnabled())
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+if (pCandidate)
+{
+const Rectangle aRectanglePixel(
+rWindow.LogicToPixel(rRect.SVRect()));
+while (pCandidate)
+{
+if (pCandidate->IsPaintTransparent())
+{
+const Rectangle aCandidatePosSizePixel(
+pCandidate->GetPosPixel(),
+pCandidate->GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(aRectanglePixel))
+{
+pCandidate->Invalidate(
+INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
+pCandidate->Update();
+}
+}
+pCandidate = pCandidate->GetWindow( WINDOW_NEXT );
+}
+}
+}
+}
+}
+
// #i72754# 2nd set of Pre/PostPaints
// This time it uses the lock counter (mPrePostPaintRegions empty/non-empty)
to allow only one activation
// and deactivation and mpPrePostOutDev to remember the OutDev from the
BeginDrawLayers
@@ -367,39 +405,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
DLPostPaint2(true);
}
-// #i107365#
-// Direct paint has been performed. Thus, take care of
-// transparent child windows.
-if ( GetWin() )
-{
-Window& rWindow = *(GetWin());
-if (rWindow.IsChildTransparentModeEnabled())
-{
-Window* pCandidate = rWindow.GetWindow(
WINDOW_FIRSTCHILD );
-if (pCandidate)
-{
-const Rectangle
aRectanglePixel(rWindow.LogicToPixel(aRect.SVRect()));
-
-while (pCandidate)
-{
-if ( pCandidate->IsPaintTransparent() )
-{
-const Rectangle aCandidatePosSizePixel(
-
pCandidate->GetPosPixel(),
-
pCandidate->GetSizePixel());
-
-if (
aCandidatePosSizePixel.IsOver(aRectanglePixel) )
-{
-pCandidate->Invalidate(
INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
-pCandidate->Update();
-}
-}
-
-pCandidate = pCandidate->GetWindow(
WINDOW_NEXT );
-}
-}
-}
-}
+
[Libreoffice-commits] help.git: source/text
source/text/shared/01/ref_pdf_export.xhp |3 --- 1 file changed, 3 deletions(-) New commits: commit d8c5b1703bfae6f629c3f2db8b2730133bd1782b Author: Khaled Hosny Date: Tue Jun 25 00:01:49 2013 +0200 Drop help for removed Embed standard fonts option Change-Id: Iddb13afd25483de4753e315b5524fa6cca8b5f93 Reviewed-on: https://gerrit.libreoffice.org/4496 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara diff --git a/source/text/shared/01/ref_pdf_export.xhp b/source/text/shared/01/ref_pdf_export.xhp index 72c3028..424862e 100644 --- a/source/text/shared/01/ref_pdf_export.xhp +++ b/source/text/shared/01/ref_pdf_export.xhp @@ -121,9 +121,6 @@ Export automatically inserted blank pages If switched on, automatically inserted blank pages are being exported to pdf file. This is best if you are printing the pdf file double-sided. Example: In a book a chapter paragraph style is set to always start with an odd numbered page. The previous chapter ends on an odd page. %PRODUCTNAME inserts an even numbered blank page. This option controls whether to export that even numbered page or not. - -Embed standard fonts -Normally the 14 standard Postscript fonts are not embedded in a PDF file, because every PDF reader software already contains these fonts. Enable this option to embed the standard fonts that are installed on your system and that are used in the document. Use this option if you expect to have a better looking or more useful standard font than the font that is available in the recipients' PDF reader software. Initial View tab Panes ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-7' - sw/source
sw/source/core/view/viewsh.cxx | 74 ++---
1 file changed, 41 insertions(+), 33 deletions(-)
New commits:
commit c007fe6949ca275dcda4cbf7ac5c3f86972137b4
Author: Michael Stahl
Date: Mon Jun 24 18:09:35 2013 +0200
fdo#43765, fdo#57884, fdo#58052, fdo#63949: disappearing form controls
Transparent form controls in Writer may not be painted properly, if
painted from ViewShell::ImplUnlockPaint(true), called from
SwLayIdle::SwLayIdle.
The problem is that SdrPaintWindow::OutputPreRenderDevice will paint
the background of the transparent form controls (thus over-painting the
controls), so it has to be followed by painting the controls themselves.
(cherry picked from commit cfa994ccbd6ee681f5ab3648ce068c4881b495f5)
Conflicts:
sw/source/core/view/viewsh.cxx
Change-Id: Icda4ad835a398bbd50139be32ff5014a34f23bd5
Reviewed-on: https://gerrit.libreoffice.org/4492
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index a7dccd7..f32597a 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -122,6 +122,44 @@ void ViewShell::ToggleHeaderFooterEdit()
}
//
+
+static void
+lcl_PaintTransparentFormControls(ViewShell & rShell, SwRect const& rRect)
+{
+// Direct paint has been performed: the background of transparent child
+// windows has been painted, so need to paint the child windows now.
+if (rShell.GetWin())
+{
+Window& rWindow = *(rShell.GetWin());
+if (rWindow.IsChildTransparentModeEnabled())
+{
+Window * pCandidate = rWindow.GetWindow( WINDOW_FIRSTCHILD );
+if (pCandidate)
+{
+const Rectangle aRectanglePixel(
+rWindow.LogicToPixel(rRect.SVRect()));
+while (pCandidate)
+{
+if (pCandidate->IsPaintTransparent())
+{
+const Rectangle aCandidatePosSizePixel(
+pCandidate->GetPosPixel(),
+pCandidate->GetSizePixel());
+
+if (aCandidatePosSizePixel.IsOver(aRectanglePixel))
+{
+pCandidate->Invalidate(
+INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
+pCandidate->Update();
+}
+}
+pCandidate = pCandidate->GetWindow( WINDOW_NEXT );
+}
+}
+}
+}
+}
+
// #i72754# 2nd set of Pre/PostPaints
// This time it uses the lock counter (mPrePostPaintRegions empty/non-empty)
to allow only one activation
// and deactivation and mpPrePostOutDev to remember the OutDev from the
BeginDrawLayers
@@ -390,39 +428,7 @@ void ViewShell::ImplEndAction( const sal_Bool bIdleEnd )
DLPostPaint2(true);
}
-// #i107365#
-// Direct paint has been performed. Thus, take care of
-// transparent child windows.
-if ( GetWin() )
-{
-Window& rWindow = *(GetWin());
-if (rWindow.IsChildTransparentModeEnabled())
-{
-Window* pCandidate = rWindow.GetWindow(
WINDOW_FIRSTCHILD );
-if (pCandidate)
-{
-const Rectangle
aRectanglePixel(rWindow.LogicToPixel(aRect.SVRect()));
-
-while (pCandidate)
-{
-if ( pCandidate->IsPaintTransparent() )
-{
-const Rectangle aCandidatePosSizePixel(
-
pCandidate->GetPosPixel(),
-
pCandidate->GetSizePixel());
-
-if (
aCandidatePosSizePixel.IsOver(aRectanglePixel) )
-{
-pCandidate->Invalidate(
INVALIDATE_NOTRANSPARENT|INVALIDATE_CHILDREN );
-pCandidate->Update();
-}
-}
-
-pCandidate = pCandidate->GetWindow(
WINDOW_NEXT );
-}
-}
-}
-}
+lcl_PaintTransparentFormControls(*this, aRect); // i#107365
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 355289f3c8ae8a7566c11d55162cf5b82ecadbf4 Author: pje335_NL Date: Sun Jun 23 07:49:27 2013 +0200 Updated core Project: dictionaries ec1372f7e0f78ff84b90a9d61aa4e3e389008f99 diff --git a/dictionaries b/dictionaries index dbfffe3..ec1372f 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit dbfffe3512457095ea99f7362ff64b1431b820b1 +Subproject commit ec1372f7e0f78ff84b90a9d61aa4e3e389008f99 ___ 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/svdraw/svdundo.cxx | 26 ++
1 file changed, 22 insertions(+), 4 deletions(-)
New commits:
commit 279e329c2d52940c759f40eb59b5f931c4e68b7c
Author: David Tardon
Date: Thu Jun 27 12:07:59 2013 +0200
fdo#47646 fix undo of ungrouping
(cherry picked from commit 66480d15a04204b0f60008b9cd8e25a66ca6db6a)
Change-Id: If20e645d8d708ebe17e2d9455c896c94592993bb
Signed-off-by: David Tardon
Reviewed-on: https://gerrit.libreoffice.org/4573
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index d5ca5e2..e211122 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -715,11 +715,29 @@ void
SdrUndoObjList::ObjListListener::Notify(SfxBroadcaster&, const SfxHint& rHi
const SdrHint* const pSdrHint(dynamic_cast(&rHint));
if (pSdrHint)
{
-if ((pSdrHint->GetObject() == &m_rObject) && (pSdrHint->GetKind() ==
HINT_OBJCHG))
+if (pSdrHint->GetObject() == &m_rObject)
{
-const sal_uInt32 nNewOrdNum(m_rObject.GetOrdNum());
-if (nNewOrdNum != m_rThat.GetOrdNum())
-m_rThat.SetOrdNum(nNewOrdNum);
+switch (pSdrHint->GetKind())
+{
+case HINT_OBJCHG :
+if (IsListening(*m_pBroadcaster))
+{
+const sal_uInt32 nNewOrdNum(m_rObject.GetOrdNum());
+if (nNewOrdNum != m_rThat.GetOrdNum())
+m_rThat.SetOrdNum(nNewOrdNum);
+}
+break;
+case HINT_OBJREMOVED :
+SAL_WARN_IF(!IsListening(*m_pBroadcaster), "svx.sdr",
"Object is not in any list");
+EndListening(*m_pBroadcaster);
+break;
+case HINT_OBJINSERTED :
+SAL_WARN_IF(IsListening(*m_pBroadcaster), "svx.sdr",
"Object is already in a list");
+StartListening(*m_pBroadcaster);
+break;
+default :
+break;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source include/vcl officecfg/registry vcl/generic vcl/source
filter/source/pdf/impdialog.cxx| 20 -
filter/source/pdf/impdialog.hrc|1
filter/source/pdf/impdialog.hxx|3
filter/source/pdf/impdialog.src|8
filter/source/pdf/pdfexport.cxx|7
filter/source/pdf/pdfexport.hxx|1
include/vcl/pdfwriter.hxx |3
officecfg/registry/schema/org/openoffice/Office/Common.xcs |7
vcl/generic/print/genprnpsp.cxx|1
vcl/source/gdi/outdev3.cxx | 60 +--
vcl/source/gdi/pdfwriter_impl.cxx | 210 -
vcl/source/gdi/pdfwriter_impl.hxx | 15
12 files changed, 22 insertions(+), 314 deletions(-)
New commits:
commit feaebe7f93779d5c91c24c31ff91f756c69e9640
Author: Khaled Hosny
Date: Mon Jun 24 23:07:31 2013 +0200
Always embed 14 standard Postscript fonts in PDF
Ealier version of PDF standard allowed for not embedding the so called
standard PostScript fonts in the PDF files and all PDF readers had to
include them or a "suitable substitute". This behaviour had many issues
and is deprecated for 10 years now. The current version of PDF spec
says:
Beginning with PDF 1.5, the special treatment given to the standard 14
fonts is deprecated. Conforming writers should represent all fonts
using a complete font descriptor. For backwards capability, conforming
readers shall still provide the special treatment identified for the
standard 14 fonts.
This commits removes support for not embedding these fonts, and the, now
redundant, option to embed them.
This has the side effect of elimanating the cause of fdo#66108 and
fdo#41547.
Change-Id: I4f1fc4137a2de7baeef9e504f2e4f84fbec0a491
Reviewed-on: https://gerrit.libreoffice.org/4495
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 21e98af..56534f0 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -83,7 +83,6 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
mbUseTransitionEffects( sal_False ),
mbIsSkipEmptyPages( sal_True ),
mbAddStream( sal_False ),
-mbEmbedStandardFonts( sal_False ),
mnFormsType( 0 ),
mbExportFormFields( sal_True ),
mbAllowDuplicateFieldNames( sal_False ),
@@ -200,7 +199,6 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
mbUseTransitionEffects = maConfigItem.ReadBool( "UseTransitionEffects",
sal_True );
mbIsSkipEmptyPages = maConfigItem.ReadBool( "IsSkipEmptyPages", sal_False
);
mbAddStream = maConfigItem.ReadBool( "IsAddStream", sal_False );
-mbEmbedStandardFonts = maConfigItem.ReadBool( "EmbedStandardFonts",
sal_False );
mnFormsType = maConfigItem.ReadInt32( "FormsType", 0 );
mbExportFormFields = maConfigItem.ReadBool( "ExportFormFields", sal_True );
@@ -368,7 +366,6 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
maConfigItem.WriteBool( "UseTransitionEffects", mbUseTransitionEffects );
maConfigItem.WriteBool( "IsSkipEmptyPages", mbIsSkipEmptyPages );
maConfigItem.WriteBool( "IsAddStream", mbAddStream );
-maConfigItem.WriteBool( "EmbedStandardFonts", mbEmbedStandardFonts );
/*
* FIXME: the entries are only implicitly defined by the resource file.
Should there
@@ -504,7 +501,6 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
maCbExportFormFields( this, PDFFilterResId( CB_EXPORTFORMFIELDS ) ),
mbExportFormFieldsUserSelection( sal_False ),
-mbEmbedStandardFontsUserSelection( sal_False ),
maFtFormsFormat( this, PDFFilterResId( FT_FORMSFORMAT ) ),
maLbFormsFormat( this, PDFFilterResId( LB_FORMSFORMAT ) ),
maCbAllowDuplicateFieldNames( this, PDFFilterResId(
CB_ALLOWDUPLICATEFIELDNAMES ) ),
@@ -517,7 +513,6 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window* pParent,
maCbExportEmptyPages( this, PDFFilterResId( CB_EXPORTEMPTYPAGES ) ),
maCbAddStream( this, PDFFilterResId( CB_ADDSTREAM ) ),
maFtAddStreamDescription( this, PDFFilterResId( FT_ADDSTREAMDESCRIPTION )
),
-maCbEmbedStandardFonts( this, PDFFilterResId( CB_EMBEDSTANDARDFONTS ) ),
maFlWatermark( this, PDFFilterResId( FL_WATERMARK ) ),
maCbWatermark( this, PDFFilterResId( CB_WATERMARK ) ),
@@ -535,11 +530,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage( Window*
pParent,
if ( aSize.Width() > aMinSize.Width() )
{
Size aNewSize = maCbExportNotes.GetSizePixel();
-long nDelta = aSize.Height() - aNewSize.Height();
maCbExportEmptyPages.SetSizePixel( aNewSize );
-Point aNewPos = maCbEmbedStandardFonts.GetPosPixel();
-aNewPos.Y() -= nDelta;
BSA Versions - Update
Hi All, So Robinson has done a great job dealing with the ridiculous list of versions we had on BSA - we had 90+ versions and are now down to 30 and will soon be down to 27. What we did was collapsed 3.3 and 3.4 into "all versions" (3.3 all versions, 3.4 all versions). These are both way past EOL and we don't expect a lot of people to be using BSA to report bugs against these. Then we removed 3.5 pre releases, *we would also like to collapse 3.5 to 3.5 all versions **as it has also reached EOL.* I needed to emphasize that to make sure people read it. What we know is that Ubuntu 12.04 is still technically on 3.5 (which sucks for this particular clean up) but we'd like to not have so many versions to confuse users. BSA is meant to be simple, 90+ versions was surely confusing, 20+ is better but still a lot. Lastly, we removed 4.0.0 - 4.0.4 pre releases & 4.1 alpha/beta releases. I have added Bjoern to this as he's the one who might be impacted most because of the Ubuntu issue. If there are serious objections to collapsing 3.5 as well please let me know as soon as possible as we hope to move forward soon. Best, Joel P.S. This does add a little work for QA because if 3.5 all versions is selected, we'd have to set it on FDO to the correct version. I think the added work will be minimal and the benefit to user experience will be substantial -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svgio/inc svgio/source
svgio/inc/svgio/svgreader/svgnode.hxx |9 ++---
svgio/inc/svgio/svgreader/svgtools.hxx |8 +---
svgio/source/svgreader/svgnode.cxx | 32
svgio/source/svgreader/svgtools.cxx|4 ++--
4 files changed, 33 insertions(+), 20 deletions(-)
New commits:
commit d9b09a3ff38b2cf11ee0b9f9f03d47375f2b11e8
Author: Thorsten Behrens
Date: Thu Jun 27 20:41:29 2013 +0200
Fix fdo#65847 - avoid infinite recursion in style resolution.
That was previously asking back the node for the font size, which
was again asking the SvgNumber, which was ...
In this case, if the node has relative sizes, this is always
relative to the parent.
Change-Id: Iaa81d0238d9eb73f5af24df347d12d7cb8ba8c0a
diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx
b/svgio/inc/svgio/svgreader/svgnode.hxx
index 725fb5c..7c1c39b 100644
--- a/svgio/inc/svgio/svgreader/svgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgnode.hxx
@@ -134,9 +134,12 @@ namespace svgio
const SvgNodeVector& getChildren() const { return maChildren; }
/// InfoProvider support for %, em and ex values
-virtual const basegfx::B2DRange* getCurrentViewPort() const;
-virtual double getCurrentFontSize() const;
-virtual double getCurrentXHeight() const;
+virtual const basegfx::B2DRange* getCurrentViewPort() const
SAL_OVERRIDE;
+virtual double getCurrentFontSizeInherited() const SAL_OVERRIDE;
+virtual double getCurrentXHeightInherited() const SAL_OVERRIDE;
+
+double getCurrentFontSize() const;
+double getCurrentXHeight() const;
/// Id access
const OUString* getId() const { return mpId; }
diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx
b/svgio/inc/svgio/svgreader/svgtools.hxx
index 0dbedf8..138a065 100644
--- a/svgio/inc/svgio/svgreader/svgtools.hxx
+++ b/svgio/inc/svgio/svgreader/svgtools.hxx
@@ -62,10 +62,12 @@ namespace svgio
class InfoProvider
{
public:
-virtual ~InfoProvider() {}
+virtual ~InfoProvider() {}
virtual const basegfx::B2DRange* getCurrentViewPort() const = 0;
-virtual double getCurrentFontSize() const = 0;
-virtual double getCurrentXHeight() const = 0;
+/// return font size of node inherited from parents
+virtual double getCurrentFontSizeInherited() const = 0;
+/// return xheight of node inherited from parents
+virtual double getCurrentXHeightInherited() const = 0;
};
enum SvgUnit
diff --git a/svgio/source/svgreader/svgnode.cxx
b/svgio/source/svgreader/svgnode.cxx
index 3bc092d..e1698e8 100644
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@@ -491,13 +491,9 @@ namespace svgio
}
}
-double SvgNode::getCurrentFontSize() const
+double SvgNode::getCurrentFontSizeInherited() const
{
-if(getSvgStyleAttributes())
-{
-return getSvgStyleAttributes()->getFontSize().solve(*this,
xcoordinate);
-}
-else if(getParent())
+if(getParent())
{
return getParent()->getCurrentFontSize();
}
@@ -507,14 +503,17 @@ namespace svgio
}
}
-double SvgNode::getCurrentXHeight() const
+double SvgNode::getCurrentFontSize() const
{
if(getSvgStyleAttributes())
-{
-// for XHeight, use FontSize currently
-return getSvgStyleAttributes()->getFontSize().solve(*this,
ycoordinate);
-}
-else if(getParent())
+return getSvgStyleAttributes()->getFontSize().solve(*this,
xcoordinate);
+
+return getCurrentFontSizeInherited();
+}
+
+double SvgNode::getCurrentXHeightInherited() const
+{
+if(getParent())
{
return getParent()->getCurrentXHeight();
}
@@ -524,6 +523,15 @@ namespace svgio
}
}
+double SvgNode::getCurrentXHeight() const
+{
+if(getSvgStyleAttributes())
+// for XHeight, use FontSize currently
+return getSvgStyleAttributes()->getFontSize().solve(*this,
ycoordinate);
+
+return getCurrentXHeightInherited();
+}
+
void SvgNode::setId(const OUString* pfId)
{
if(mpId)
diff --git a/svgio/source/svgreader/svgtools.cxx
b/svgio/source/svgreader/svgtools.cxx
index 2b89f0d..7607a43 100644
--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@@ -159,11 +159,11 @@ namespace svgio
{
case Unit_em:
{
-return mfNumber * rInfoProvider.getCurrentFontSize();
+
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/formulacell.hxx |9
sc/source/core/data/formulacell.cxx | 399 ++--
2 files changed, 208 insertions(+), 200 deletions(-)
New commits:
commit f0be3d0ed15179b82910041b827a6313be367a02
Author: Kohei Yoshida
Date: Thu Jun 27 14:57:32 2013 -0400
Some attempt to clean ScFormulaCell::UpdateReference() a bit.
This method is still a monster, however...
Change-Id: I4aaa2d20c8ae6132a75c7c92c0a1b58882d8a261
diff --git a/sc/inc/formulacell.hxx b/sc/inc/formulacell.hxx
index b724d02..1f9b960 100644
--- a/sc/inc/formulacell.hxx
+++ b/sc/inc/formulacell.hxx
@@ -176,11 +176,10 @@ public:
boolHasRelNameReference() const;
boolHasColRowName() const;
-boolUpdateReference(UpdateRefMode eUpdateRefMode,
-const ScRange& r,
-SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-ScDocument* pUndoDoc = NULL,
-const ScAddress* pUndoCellPos = NULL );
+bool UpdateReference(
+UpdateRefMode eUpdateRefMode, const ScRange& rRange,
+SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScDocument* pUndoDoc = NULL,
+const ScAddress* pUndoCellPos = NULL );
voidTransposeReference();
voidUpdateTranspose( const ScRange& rSource, const ScAddress&
rDest,
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 96efc40..224bbea 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -46,8 +46,10 @@
#include "formulagroup.hxx"
#include "listenercontext.hxx"
#include "types.hxx"
+#include "scopetools.hxx"
#include
+#include
using namespace formula;
@@ -2039,15 +2041,14 @@ bool ScFormulaCell::HasColRowName() const
return (pCode->GetNextColRowName() != NULL);
}
-bool ScFormulaCell::UpdateReference(UpdateRefMode eUpdateRefMode,
-const ScRange& r,
-SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
-ScDocument* pUndoDoc, const ScAddress*
pUndoCellPos )
+bool ScFormulaCell::UpdateReference(
+UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW
nDy, SCsTAB nDz,
+ScDocument* pUndoDoc, const ScAddress* pUndoCellPos )
{
bool bCellStateChanged = false;
-SCCOL nCol1 = r.aStart.Col();
-SCROW nRow1 = r.aStart.Row();
+SCCOL nCol1 = rRange.aStart.Col();
+SCROW nRow1 = rRange.aStart.Row();
SCCOL nCol = aPos.Col();
SCROW nRow = aPos.Row();
SCTAB nTab = aPos.Tab();
@@ -2055,15 +2056,21 @@ bool ScFormulaCell::UpdateReference(UpdateRefMode
eUpdateRefMode,
if ( pUndoCellPos )
aUndoPos = *pUndoCellPos;
ScAddress aOldPos( aPos );
-bool bIsInsert = (eUpdateRefMode == URM_INSDEL &&
-nDx >= 0 && nDy >= 0 && nDz >= 0);
-if (eUpdateRefMode == URM_INSDEL && r.In( aPos ))
+bool bIsInsert = (eUpdateRefMode == URM_INSDEL && nDx >= 0 && nDy >= 0 &&
nDz >= 0);
+
+if (eUpdateRefMode == URM_INSDEL && rRange.In(aPos))
{
+// This formula cell itself is being shifted during cell range
+// insertion or deletion. Update its position.
aPos.Move(nDx, nDy, nDz);
bCellStateChanged = aPos != aOldPos;
}
-else if ( r.In( aPos ) )
+else if (rRange.In(aPos))
{
+// The cell is being moved or copied to a new position. I guess the
+// position has been updated prior to this call? Determine
+// its original position before the move which will be used to adjust
+// relative references later.
aOldPos.Set( nCol - nDx, nRow - nDy, nTab - nDz );
}
@@ -2072,6 +2079,7 @@ bool ScFormulaCell::UpdateReference(UpdateRefMode
eUpdateRefMode,
bool bOnRefMove = false;
if ( !pDocument->IsClipOrUndo() )
{
+// Check presence of any references or column row names.
pCode->Reset();
bHasRefs = (pCode->GetNextReferenceRPN() != NULL);
if ( !bHasRefs || eUpdateRefMode == URM_COPY )
@@ -2082,218 +2090,219 @@ bool ScFormulaCell::UpdateReference(UpdateRefMode
eUpdateRefMode,
}
bOnRefMove = pCode->IsRecalcModeOnRefMove();
}
-if( bHasRefs || bOnRefMove )
+
+if (!bHasRefs && !bOnRefMove)
+// This formula cell contains no references, nor needs recalculating
+// on reference update. Bail out.
+return bCellStateChanged;
+
+boost::scoped_ptr pOldCode;
+if (pUndoDoc)
+pOldCode.reset(pCode->Clone());
+
+ScRangeData* pRangeData = NULL;
+bool bValChanged = false;
+bool bRangeModified = false;// any range, not only shared formula
+bool bRefSizeChanged = false;
+
+if (bHasRefs)
{
-ScTokenArray* pOld = pUndoDoc ? pCode->Clone() : NULL;
-ScRangeData* pRangeData;
-
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 894d928dca44502bf7428fd27613e182c88ec1b2 Author: pje335_NL Date: Sun Jun 23 07:49:27 2013 +0200 Updated core Project: dictionaries b4f6881beba5ad08eee1be27020351d8b92396f9 diff --git a/dictionaries b/dictionaries index e69808e..b4f6881 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit e69808eefb45d900195a1c6a29bb28d15917c81c +Subproject commit b4f6881beba5ad08eee1be27020351d8b92396f9 ___ 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' - dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9a776b0cf3700d7a478a23dad04b37ed336d3df8 Author: pje335_NL Date: Sun Jun 23 07:49:27 2013 +0200 Updated core Project: dictionaries 819d3e52131cfca7a3bb72e1e91fece30ceef41a diff --git a/dictionaries b/dictionaries index 9ec57a8..819d3e5 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 9ec57a8df294f82d2b038ada757e3924406d7719 +Subproject commit 819d3e52131cfca7a3bb72e1e91fece30ceef41a ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-basic-ide-completion-and-other-bits' - basctl/source
basctl/source/basicide/baside2.hxx |1 +
basctl/source/basicide/baside2b.cxx | 11 ---
2 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit 3168fe1be0b45ea418f97430004fedf695f85a15
Author: Gergo Mocsi
Date: Thu Jun 27 20:23:48 2013 +0200
GSOC work week4, CodeCompleteListBox appearance fix
This patch allows the pop-up CodeCompleteListBox to appear under the cursor.
It's size is fixed:150x150.
Also, I've fixed a bug in extracting the current variable name.
Change-Id: Id98cb1c29be72af07a25aac3d51561f072bf103e
diff --git a/basctl/source/basicide/baside2.hxx
b/basctl/source/basicide/baside2.hxx
index 774995d..179a223 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -42,6 +42,7 @@ class SvxSearchItem;
#include
#include
#include "vcl/lstbox.hxx"
+#include "vcl/scrbar.hxx"
#include
#include
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index 5d9daf2..1804888 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -502,7 +502,8 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
sal_uLong nLine = aSel.GetStart().GetPara();
OUString aLine( pEditEngine->GetText( nLine ) ); // the line being
modified
-OUString aStr = (aLine.lastIndexOf(" ") == -1 ?
aLine.replaceFirst(".","") : aLine.copy(aLine.lastIndexOf("
")).replaceFirst(".",""));
+OUString aStr = aLine.copy( std::max(aLine.lastIndexOf(" "),
aLine.lastIndexOf("\t"))+1 );
+
for( unsigned int j = 0; j < aCodeCompleteCache.size(); ++j)
{
if( aCodeCompleteCache[j].sVarName == aStr )
@@ -516,13 +517,17 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt )
{
Sequence< Reference< reflection::XIdlMethod > >
aMethods = xClass->getMethods();
aListBox->Clear();
+
+Rectangle aRect = ( (TextEngine*) GetEditEngine()
)->PaMtoEditCursor(aSel.GetEnd() , false);
+aListBox->SetPosPixel( aRect.TopLeft() );
+aListBox->SetSizePixel( Size(150,150) );
+
for(sal_Int32 i = 0; i < aMethods.getLength(); ++i)
{
aListBox->InsertEntry(
OUString(aMethods[i]->getName()) );
SAL_WARN("method information",
aMethods[i]->getName());
}
-aListBox->EnableAutoSize(true);
-aListBox->Show();
+
aListBox->GetFocus();
aListBox->ToggleDropDown();
}
___
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 |4 +---
sw/source/core/doc/swtblfmt.cxx | 19 ++-
2 files changed, 3 insertions(+), 20 deletions(-)
New commits:
commit b39608c64cd67190f23b6e51f156ddb5e4458ddd
Author: Alex Ivan
Date: Thu Jun 27 21:25:13 2013 +0300
Use inherited methods in SwTableFmt
Removed methods of SwTableFmt which corresponded in name and
functionality with those defined in base class SwFmt.
Change-Id: I3a70194b2f2d8c50a090ae201b8e65cf8556cd16
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index a068fb9..ef66a10 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
class SwDoc;
@@ -90,12 +91,9 @@ public:
void SetCollapsingBorders( const sal_Bool& rNew );
void SetShadow( const SvxShadowItem& rNew );
-const SvxFmtBreakItem& GetBreak() const;
-const SwFmtPageDesc& GetPageDesc() const;
const SvxFmtKeepItem& GetKeepWithNextPara() const;
sal_Bool GetLayoutSplit() const;
sal_Bool GetCollapsingBorders() const;
-const SvxShadowItem& GetShadow() const;
TYPEINFO(); // Already in base class Content.
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index c3fcd1a..3421db4 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -116,24 +116,14 @@ void SwTableFmt::SetShadow( const SvxShadowItem& rNew )
SetFmtAttr( rNew );
}
-const SvxFmtBreakItem& SwTableFmt::GetBreak() const
-{
-return static_cast( GetFmtAttr( RES_BREAK ) );
-}
-
-const SwFmtPageDesc& SwTableFmt::GetPageDesc() const
-{
-return static_cast( GetFmtAttr( RES_PAGEDESC ) );
-}
-
const SvxFmtKeepItem& SwTableFmt::GetKeepWithNextPara() const
{
-return static_cast( GetFmtAttr( RES_KEEP ) );
+return SwFmt::GetKeep();
}
sal_Bool SwTableFmt::GetLayoutSplit() const
{
-return (static_cast( GetFmtAttr( RES_LAYOUT_SPLIT
) )).GetValue();
+return SwFmt::GetLayoutSplit().GetValue();
}
sal_Bool SwTableFmt::GetCollapsingBorders() const
@@ -141,11 +131,6 @@ sal_Bool SwTableFmt::GetCollapsingBorders() const
return (static_cast( GetFmtAttr(
RES_COLLAPSING_BORDERS ) )).GetValue();
}
-const SvxShadowItem& SwTableFmt::GetShadow() const
-{
-return static_cast( GetFmtAttr( RES_SHADOW ) );
-}
-
SwTableLineFmt::SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
___
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/tool/compiler.cxx | 183 ++-
1 file changed, 86 insertions(+), 97 deletions(-)
New commits:
commit 50052ef0c677f9af8f89f8b671ceef5b4a378dd0
Author: Kohei Yoshida
Date: Thu Jun 27 14:03:27 2013 -0400
Reduce indentation to a sane level.
Change-Id: I2940ca21f8cee0d780e58cfcda50705be61568d9
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index 759eef2..4748aef 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4265,126 +4265,115 @@ ScRangeData*
ScCompiler::UpdateReference(UpdateRefMode eUpdateRefMode,
}
return pRangeData;
}
-else
+
+ScRangeData* pRangeData = NULL;
+ScToken* t;
+pArr->Reset();
+while( (t = static_cast(pArr->GetNextReferenceOrName())) != NULL
)
{
-ScRangeData* pRangeData = NULL;
-ScToken* t;
-pArr->Reset();
-while( (t = static_cast(pArr->GetNextReferenceOrName())) !=
NULL )
+if( t->GetOpCode() == ocName )
{
-if( t->GetOpCode() == ocName )
+ScRangeData* pName = GetRangeData( *t);
+if (pName && pName->HasType(RT_SHAREDMOD))
{
-ScRangeData* pName = GetRangeData( *t);
-if (pName && pName->HasType(RT_SHAREDMOD))
-{
-pRangeData = pName; // maybe need a replacement of
shared with own code
-rChanged = true;
-}
-}
-else if( t->GetType() != svIndex ) // it may be a DB area!!!
-{
-t->CalcAbsIfRel( rOldPos );
-switch (t->GetType())
-{
-case svExternalSingleRef:
-case svExternalDoubleRef:
-// External references never change their positioning
-// nor point to parts that will be removed or expanded.
-// In fact, calling ScRefUpdate::Update() for URM_MOVE
-// may have negative side effects. Simply adapt
-// relative references to the new position.
-t->CalcRelFromAbs( aPos);
-break;
-case svSingleRef:
-{
-if ( ScRefUpdate::Update( pDoc, eUpdateRefMode,
-aPos, r, nDx, nDy, nDz,
-SingleDoubleRefModifier(
-t->GetSingleRef()).Ref())
-!= UR_NOTHING)
-rChanged = true;
-}
-break;
-default:
-{
-ScComplexRefData& rRef = t->GetDoubleRef();
-SCCOL nCols = rRef.Ref2.nCol - rRef.Ref1.nCol;
-SCROW nRows = rRef.Ref2.nRow - rRef.Ref1.nRow;
-SCTAB nTabs = rRef.Ref2.nTab - rRef.Ref1.nTab;
-if ( ScRefUpdate::Update( pDoc, eUpdateRefMode,
-aPos, r, nDx, nDy, nDz,
-t->GetDoubleRef()) != UR_NOTHING)
-{
-rChanged = true;
-if (rRef.Ref2.nCol - rRef.Ref1.nCol != nCols ||
-rRef.Ref2.nRow - rRef.Ref1.nRow !=
nRows ||
-rRef.Ref2.nTab - rRef.Ref1.nTab !=
nTabs)
-rRefSizeChanged = true;
-}
-}
-}
+pRangeData = pName; // maybe need a replacement of shared
with own code
+rChanged = true;
}
}
-pArr->Reset();
-while ( (t = static_cast(pArr->GetNextReferenceRPN())) !=
NULL )
+else if( t->GetType() != svIndex ) // it may be a DB area!!!
{
-if ( t->GetRef() != 1 )
+t->CalcAbsIfRel( rOldPos );
+switch (t->GetType())
{
-}
-else
-{ // if nRefCnt>1 it's already updated in token code
-if ( t->GetType() == svSingleRef )
+case svExternalSingleRef:
+case svExternalDoubleRef:
+// External references never change their positioning
+// nor point to parts that will be removed or expanded.
+// In fact, calling ScRefUpdate::Update() for URM_MOVE
+// may have negative side effects. Simply adapt
+// relative references to the new position.
+t->CalcRelFromAbs( aPos);
+break;
+
[Libreoffice-commits] core.git: 2 commits - connectivity/source unotools/source
connectivity/source/commontools/dbconversion.cxx | 101 +--
unotools/source/misc/datetime.cxx|7 +
2 files changed, 49 insertions(+), 59 deletions(-)
New commits:
commit efe0e8b8116e1ba60acb00aa73123ffb060e3c90
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
diff --git a/connectivity/source/commontools/dbconversion.cxx
b/connectivity/source/commontools/dbconversion.cxx
index 81248d5..bf36c93 100644
--- a/connectivity/source/commontools/dbconversion.cxx
+++ b/connectivity/source/commontools/dbconversion.cxx
@@ -28,6 +28,7 @@
#include
#include
#include
+#include
#include
#include
@@ -55,6 +56,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;
@@ -68,7 +70,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,
@@ -81,7 +83,7 @@ namespace dbtools
return OUString::createFromAscii(s);
}
//--
-OUString DBTypeConversion::toTimeStringS(const Time& rTime)
+OUString DBTypeConversion::toTimeStringS(const utl::Time& rTime)
{
std::ostringstream ostr;
using std::setw;
@@ -92,7 +94,7 @@ namespace dbtools
return OUString::createFromAscii(ostr.str().c_str());
}
//--
-OUString DBTypeConversion::toTimeString(const Time& rTime)
+OUString DBTypeConversion::toTimeString(const utl::Time& rTime)
{
std::ostringstream ostr;
using std::setw;
@@ -104,19 +106,19 @@ namespace dbtools
return OUString::createFromAscii(ostr.str().c_str());
}
//--
-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);
@@ -124,9 +126,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;
@@ -136,7 +138,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) +
@@ -144,7 +146,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;
@@ -162,7 +164,7 @@ namespace dbtools
}
//--
-sal_Int32 DBTypeConversion::getMsFromTime(const Time& rVal)
+sal_Int32 DBTypeConversion::getMsFromTime(const utl:
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/source
sc/source/core/data/formulacell.cxx |1
sc/source/core/tool/compiler.cxx| 56
2 files changed, 1 insertion(+), 56 deletions(-)
New commits:
commit 2deeac0fd6a47981292d9045d9c5321b8078bfaa
Author: Kohei Yoshida
Date: Thu Jun 27 13:52:50 2013 -0400
Remove this old attempt of shared formula code.
We'll devise a brand-new solution for this.
Change-Id: Ib4e04b3ce0b5d1ab511aecfab35f81e43dd4edf9
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 9fc515d..96efc40 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2055,7 +2055,6 @@ bool ScFormulaCell::UpdateReference(UpdateRefMode
eUpdateRefMode,
if ( pUndoCellPos )
aUndoPos = *pUndoCellPos;
ScAddress aOldPos( aPos );
-// bool bPosChanged = false; // if this cell was moved
bool bIsInsert = (eUpdateRefMode == URM_INSDEL &&
nDx >= 0 && nDy >= 0 && nDz >= 0);
if (eUpdateRefMode == URM_INSDEL && r.In( aPos ))
diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx
index afd50e1..759eef2 100644
--- a/sc/source/core/tool/compiler.cxx
+++ b/sc/source/core/tool/compiler.cxx
@@ -4267,14 +4267,6 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode
eUpdateRefMode,
}
else
{
-/*
- * Set SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE to 1 if we wanted to preserve as
- * many shared formulas as possible instead of replacing them with direct code.
- * Note that this may produce shared formula usage Excel doesn't understand,
- * which would have to be adapted for in the export filter. Advisable as a long
- * term goal, since it could decrease memory footprint.
- */
-#define SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE 0
ScRangeData* pRangeData = NULL;
ScToken* t;
pArr->Reset();
@@ -4286,9 +4278,7 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode
eUpdateRefMode,
if (pName && pName->HasType(RT_SHAREDMOD))
{
pRangeData = pName; // maybe need a replacement of
shared with own code
-#if ! SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
rChanged = true;
-#endif
}
}
else if( t->GetType() != svIndex ) // it may be a DB area!!!
@@ -4335,24 +4325,11 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode
eUpdateRefMode,
}
}
}
-#if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-bool bEasyShared, bPosInRange;
-if ( !pRangeData )
-bEasyShared = bPosInRange = false;
-else
-{
-bEasyShared = true;
-bPosInRange = r.In( eUpdateRefMode == URM_MOVE ? aPos : rOldPos );
-}
-#endif
pArr->Reset();
while ( (t = static_cast(pArr->GetNextReferenceRPN())) !=
NULL )
{
if ( t->GetRef() != 1 )
{
-#if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-bEasyShared = false;
-#endif
}
else
{ // if nRefCnt>1 it's already updated in token code
@@ -4374,15 +4351,6 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode
eUpdateRefMode,
)
rChanged = true;
}
-#if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-if ( bEasyShared )
-{
-const ScSingleRefData& rSRD = aMod.Ref().Ref1;
-ScAddress aRef( rSRD.nCol, rSRD.nRow, rSRD.nTab );
-if ( r.In( aRef ) != bPosInRange )
-bEasyShared = false;
-}
-#endif
}
else
{
@@ -4408,35 +4376,13 @@ ScRangeData* ScCompiler::UpdateReference(UpdateRefMode
eUpdateRefMode,
rRef.Ref2.nTab - rRef.Ref1.nTab != nTabs)
{
rRefSizeChanged = true;
-#if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-bEasyShared = false;
-#endif
}
}
}
-#if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-if ( bEasyShared )
-{
-ScRange aRef( rRef.Ref1.nCol, rRef.Ref1.nRow,
-rRef.Ref1.nTab, rRef.Ref2.nCol, rRef.Ref2.nRow,
-rRef.Ref2.nTab );
-if ( r.In( aRef ) != bPosInRange )
-bEasyShared = false;
-}
-#endif
}
}
}
-#if SC_PRESERVE_SHARED_FORMULAS_IF_POSSIBLE
-if ( pRangeData )
-{
-if ( bEasyShared )
-pRangeData = 0;
-else
-rChanged = true;
[ABANDONED] replace ShapeList::getNextShape with STL like iterator.
mhofmann has abandoned this change. Change subject: replace ShapeList::getNextShape with STL like iterator. .. Patch Set 1: Abandoned Also after a clean rebuild, I can not reproduce the crash. The performance improvement is already merged and this change is more a style fix. As it seems it is unstable, better abandon the change. -- To view, visit https://gerrit.libreoffice.org/4191 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I840c76201805f46b4d8ea7ea4e4fa4904eb51c79 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: mhofmann Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Noel Power Gerrit-Reviewer: Norbert Thiebaud Gerrit-Reviewer: mhofmann ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: bin/lo-commit-stat
bin/lo-commit-stat |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 001adf630c650b22f2535cc76f90b426a53ad754
Author: Thorsten Behrens
Date: Thu Jun 27 19:37:53 2013 +0200
Seems people prefer enumerations in the wiki for bugs.
Change-Id: I8b2cc796e04091cfddcb7a5c3a57beafe59c7b40
diff --git a/bin/lo-commit-stat b/bin/lo-commit-stat
index a965815..fadca4e 100755
--- a/bin/lo-commit-stat
+++ b/bin/lo-commit-stat
@@ -411,7 +411,7 @@ sub print_bugs()
$authors = " [" . join (", ", keys %{$pbugs->{$bug}{'author'}}) .
"]";
}
-$bug =~ s/(.*)\#(.*)/* {{$1|$2}}/ if ($wiki);
+$bug =~ s/(.*)\#(.*)/# {{$1|$2}}/ if ($wiki);
print $log $bug, " ", $summary, $authors, "\n";
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 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 f237f1a616d973397511575c1eb033731d6007f7
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
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index cd058ab..2abbf09 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: offapi/com oox/source reportdesign/source svx/source toolkit/source vcl/source vcl/workben wizards/com xmloff/source
offapi/com/sun/star/awt/ImageScaleMode.idl |
10 ++--
oox/source/ole/axcontrol.cxx |
8 +++---
reportdesign/source/core/api/ImageControl.cxx|
6 ++---
reportdesign/source/filter/xml/xmlHelper.cxx |
4 +--
reportdesign/source/filter/xml/xmlImage.cxx |
4 +--
svx/source/form/formcontrolfactory.cxx |
2 -
toolkit/source/awt/animatedimagespeer.cxx|
4 +--
toolkit/source/awt/vclxtoolkit.cxx |
4 +--
toolkit/source/awt/vclxwindows.cxx |
8 +++---
toolkit/source/controls/animatedimages.cxx |
12 +-
toolkit/source/controls/unocontrols.cxx |
8 +++---
vcl/source/control/imgctrl.cxx |
10
vcl/source/control/throbber.cxx |
4 +--
vcl/workben/svpclient.cxx|
2 -
wizards/com/sun/star/wizards/document/DatabaseControl.java |
2 -
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java |
2 -
xmloff/source/forms/formenums.cxx|
10
17 files changed, 48 insertions(+), 52 deletions(-)
New commits:
commit 949f97ba480f96c7892602f3208467ac925fab15
Author: Ariel Constenla-Haile
Date: Sun Dec 23 18:20:18 2012 +
Resolves: #i121162# ImageScaleMode constants should be in UPPERCASE
(cherry picked from commit 734b532fb77d2d5be7eb7becb6720dbd7b3d8978)
Conflicts:
offapi/com/sun/star/awt/ImageScaleMode.idl
oox/source/ole/axcontrol.cxx
reportdesign/source/filter/xml/xmlHelper.cxx
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
Change-Id: Ib5fa7b82edddb809129a4e5619a20ca7a7b2e38a
diff --git a/offapi/com/sun/star/awt/ImageScaleMode.idl
b/offapi/com/sun/star/awt/ImageScaleMode.idl
index c0f69d3..cb05a16 100644
--- a/offapi/com/sun/star/awt/ImageScaleMode.idl
+++ b/offapi/com/sun/star/awt/ImageScaleMode.idl
@@ -20,34 +20,30 @@
#ifndef __com_sun_star_awt_ImageScaleMode_idl__
#define __com_sun_star_awt_ImageScaleMode_idl__
-
module com { module sun { module star { module awt {
-
/** defines modes how an image displayed in a given area should be scaled to
fit this area
*/
constants ImageScaleMode
{
/** specifies that no scaling should happen at all
*/
-const short None = 0;
+const short NONE = 0;
/** specifies that the image should be scaled up or down to the size of
the surrounding area isotropically,
i.e. by keeping its aspect ratio.
*/
-const short Isotropic = 1;
+const short ISOTROPIC = 1;
/** specifies that the image should be scaled up or down to the size of
the surrounding area anisotropically.
The image will finally cover all of the surrounding area, but its
dimensions might be distorted.
*/
-const short Anisotropic = 2;
+const short ANISOTROPIC = 2;
};
-
}; }; }; };
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 2f777b4..35a0ea5 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -508,12 +508,12 @@ void ControlConverter::convertAxPicture( PropertyMap&
rPropMap, const StreamData
convertPicture( rPropMap, rPicData );
// picture scale mode
-sal_Int16 nScaleMode = ImageScaleMode::None;
+sal_Int16 nScaleMode = ImageScaleMode::NONE;
switch( nPicSizeMode )
{
-case AX_PICSIZE_CLIP: nScaleMode = ImageScaleMode::None;
break;
-case AX_PICSIZE_STRETCH:nScaleMode = ImageScaleMode::Anisotropic;
break;
-case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::Isotropic;
break;
+case AX_PICSIZE_CLIP: nScaleMode = ImageScaleMode::NONE;
break;
+case AX_PICSIZE_STRETCH:nScaleMode = ImageScaleMode::ANISOTROPIC;
break;
+case AX_PICSIZE_ZOOM: nScaleMode = ImageScaleMode::ISOTROPIC;
break;
default:OSL_FAIL( "ControlConverter::convertAxPicture - unknown
picture size mode" );
}
rPropMap.setProperty( PROP_ScaleMode, nScaleMode );
diff --git a/reportdesign/source/core/api/ImageControl.cxx
b/reportdesign/source/core/api/ImageControl.cxx
index 5971aeb..b159e6c 100644
--- a/reportdesign/source/core/api/ImageControl.cxx
+++ b/reportdesign/source/core/api/ImageControl.cxx
@@ -118,7 +118,7 @@ OImageControl::OImageControl(uno::Reference<
uno::XComponentContext > const
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - af/7166782e8c7ecd0b44aa184d7228a405c1ff46
af/7166782e8c7ecd0b44aa184d7228a405c1ff46 |1 + 1 file changed, 1 insertion(+) New commits: commit c7e0e233fabda2a5885b3b1a22bda8fb89ecea0d Author: Caolán McNamara Date: Thu Jun 27 17:12:20 2013 +0100 Notes added by 'git notes add' diff --git a/af/7166782e8c7ecd0b44aa184d7228a405c1ff46 b/af/7166782e8c7ecd0b44aa184d7228a405c1ff46 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/af/7166782e8c7ecd0b44aa184d7228a405c1ff46 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PUSHED] Fix for broken dutch spell checker fdo#65994 and fdo#63033
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4451 Approvals: Andras Timar: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4451 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I522bb85cfbb9330439d4ea47901695d2bf78 Gerrit-PatchSet: 4 Gerrit-Project: dictionaries Gerrit-Branch: master Gerrit-Owner: Thomas van der meulen Gerrit-Reviewer: Andras Timar ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4e7ab6e525d7ad4078786796267c2fa37d7f7ca8 Author: pje335_NL Date: Sun Jun 23 07:49:27 2013 +0200 Updated core Project: dictionaries 92a907ab17814a8e08ab787745fefb85ed00d3f3 Fix for broken dutch spell checker fdo#65994 and fdo#63033 Change-Id: I522bb85cfbb9330439d4ea47901695d2bf78 Reviewed-on: https://gerrit.libreoffice.org/4451 Reviewed-by: Andras Timar Tested-by: Andras Timar diff --git a/dictionaries b/dictionaries index aab14d8..92a907a 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit aab14d898ac002d5292e0610c433e667f99610fa +Subproject commit 92a907ab17814a8e08ab787745fefb85ed00d3f3 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 73/4b532fb77d2d5be7eb7becb6720dbd7b3d8978
73/4b532fb77d2d5be7eb7becb6720dbd7b3d8978 |1 + 1 file changed, 1 insertion(+) New commits: commit 6d1b5b114f29d73e64e18505710212581e5f33c5 Author: Caolán McNamara Date: Thu Jun 27 17:09:54 2013 +0100 Notes added by 'git notes add' diff --git a/73/4b532fb77d2d5be7eb7becb6720dbd7b3d8978 b/73/4b532fb77d2d5be7eb7becb6720dbd7b3d8978 new file mode 100644 index 000..114d2eb --- /dev/null +++ b/73/4b532fb77d2d5be7eb7becb6720dbd7b3d8978 @@ -0,0 +1 @@ +merged as: 949f97ba480f96c7892602f3208467ac925fab15 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-3-6-7' - editeng/source
editeng/source/editeng/impedit3.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 0211e1912c93247ccbf4e28ea344aab01d0eadc9
Author: Jan Holesovsky
Date: Mon Feb 25 14:46:21 2013 +0100
fdo#55931, fdo#57956: Fix both autofit and stretched width.
This rewrites commit fa694a21b806ed7837c1337ec49a4b299c478393 (fix of
fdo#55931), and fixes it a better way.
Change-Id: I9ac0c78294e6a9c510c12b22547564b736416131
Reviewed-on: https://gerrit.libreoffice.org/4538
Reviewed-by: Björn Michaelsen
Tested-by: Björn Michaelsen
Reviewed-by: Thorsten Behrens
Tested-by: Thorsten Behrens
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 9f1a955..21c4420 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2647,7 +2647,13 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode,
sal_uInt16 nPos, SvxFont& rF
// ugly on the screen!
OutputDevice* pDev = pOut ? pOut : GetRefDevice();
rFont.SetPhysFont( pDev );
-Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
+FontMetric aMetric( pDev->GetFontMetric() );
+
+// Set the font as we want it to look like & reset the Propr attribute
+// so that it is not counted twice.
+Size aRealSz( aMetric.GetSize() );
+rFont.SetPropr( 100 );
+
if ( aStatus.DoStretch() )
{
if ( nStretchY != 100 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/uiconfig
filter/uiconfig/ui/pdfuserinterfacepage.ui |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit 62aec37627c30c56b4ec7c04bc194cabff6a3e14 Author: Caolán McNamara Date: Thu Jun 27 16:49:35 2013 +0100 use standard row spacing Change-Id: Icbdc1399d4abd9222c1b1fced68c1e3012b05020 diff --git a/filter/uiconfig/ui/pdfuserinterfacepage.ui b/filter/uiconfig/ui/pdfuserinterfacepage.ui index 3cc3fe2..5cdbb7ee 100644 --- a/filter/uiconfig/ui/pdfuserinterfacepage.ui +++ b/filter/uiconfig/ui/pdfuserinterfacepage.ui @@ -18,7 +18,7 @@ True False -6 +12 12 True @@ -37,6 +37,7 @@ True False +6 _Center window on screen @@ -147,6 +148,7 @@ True False +6 Hide _toolbar @@ -295,6 +297,8 @@ True False +6 +12 _All bookmark levels ___ 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/inc sc/Library_sc.mk sc/source
sc/Library_sc.mk |1
sc/inc/document.hxx |1
sc/inc/formulagroup.hxx | 30 ++-
sc/source/core/data/documen2.cxx |2
sc/source/core/data/formulacell.cxx |4
sc/source/core/inc/openclwrapper.hxx | 184 ---
sc/source/core/opencl/formulagroupcl.cxx | 287 +++
sc/source/core/opencl/openclwrapper.hxx | 184 +++
sc/source/core/tool/formulagroup.cxx | 228
sc/source/ui/app/scmod.cxx | 17 -
10 files changed, 546 insertions(+), 392 deletions(-)
New commits:
commit 943d4491300708b05e478690010a1209398aeabb
Author: Michael Meeks
Date: Thu Jun 27 16:49:41 2013 +0100
abstract out the FormulaGroupInterpreter more cleanly.
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 070aa37..7afd018 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -53,6 +53,7 @@ ifeq ($(ENABLE_OPENCL),TRUE)
$(eval $(call gb_Library_use_externals,sc,opencl))
$(eval $(call gb_Library_add_exception_objects,sc,\
+ sc/source/core/opencl/formulagroupcl \
sc/source/core/opencl/openclwrapper \
))
endif
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f123008..12cd7ff 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -417,6 +417,7 @@ private:
::std::set maSubTotalCells;
boolmbUseEmbedFonts;
+
public:
bool IsUsingEmbededFonts() { return mbUseEmbedFonts; }
void SetIsUsingEmbededFonts( bool bUse ) { mbUseEmbedFonts =
bUse; }
diff --git a/sc/inc/formulagroup.hxx b/sc/inc/formulagroup.hxx
index 55f6e09..e5839e4 100644
--- a/sc/inc/formulagroup.hxx
+++ b/sc/inc/formulagroup.hxx
@@ -30,19 +30,31 @@ struct FormulaGroupContext : boost::noncopyable
};
/**
- * All the vectorized formula calculation code should be collectd here.
+ * All the vectorized formula calculation code should be collected here.
+ *
+ * Abstract base class for formula group interpreters, and a factory.
*/
-class FormulaGroupInterpreter
+class SC_DLLPUBLIC FormulaGroupInterpreter
+{
+static FormulaGroupInterpreter *msInstance;
+ protected:
+FormulaGroupInterpreter() {}
+virtual ~FormulaGroupInterpreter() {}
+ public:
+static FormulaGroupInterpreter *getStatic();
+
+virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, const
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode) = 0;
+};
+
+/// Inherit from this for alternate formula group calculation approaches.
+class SC_DLLPUBLIC FormulaGroupInterpreterSoftware : public
FormulaGroupInterpreter
{
-ScDocument& mrDoc;
-ScAddress maTopPos;
-ScFormulaCellGroupRef mxGroup;
-ScTokenArray& mrCode;
public:
-FormulaGroupInterpreter(
-ScDocument& rDoc, const ScAddress& rTopPos, const
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode);
+FormulaGroupInterpreterSoftware() :
+FormulaGroupInterpreter() {}
+virtual ~FormulaGroupInterpreterSoftware() {}
-bool interpret();
+virtual bool interpret(ScDocument& rDoc, const ScAddress& rTopPos, const
ScFormulaCellGroupRef& xGroup, ScTokenArray& rCode);
};
}
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 3869f6e..6c520a0 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -86,6 +86,8 @@
#include "macromgr.hxx"
#include "formulacell.hxx"
#include "clipcontext.hxx"
+#include "interpre.hxx"
+#include "formulagroup.hxx"
using namespace com::sun::star;
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 48af974..c175010 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -3120,9 +3120,7 @@ bool ScFormulaCell::InterpretFormulaGroup()
GroupTokenConverter aConverter(aCode, *pDocument, *this);
if (!aConverter.convert(*pCode))
return false;
-
-sc::FormulaGroupInterpreter aInterpreter(*pDocument, aPos, xGroup, aCode);
-return aInterpreter.interpret();
+return sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument,
aPos, xGroup, aCode);
}
bool ScFormulaCell::InterpretInvariantFormulaGroup()
diff --git a/sc/source/core/opencl/formulagroupcl.cxx
b/sc/source/core/opencl/formulagroupcl.cxx
new file mode 100644
index 000..54fd8e8
--- /dev/null
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -0,0 +1,287 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include
+#include "formulagroup.hxx"
+#include "document.hxx"
+#include "formulacell.hxx"
+#include "tokenarray.hxx"
+#include "compiler
[Libreoffice-commits] core.git: dbaccess/source sfx2/source svx/source sw/source
dbaccess/source/ui/querydesign/LimitBox.cxx |3 ++-
sfx2/source/sidebar/SidebarToolBox.cxx|3 ++-
svx/source/dialog/pagectrl.cxx|3 ++-
svx/source/sidebar/possize/SidebarDialControl.cxx |3 ++-
svx/source/sidebar/text/SvxSBFontNameBox.cxx |4 ++--
sw/source/ui/config/optload.cxx |2 +-
sw/source/ui/frmdlg/cption.cxx|2 +-
sw/source/ui/misc/bookmark.cxx|2 +-
8 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 7a61efe4220e5f25a9f5809d5b928960bc30f115
Author: Caolán McNamara
Date: Thu Jun 27 16:28:44 2013 +0100
add missing VclBuilder::stringmap argument to some builder functions
Change-Id: I57e13920b4707ebe5b6a7149dbdbfc45593c0d9d
diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx
b/dbaccess/source/ui/querydesign/LimitBox.cxx
index b2d267e..52f436e 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -7,6 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include
#include "LimitBox.hxx"
#include "dbu_qry.hrc"
#include "moduledbu.hxx"
@@ -111,7 +112,7 @@ void LimitBox::LoadDefaultLimits()
}
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLimitBox( Window *pParent
)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeLimitBox( Window
*pParent, VclBuilder::stringmap & )
{
LimitBox* pBox = new LimitBox( pParent, WB_DROPDOWN | WB_VSCROLL );
return pBox;
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx
b/sfx2/source/sidebar/SidebarToolBox.cxx
index 345d360..8b0e899 100644
--- a/sfx2/source/sidebar/SidebarToolBox.cxx
+++ b/sfx2/source/sidebar/SidebarToolBox.cxx
@@ -23,6 +23,7 @@
#include "sfx2/sidebar/Theme.hxx"
#include "sfx2/sidebar/Tools.hxx"
+#include
#include
#include
#include
@@ -95,7 +96,7 @@ SidebarToolBox::SidebarToolBox (Window* pParentWindow)
#endif
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarToolBox(Window
*pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarToolBox(Window
*pParent, VclBuilder::stringmap &)
{
return new SidebarToolBox(pParent);
}
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index e4469cd..f0bee35 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
#include
#include
@@ -146,7 +147,7 @@ SvxPageWindow::~SvxPageWindow()
delete pFtBorder;
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window
*pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxPageWindow(Window
*pParent, VclBuilder::stringmap &)
{
return new SvxPageWindow(pParent);
}
diff --git a/svx/source/sidebar/possize/SidebarDialControl.cxx
b/svx/source/sidebar/possize/SidebarDialControl.cxx
index 82163dd..aacdbe9 100644
--- a/svx/source/sidebar/possize/SidebarDialControl.cxx
+++ b/svx/source/sidebar/possize/SidebarDialControl.cxx
@@ -18,6 +18,7 @@
*/
#include
+#include
#include
namespace svx { namespace sidebar {
@@ -28,7 +29,7 @@ SidebarDialControl::SidebarDialControl (Window* pParent,
WinBits nBits)
Init(GetOutputSizePixel());
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarDialControl(Window
*pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSidebarDialControl(Window
*pParent, VclBuilder::stringmap &)
{
return new SidebarDialControl(pParent, WB_TABSTOP);
}
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
index f5ca5c3..89910cc 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.cxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.cxx
@@ -24,7 +24,7 @@
#include
#include
#include
-
+#include
const static sal_uInt16 MAX_MRU_FONTNAME_ENTRIES = 5;
@@ -104,7 +104,7 @@ SvxSBFontNameBox::SvxSBFontNameBox( Window* pParent ) :
// StartListening( *SFX_APP() );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSBFontNameBox(Window
*pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxSBFontNameBox(Window
*pParent, VclBuilder::stringmap &)
{
return new SvxSBFontNameBox(pParent);
}
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 942c6b7..0bc1b8b 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -388,7 +388,7 @@ void SwCaptionPreview::Paint( const Rectangle& rRect )
DrawText( Point( 4, 6 ), maText );
}
-extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwCaptionPreview(Window*
pParent)
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwCaptionPreview(Window*
pParent, VclBuilder::stringmap &)
{
return new SwCaptionPreview(pParent);
}
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index b7bb316..3645a9c 100644
--- a/sw/source/ui/frmd
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc
sc/inc/column.hxx | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) New commits: commit e5e4f0249b7035ec4cf9373c86770e191e939660 Author: Kohei Yoshida Date: Thu Jun 27 11:44:22 2013 -0400 A little more detail in the method documentation. Change-Id: I0f25a8e660ff98d89965ff3428873dec43dbeda1 diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index fce1348..eef6442 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -305,11 +305,15 @@ public: * Update reference addresses in formula cell in response to mass cell * movement. * - * @param eUpdateRefMode update mode - insert/delete, copy, move, - * reorder... - * @param rRange range of cells that are about to be moved or copied. - * (TODO: find out what this range means for the reorder - * mode). + * @param eUpdateRefMode update mode - insert/delete, copy, or move. The + * reorder mode (which corresponds with the + * reordering of sheets) is not used with this + * method. + * + * @param rRange range of cells that are about to be moved for + * insert/delete/move modes. For copy mode, it's the + * destination range of cells that are about to be copied. + * * @param nDx moved by how many cells in the column direction. * @param nDy moved by how many cells in the row direction. * @param nDz moved by how many sheets in the sheet direction. ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - basctl/source
basctl/source/basicide/basobj2.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 61027ca6eb450fb20bfe9209ba180fe0606baeab
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
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 );
commit eebf0a6dfa9490a9f59a4e392517a0c93d3da1df
Author: Noel Power
Date: Thu Jun 27 16:26:29 2013 +0100
Revert "tweak object catalog to improve switching modules in large
Libraries"
This reverts commit 21eeeccfa64a4c03554c1fe3715d38c1695245ab.
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index 1b1689b..7e62558 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,23 +405,13 @@ Sequence< OUString > GetMethodNames( const
ScriptDocument& rDocument, const OUSt
OUString aOUSource;
if ( rDocument.getModule( rLibName, rModName, aOUSource ) )
{
-BasicManager* pBasMgr = rDocument.getBasicManager();
-StarBASIC* pSb = pBasMgr ? pBasMgr->GetLib( rLibName ) : NULL;
-SbModule* pMod = pSb ? pSb->FindModule( rModName ) : NULL;
-
-SbModuleRef xModule;
-if ( !pMod )
-{
-xModule = new SbModule( rModName );
-xModule->SetSource32( aOUSource );
-pMod = xModule;
-}
-
-sal_uInt16 nCount = pMod->GetMethods()->Count();
+SbModuleRef xModule = new SbMod
[Libreoffice-commits] core.git: icon-themes/galaxy include/sfx2 sfx2/source
icon-themes/galaxy/res/otg_96_8.png |binary
icon-themes/galaxy/res/otp_96_8.png |binary
icon-themes/galaxy/res/ots_96_8.png |binary
icon-themes/galaxy/res/ott_96_8.png |binary
include/sfx2/templateabstractview.hxx |4 ++--
sfx2/source/appl/sfx.src |8
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 5504e8d78173af2b4a9fbcbcd59df5add839db3b
Author: Stefan Knorr
Date: Mon Jun 17 17:41:27 2013 +0200
Use larger (96*96) icons for templates
Change-Id: I0a7b88de53d47a935d6290c52ba8749d08187643
Reviewed-on: https://gerrit.libreoffice.org/4458
Reviewed-by: Bosdonnat Cedric
Tested-by: Bosdonnat Cedric
diff --git a/icon-themes/galaxy/res/otg_96_8.png
b/icon-themes/galaxy/res/otg_96_8.png
new file mode 100644
index 000..4a18706
Binary files /dev/null and b/icon-themes/galaxy/res/otg_96_8.png differ
diff --git a/icon-themes/galaxy/res/otp_96_8.png
b/icon-themes/galaxy/res/otp_96_8.png
new file mode 100644
index 000..500358d
Binary files /dev/null and b/icon-themes/galaxy/res/otp_96_8.png differ
diff --git a/icon-themes/galaxy/res/ots_96_8.png
b/icon-themes/galaxy/res/ots_96_8.png
new file mode 100644
index 000..5eaa1bc
Binary files /dev/null and b/icon-themes/galaxy/res/ots_96_8.png differ
diff --git a/icon-themes/galaxy/res/ott_96_8.png
b/icon-themes/galaxy/res/ott_96_8.png
new file mode 100644
index 000..f7acf9f
Binary files /dev/null and b/icon-themes/galaxy/res/ott_96_8.png differ
diff --git a/include/sfx2/templateabstractview.hxx
b/include/sfx2/templateabstractview.hxx
index 5f1eca6..d101aff 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -17,10 +17,10 @@
//template thumbnail item defines
#define TEMPLATE_ITEM_MAX_WIDTH 160
-#define TEMPLATE_ITEM_MAX_HEIGHT 140
+#define TEMPLATE_ITEM_MAX_HEIGHT 148
#define TEMPLATE_ITEM_PADDING 5
#define TEMPLATE_ITEM_MAX_TEXT_LENGTH 20
-#define TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT 88
+#define TEMPLATE_ITEM_THUMBNAIL_MAX_HEIGHT 96
//template thumbnail height with a subtitle
#define TEMPLATE_ITEM_MAX_HEIGHT_SUB 160
diff --git a/sfx2/source/appl/sfx.src b/sfx2/source/appl/sfx.src
index dce02d7..3120fb5 100644
--- a/sfx2/source/appl/sfx.src
+++ b/sfx2/source/appl/sfx.src
@@ -41,22 +41,22 @@ String STR_PASSWD
Bitmap ( SFX_THUMBNAIL_TEXT )
{
-File = "ott_48_8.png";
+File = "ott_96_8.png";
};
Bitmap ( SFX_THUMBNAIL_SHEET )
{
-File = "ots_48_8.png";
+File = "ots_96_8.png";
};
Bitmap ( SFX_THUMBNAIL_PRESENTATION )
{
-File = "otp_48_8.png";
+File = "otp_96_8.png";
};
Bitmap ( SFX_THUMBNAIL_DRAWING )
{
-File = "otg_48_8.png";
+File = "otg_96_8.png";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/formula-core-rework' - sc/inc sc/source
sc/inc/column.hxx | 25 +
sc/source/core/data/column.cxx | 27 ---
sc/source/core/data/table1.cxx |8 +++-
3 files changed, 36 insertions(+), 24 deletions(-)
New commits:
commit e51a3433290912a1d491f3fac8109edbae98986b
Author: Kohei Yoshida
Date: Thu Jun 27 11:29:46 2013 -0400
ScColumn::UpdateReference to take ScRange as a parameter.
To reduce the number of parameters by 5. Also add *some* description
of this method esp what the range means when updating formula references.
Change-Id: Iccde58d6ecde6f0c09c111cf9b4f551ce392effb
diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index c0dea00..fce1348 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -301,10 +301,27 @@ public:
voidResetChanged( SCROW nStartRow, SCROW nEndRow );
-boolUpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
- SCCOL nCol2, SCROW nRow2, SCTAB nTab2,
- SCsCOL nDx, SCsROW nDy, SCsTAB nDz,
- ScDocument* pUndoDoc = NULL );
+/**
+ * Update reference addresses in formula cell in response to mass cell
+ * movement.
+ *
+ * @param eUpdateRefMode update mode - insert/delete, copy, move,
+ * reorder...
+ * @param rRange range of cells that are about to be moved or copied.
+ * (TODO: find out what this range means for the reorder
+ * mode).
+ * @param nDx moved by how many cells in the column direction.
+ * @param nDy moved by how many cells in the row direction.
+ * @param nDz moved by how many sheets in the sheet direction.
+ * @param pUndoDoc undo document instance.
+ *
+ * @return true if reference of at least one formula cell has been
+ * updated, false otherwise.
+ */
+bool UpdateReference(
+UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx,
SCsROW nDy, SCsTAB nDz,
+ScDocument* pUndoDoc = NULL );
+
void UpdateInsertTab(SCTAB nInsPos, SCTAB nNewSheets = 1);
void UpdateInsertTabOnlyCells(SCTAB nInsPos, SCTAB nNewSheets = 1);
void UpdateDeleteTab(SCTAB nDelPos, bool bIsMove, ScColumn* pRefUndo =
NULL, SCTAB nSheets = 1);
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 26edaa9..1a00a15 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1992,9 +1992,8 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol )
// UpdateUsed not needed, already done in TestCopyScenario
(obsolete comment ?)
SCsTAB nDz = nTab - rSrcCol.nTab;
-UpdateReference(URM_COPY, nCol, nStart, nTab,
- nCol, nEnd, nTab,
- 0, 0, nDz, NULL);
+UpdateReference(
+URM_COPY, ScRange(nCol, nStart, nTab, nCol, nEnd, nTab), 0, 0,
nDz, NULL);
UpdateCompile();
}
@@ -2023,9 +2022,9 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const
// UpdateUsed not needed, is already done in TestCopyScenario
(obsolete comment ?)
SCsTAB nDz = rDestCol.nTab - nTab;
-rDestCol.UpdateReference(URM_COPY, rDestCol.nCol, nStart,
rDestCol.nTab,
- rDestCol.nCol, nEnd,
rDestCol.nTab,
- 0, 0, nDz, NULL);
+rDestCol.UpdateReference(
+URM_COPY, ScRange(rDestCol.nCol, nStart, rDestCol.nTab,
rDestCol.nCol, nEnd, rDestCol.nTab),
+0, 0, nDz, NULL);
rDestCol.UpdateCompile();
}
@@ -2221,21 +2220,19 @@ public:
}
-bool ScColumn::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1,
SCROW nRow1, SCTAB nTab1,
- SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy,
SCsTAB nDz,
- ScDocument* pUndoDoc )
+bool ScColumn::UpdateReference(
+UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW
nDy, SCsTAB nDz,
+ScDocument* pUndoDoc )
{
-ScRange aRange(nCol1, nRow1, nTab1, nCol2, nRow2, nTab2);
-
if (eUpdateRefMode == URM_COPY)
{
-UpdateRefOnCopy aHandler(aRange, nDx, nDy, nDz, pUndoDoc);
-FormulaCellsUndecided(nRow1, nRow2);
-sc::ProcessBlock(maCells.begin(), maCells, aHandler, nRow1, nRow2);
+UpdateRefOnCopy aHandler(rRange, nDx, nDy, nDz, pUndoDoc);
+FormulaCellsUndecided(rRange.aStart.Row(), rRange.aEnd.Row());
+sc::ProcessBlock(maCells.begin(), maCells, aHandler,
rRange.aStart.Row(), rRange.aEnd.Row());
return aHandler.isUpdated();
}
-UpdateRefOnNonCopy aHandler(nCol, nTab, aRange, nDx, nDy, nDz,
eUpdateRefMode, pUndoDoc);
+UpdateRefOnNonCopy aHandler(nCol, nTab, rRang
[Libreoffice-commits] core.git: odk/settings
odk/settings/std.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 64f19368ccb2ab9658a0827efd4c0619a4343939 Author: Jürgen Schmidt Date: Thu Jun 27 13:21:43 2013 + Related: #i122356# quote rdb path, windows spaces in paths (cherry picked from commit 65ef7b5de4d5fa7b8b440a73329b088917f77957) Conflicts: odk/settings/std.mk Change-Id: I73e62097456ab8dbe601f557a4f5b65f9b7aba6b diff --git a/odk/settings/std.mk b/odk/settings/std.mk index 84c986c..93fa862 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -43,10 +43,10 @@ COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)" -URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb) +URE_SERVICES="$(subst \\,\,$(URE_MISC)$(PS)services.rdb)" OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)" -OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb) +OFFICE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)" OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" ___ 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' - 36/90a5c0d058781ea3244155874898e250dcd936
36/90a5c0d058781ea3244155874898e250dcd936 |1 + 1 file changed, 1 insertion(+) New commits: commit 242c18ed464d6c2db333cb3e91637b7a8c071d81 Author: Caolán McNamara Date: Thu Jun 27 16:14:58 2013 +0100 Notes added by 'git notes add' diff --git a/36/90a5c0d058781ea3244155874898e250dcd936 b/36/90a5c0d058781ea3244155874898e250dcd936 new file mode 100644 index 000..a7917e9 --- /dev/null +++ b/36/90a5c0d058781ea3244155874898e250dcd936 @@ -0,0 +1 @@ +prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068 ___ 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' - 7b/9903580a48c9b5cbe555b7b1e574fd5fd51cc2
7b/9903580a48c9b5cbe555b7b1e574fd5fd51cc2 |1 + 1 file changed, 1 insertion(+) New commits: commit b8c0d880cd271f603daa5314756bdf847ba78320 Author: Caolán McNamara Date: Thu Jun 27 16:21:57 2013 +0100 Notes added by 'git notes add' diff --git a/7b/9903580a48c9b5cbe555b7b1e574fd5fd51cc2 b/7b/9903580a48c9b5cbe555b7b1e574fd5fd51cc2 new file mode 100644 index 000..a7917e9 --- /dev/null +++ b/7b/9903580a48c9b5cbe555b7b1e574fd5fd51cc2 @@ -0,0 +1 @@ +prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068 ___ 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' - 3 commits - 32/19ba5205b2541e2ff9b3c7e9d108556ad2a6f9 d3/f2b4f596643cc1dee3de8bd7ac4d0bc0d0592f ee/27910c87b64c681d68df900b57e0730e78e381
32/19ba5205b2541e2ff9b3c7e9d108556ad2a6f9 |1 + d3/f2b4f596643cc1dee3de8bd7ac4d0bc0d0592f |1 + ee/27910c87b64c681d68df900b57e0730e78e381 |1 + 3 files changed, 3 insertions(+) New commits: commit c4256695eb5f917c20b9fb8d935c1c3ef73ee78e Author: Caolán McNamara Date: Thu Jun 27 16:21:48 2013 +0100 Notes added by 'git notes add' diff --git a/32/19ba5205b2541e2ff9b3c7e9d108556ad2a6f9 b/32/19ba5205b2541e2ff9b3c7e9d108556ad2a6f9 new file mode 100644 index 000..a7917e9 --- /dev/null +++ b/32/19ba5205b2541e2ff9b3c7e9d108556ad2a6f9 @@ -0,0 +1 @@ +prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068 commit b1892a2ddc0e8ba3a0b8950bf6accd15bb51e38b Author: Caolán McNamara Date: Thu Jun 27 16:21:41 2013 +0100 Notes added by 'git notes add' diff --git a/ee/27910c87b64c681d68df900b57e0730e78e381 b/ee/27910c87b64c681d68df900b57e0730e78e381 new file mode 100644 index 000..a7917e9 --- /dev/null +++ b/ee/27910c87b64c681d68df900b57e0730e78e381 @@ -0,0 +1 @@ +prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068 commit e75603aa1e03dbb9fa993008dda15afc507b48aa Author: Caolán McNamara Date: Thu Jun 27 16:21:33 2013 +0100 Notes added by 'git notes add' diff --git a/d3/f2b4f596643cc1dee3de8bd7ac4d0bc0d0592f b/d3/f2b4f596643cc1dee3de8bd7ac4d0bc0d0592f new file mode 100644 index 000..a7917e9 --- /dev/null +++ b/d3/f2b4f596643cc1dee3de8bd7ac4d0bc0d0592f @@ -0,0 +1 @@ +prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068 ___ 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' - 65/ef7b5de4d5fa7b8b440a73329b088917f77957
65/ef7b5de4d5fa7b8b440a73329b088917f77957 |1 + 1 file changed, 1 insertion(+) New commits: commit d30fd1df10bf86239de41a162f03d084f12742bd Author: Caolán McNamara Date: Thu Jun 27 16:20:23 2013 +0100 Notes added by 'git notes add' diff --git a/65/ef7b5de4d5fa7b8b440a73329b088917f77957 b/65/ef7b5de4d5fa7b8b440a73329b088917f77957 new file mode 100644 index 000..37c0bef --- /dev/null +++ b/65/ef7b5de4d5fa7b8b440a73329b088917f77957 @@ -0,0 +1 @@ +merged as: 64f19368ccb2ab9658a0827efd4c0619a4343939 ___ 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' - e1/2dc2fe3e556f9554700362eac39bc04c710864
e1/2dc2fe3e556f9554700362eac39bc04c710864 |1 + 1 file changed, 1 insertion(+) New commits: commit 9d604a1a9d450abcffe57ce0e0d3b1c4c81b6d93 Author: Caolán McNamara Date: Thu Jun 27 16:14:37 2013 +0100 Notes added by 'git notes add' diff --git a/e1/2dc2fe3e556f9554700362eac39bc04c710864 b/e1/2dc2fe3e556f9554700362eac39bc04c710864 new file mode 100644 index 000..a7917e9 --- /dev/null +++ b/e1/2dc2fe3e556f9554700362eac39bc04c710864 @@ -0,0 +1 @@ +prefer: a66f9903bba9dc7eeff6683ebddcd34d4ad70068 ___ 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' - fb/1dc1d963e192e588731cce3a3ba20996c4e589
fb/1dc1d963e192e588731cce3a3ba20996c4e589 |1 + 1 file changed, 1 insertion(+) New commits: commit faf80fd5e512fc49304a4cefb94030d21b1b5e11 Author: Caolán McNamara Date: Thu Jun 27 16:13:10 2013 +0100 Notes added by 'git notes add' diff --git a/fb/1dc1d963e192e588731cce3a3ba20996c4e589 b/fb/1dc1d963e192e588731cce3a3ba20996c4e589 new file mode 100644 index 000..5ac2186 --- /dev/null +++ b/fb/1dc1d963e192e588731cce3a3ba20996c4e589 @@ -0,0 +1 @@ +merged as: ecccfa73b9c69a5d9645a2647f20a37588a63a8e ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx sc/inc sc/source svx/source
include/svx/svdmodel.hxx |4
sc/inc/drwlayer.hxx|2 +-
sc/source/core/data/documen9.cxx |2 +-
sc/source/core/data/drwlayer.cxx |4 +++-
sc/source/ui/docshell/dbdocfun.cxx |2 +-
sc/source/ui/docshell/docfunc.cxx | 18 +-
sc/source/ui/drawfunc/futext3.cxx | 12
sc/source/ui/view/drawview.cxx |2 +-
sc/source/ui/view/viewfun6.cxx |2 +-
svx/source/svdraw/svdedxv.cxx |4 ++--
svx/source/svdraw/svdmodel.cxx |2 ++
svx/source/svdraw/svdundo.cxx |1 +
12 files changed, 34 insertions(+), 21 deletions(-)
New commits:
commit ecccfa73b9c69a5d9645a2647f20a37588a63a8e
Author: Armin Le Grand
Date: Thu Jun 27 10:23:24 2013 +
Resolves: #i121008# corrected calc cell comment stuff
(cherry picked from commit fb1dc1d963e192e588731cce3a3ba20996c4e589)
Conflicts:
sc/source/core/data/drwlayer.cxx
svx/inc/svx/svdmodel.hxx
svx/source/svdraw/svdmodel.cxx
svx/source/svdraw/svdundo.cxx
Change-Id: I10b644aa44ae8c1eb0a027aeeaf27790ec455fa2
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 3a078bf..97471b6 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -209,6 +209,7 @@ protected:
boolbSaveOLEPreview:1; // save preview metafile of OLE
objects
boolbSaveNative:1;
boolbStarDrawPreviewMode:1;
+boolmbDisableTextEditUsesCommonUndoManager:1;
sal_uInt16 nStreamCompressMode; // Komprimiert schreiben?
sal_uInt16 nStreamNumberFormat;
sal_uInt16 nDefaultTabulator;
@@ -630,6 +631,9 @@ public:
voidSetStarDrawPreviewMode(sal_Bool bPreview);
sal_BoolIsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
+bool GetDisableTextEditUsesCommonUndoManager() const { return
mbDisableTextEditUsesCommonUndoManager; }
+void SetDisableTextEditUsesCommonUndoManager(bool bNew) {
mbDisableTextEditUsesCommonUndoManager = bNew; }
+
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
getUnoModel();
void setUnoModel( ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > xModel );
diff --git a/sc/inc/drwlayer.hxx b/sc/inc/drwlayer.hxx
index 7392a05..bd4191a 100644
--- a/sc/inc/drwlayer.hxx
+++ b/sc/inc/drwlayer.hxx
@@ -125,7 +125,7 @@ public:
voidEnableAdjust( sal_Bool bSet = sal_True ){
bAdjustEnabled = bSet; }
-voidBeginCalcUndo();
+voidBeginCalcUndo(bool bDisableTextEditUsesCommonUndoManager);
SdrUndoGroup* GetCalcUndo();
sal_BoolIsRecording() const { return bRecording; }
voidAddCalcUndo( SdrUndoAction* pUndo );
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index 525f12d..2938009 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -67,7 +67,7 @@ SfxBroadcaster* ScDocument::GetDrawBroadcaster()
void ScDocument::BeginDrawUndo()
{
if (pDrawLayer)
-pDrawLayer->BeginCalcUndo();
+pDrawLayer->BeginCalcUndo(false);
}
rtl::Reference ScDocument::GetColorList()
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index fccbbda..363969c 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -1025,8 +1025,9 @@ void ScDrawLayer::AddCalcUndo( SdrUndoAction* pUndo )
delete pUndo;
}
-void ScDrawLayer::BeginCalcUndo()
+void ScDrawLayer::BeginCalcUndo(bool bDisableTextEditUsesCommonUndoManager)
{
+
SetDisableTextEditUsesCommonUndoManager(bDisableTextEditUsesCommonUndoManager);
DELETEZ(pUndoGroup);
bRecording = sal_True;
}
@@ -1036,6 +1037,7 @@ SdrUndoGroup* ScDrawLayer::GetCalcUndo()
SdrUndoGroup* pRet = pUndoGroup;
pUndoGroup = NULL;
bRecording = false;
+SetDisableTextEditUsesCommonUndoManager(false);
return pRet;
}
diff --git a/sc/source/ui/docshell/dbdocfun.cxx
b/sc/source/ui/docshell/dbdocfun.cxx
index 5a4b6fd..1c35fd6 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -556,7 +556,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam&
rSortParam,
// #i59745# collect all drawing undo actions affecting cell note
captions
if( pDrawLayer )
-pDrawLayer->BeginCalcUndo();
+pDrawLayer->BeginCalcUndo(false);
}
if ( bCopy )
diff --git a/sc/source/ui/docshell/docfunc.cxx
b/sc/source/ui/docshell/docfunc.cxx
index 6e8cd1c..2f1f0e2 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -182,7 +182,7 @@ sal_Bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos)
SCTAB nTab = rPos.Tab();
if (bUndo)
-pModel->BeginCalcUndo();
+pModel->BeginCalcUndo(false);
sal_Bool bDone =
translation: git of svdoattr.hxx and svdoashp.hxx
Hi, In svdoashp.hxx there is and expression in a comment which appears to refer to a variable called "Fuelling" I've grepped the core source for this variable, but it seems to appear only in a comment of svdoattr.hxx. I left it in German for the time being. I suppose it could be replaced by something like Fill, Filling or FillArea if you choose to have an English word for this variable. Take care, Chris svdoattr.hxx.git.diff Description: Binary data svdoashp.hxx.git.diff Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - oox/source
oox/source/vml/vmlshape.cxx |9 -
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit d1d45140ef21098894b57405ddd0526f2f46008d
Author: Cédric Bosdonnat
Date: Fri Jun 21 10:47:42 2013 +0200
n#820504: Some imported VML paths are closed, try to detect the
Change-Id: Idefd0277a85bd7b2b727f59cc4e568869b4932a1
(cherry picked from commit 08db0b22bdce0f779e4af01a209aef1be29e9907)
Reviewed-on: https://gerrit.libreoffice.org/4533
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 1b0caf9..124807c 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -628,12 +628,19 @@ Reference LineShape::implConvertAndInsert(const
Reference& rxSh
//
BezierShape::BezierShape(Drawing& rDrawing)
-: SimpleShape(rDrawing, "com.sun.star.drawing.OpenBezierShape")
+: SimpleShape(rDrawing, "com.sun.star.drawing.OpenBezierShape") // TODO
Could we need both Open and Closed?
{
}
Reference< XShape > BezierShape::implConvertAndInsert( const Reference<
XShapes >& rxShapes, const Rectangle& rShapeRect ) const
{
+// If we have an 'x' in the last part of the path it means it is closed...
+sal_Int32 nPos = maShapeModel.maVmlPath.lastIndexOf(',');
+if ( nPos != -1 && maShapeModel.maVmlPath.copy(nPos).indexOf('x') != -1 )
+{
+const_cast( this )->setService(
"com.sun.star.drawing.ClosedBezierShape" );
+}
+
Reference< XShape > xShape = SimpleShape::implConvertAndInsert( rxShapes,
rShapeRect );
Rectangle aCoordSys = getCoordSystem();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basctl/source
basctl/source/basicide/basobj2.cxx | 37 -
1 file changed, 28 insertions(+), 9 deletions(-)
New commits:
commit 21eeeccfa64a4c03554c1fe3715d38c1695245ab
Author: Noel Power
Date: Thu Jun 27 13:58:48 2013 +0100
tweak object catalog to improve switching modules in large Libraries
object catalog when updated updates ( all ) entries and was parsing
the source for every method in every module
Change-Id: Id68e3c24d597d29a86d3507a7dc20745c96dd2a2
diff --git a/basctl/source/basicide/basobj2.cxx
b/basctl/source/basicide/basobj2.cxx
index 7e62558..1b1689b 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,23 @@ 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;
+if ( !pMod )
+{
+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 +430,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 +455,18 @@ 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;
+if ( !pMod )
+{
+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: svx/source
svx/source/sidebar/text/TextPropertyPanel.cxx | 17 ++---
1 file changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 153bdc99b1c162723557513b993343c211d804b8
Author: Norbert Thiebaud
Date: Wed Jun 26 01:27:04 2013 -0500
coverity#1027391 : Dead default in switch
Change-Id: I7ef70be9f5230eb3fb586962a1581efa38c239f0
Reviewed-on: https://gerrit.libreoffice.org/4526
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx
b/svx/source/sidebar/text/TextPropertyPanel.cxx
index abb05a5..68382b1 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -1073,18 +1073,13 @@ void TextPropertyPanel::NotifyItemUpdate (
else
mpToolBoxIncDec->Enable();
const sal_Int64 nSize (mpFontSizeBox->GetValue());
-switch(nSID)
+if(nSID == SID_GROW_FONT_SIZE)
{
-case SID_GROW_FONT_SIZE:
-
mpToolBoxIncDec->EnableItem(mpToolBoxIncDec->GetItemId(UNO_GROW), bIsEnabled &&
nSize<960);
-break;
-
-case SID_SHRINK_FONT_SIZE:
-
mpToolBoxIncDec->EnableItem(mpToolBoxIncDec->GetItemId(UNO_SHRINK), bIsEnabled
&& nSize>60);
-break;
-
-default:
-break;
+
mpToolBoxIncDec->EnableItem(mpToolBoxIncDec->GetItemId(UNO_GROW), bIsEnabled &&
nSize<960);
+}
+else if (nSID == SID_SHRINK_FONT_SIZE)
+{
+
mpToolBoxIncDec->EnableItem(mpToolBoxIncDec->GetItemId(UNO_SHRINK), bIsEnabled
&& nSize>60);
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
translation: git diff svdomeas.hxx
I've attached the git diff output for svdomeas.hxx. -- Chris svdomeas.hxx.git.diff Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - download.lst libmwaw/libmwaw-0.1.9.patch.1 libmwaw/libmwaw-infinite-loop.patch.1 libmwaw/UnpackedTarball_libmwaw.mk
download.lst |4 ++--
libmwaw/UnpackedTarball_libmwaw.mk|5 -
libmwaw/libmwaw-0.1.9.patch.1 | 15 ---
libmwaw/libmwaw-infinite-loop.patch.1 | 32
4 files changed, 2 insertions(+), 54 deletions(-)
New commits:
commit a1239f7a1a8aac82c3599fbdfe826cb67baae9c7
Author: Fridrich Å trba
Date: Thu Jun 27 14:57:42 2013 +0200
Uploading libmwaw 0.1.10 and dumping unneeded patches
Change-Id: I837b885fb88ccbc1e7980712be4a3342575b3770
(cherry picked from commit d63bd6914f479ea4cd718b6f0a26b1edfc141562)
Reviewed-on: https://gerrit.libreoffice.org/4588
Reviewed-by: David Tardon
Tested-by: David Tardon
diff --git a/download.lst b/download.lst
index d0c6d45..9df006b 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
export CDR_TARBALL := libcdr-0.0.14.tar.bz2
MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
-MWAW_MD5SUM := 2090daf6e8a27b52e8c5f26c915bd7c5
-export MWAW_TARBALL := libmwaw-0.1.9.tar.bz2
+MWAW_MD5SUM := 2289bb137bbba9b473ce60168895c036
+export MWAW_TARBALL := libmwaw-0.1.10.tar.bz2
VISIO_MD5SUM := 05574c2ec54dd0c29d75cacdf9419f44
export VISIO_TARBALL := libvisio-0.0.28.tar.bz2
diff --git a/libmwaw/UnpackedTarball_libmwaw.mk
b/libmwaw/UnpackedTarball_libmwaw.mk
index a17961d..96fe9df 100644
--- a/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/libmwaw/UnpackedTarball_libmwaw.mk
@@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
$(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
- libmwaw/libmwaw-0.1.9.patch.1 \
- libmwaw/libmwaw-infinite-loop.patch.1 \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libmwaw/libmwaw-0.1.9.patch.1 b/libmwaw/libmwaw-0.1.9.patch.1
deleted file mode 100644
index e5eb6da..000
--- a/libmwaw/libmwaw-0.1.9.patch.1
+++ /dev/null
@@ -1,15 +0,0 @@
a/src/lib/MWAWTable.hxx
-+++ b/src/lib/MWAWTable.hxx
-@@ -117,7 +117,11 @@ protected:
- - c2.m_cell->box().size()[m_coord];
- if (diffF < 0) return true;
- if (diffF > 0) return false;
-- return ssize_t(c1.m_cell) < ssize_t(c2.m_cell);
-+#ifdef _WIN64
-+ return __int64(c1.m_cell) < __int64(c2.m_cell);
-+#else
-+ return long(c1.m_cell) < long(c2.m_cell);
-+#endif
- }
-
- //! the coord to compare
diff --git a/libmwaw/libmwaw-infinite-loop.patch.1
b/libmwaw/libmwaw-infinite-loop.patch.1
deleted file mode 100644
index 9c8e3a8..000
--- a/libmwaw/libmwaw-infinite-loop.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
-fix infinite loop in findCentralDirectoryEnd
-
-WPXSvInputStreamImpl::seek returns -1 if it catches an exception
-
libmwaw/src/lib/MWAWZipStream.cxx 2013-06-18 00:37:57.208657845 +0200
-+++ libmwaw/src/lib/MWAWZipStream.cxx 2013-06-18 00:48:20.971665257 +0200
-@@ -258,18 +258,20 @@
-
- static bool findCentralDirectoryEnd(WPXInputStream *input)
- {
-- input->seek(0, WPX_SEEK_SET);
-+ // seek returns -1 both on error and on seek to position post-the-end
-+ int ret = input->seek(0, WPX_SEEK_SET);
- try {
--while (!input->atEOS())
-- input->seek(1024, WPX_SEEK_CUR);
-+while (-1 != ret && !input->atEOS())
-+ ret = input->seek(1024, WPX_SEEK_CUR);
- input->seek(-1024, WPX_SEEK_CUR);
--while (!input->atEOS()) {
-+ret = 0; // perhaps it's smaller than 1024?
-+while (-1 != ret && !input->atEOS()) {
- unsigned signature = getInt(input);
- if (signature == CDIR_END_SIG) {
- input->seek(-4, WPX_SEEK_CUR);
- return true;
- } else
--input->seek(-3, WPX_SEEK_CUR);
-+ret = input->seek(-3, WPX_SEEK_CUR);
- }
- } catch (...) {
- return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 7 commits - cli_ure/source cppuhelper/source instsetoo_native/inc_sdkoo odk/cfgWin.js odk/examples odk/setsdkenv_windows.template odk/settings odk/
cli_ure/source/native/native_bootstrap.cxx| 14
cppuhelper/source/findsofficepath.c | 11
instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt | 12
instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt | 12
odk/cfgWin.js |4
odk/examples/cpp/DocumentLoader/DocumentLoader.cxx|2
odk/setsdkenv_windows.template|4
odk/settings/std.mk |4
odk/source/com/sun/star/lib/loader/InstallationFinder.java| 27 +
scp2/source/ooo/registryitem_ooo.scp | 142 +-
10 files changed, 139 insertions(+), 93 deletions(-)
New commits:
commit d3f2b4f596643cc1dee3de8bd7ac4d0bc0d0592f
Author: Jürgen Schmidt
Date: Thu Jun 27 13:29:31 2013 +
#122478# adapt search in registry
diff --git a/cli_ure/source/native/native_bootstrap.cxx
b/cli_ure/source/native/native_bootstrap.cxx
index 678cb72..3255d91 100644
--- a/cli_ure/source/native/native_bootstrap.cxx
+++ b/cli_ure/source/native/native_bootstrap.cxx
@@ -55,6 +55,7 @@ namespace cli_ure {
// INSTALL_PATH value needs to correspond to the Windows registry subkey
// in main\scp2\source\ooo\registryitem_ooo.scp
#define INSTALL_PATH L"Software\\OpenOffice\\UNO\\InstallPath"
+#define INSTALL_PATH_64 L"Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath"
#define BASIS_LINK L"\\basis-link"
#define URE_LINK L"\\ure-link"
#define URE_BIN L"\\bin"
@@ -156,9 +157,19 @@ WCHAR * getInstallPath()
szInstallPath = getPathFromRegistryKey( HKEY_CURRENT_USER,
INSTALL_PATH );
if ( szInstallPath == NULL )
{
+/* read the key's default value from HKEY_LOCAL_USER */
+szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE,
INSTALL_PATH_64 );
+}
+else if ( szInstallPath == NULL )
+{
/* read the key's default value from HKEY_LOCAL_MACHINE */
szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE,
INSTALL_PATH );
}
+else if ( szInstallPath == NULL )
+{
+/* read the key's default value from HKEY_LOCAL_MACHINE */
+szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE,
INSTALL_PATH_64 );
+}
}
return szInstallPath;
}
@@ -269,7 +280,8 @@ HMODULE loadFromPath(LPCWSTR sLibName)
if (sLibName == NULL)
return NULL;
-WCHAR * szUreBinPath = getUnoPath();
+// WCHAR * szUreBinPath = getUnoPath();
+WCHAR * szUreBinPath = getInstallPath();
if (!szUreBinPath)
return NULL;
diff --git a/cppuhelper/source/findsofficepath.c
b/cppuhelper/source/findsofficepath.c
index f3f7b58..b0481ea 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/cppuhelper/source/findsofficepath.c
@@ -87,6 +87,7 @@ static char* getPathFromRegistryKey( HKEY hroot, const char*
subKeyName )
static char* platformSpecific()
{
const char* SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath";
+const char* SUBKEYNAME64 =
"Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath";
char* path = NULL;
@@ -95,9 +96,19 @@ static char* platformSpecific()
if ( path == NULL )
{
+/* read the key's default value from HKEY_LOCAL_USER 64 */
+path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 );
+}
+else if ( path == NULL )
+{
/* read the key's default value from HKEY_LOCAL_MACHINE */
path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME );
}
+else if ( path == NULL )
+{
+/* read the key's default value from HKEY_LOCAL_MACHINE 64*/
+path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 );
+}
return path;
}
commit ee27910c87b64c681d68df900b57e0730e78e381
Author: Jürgen Schmidt
Date: Thu Jun 27 13:27:29 2013 +
#122478# cleanup registry
diff --git a/scp2/source/ooo/registryitem_ooo.scp
b/scp2/source/ooo/registryitem_ooo.scp
index 1be7727..b36c6b9 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -325,77 +325,77 @@ RegistryItem
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
Styles = (ALWAYS_REQUIRED);
End
-RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey =
"Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
- ModuleID = gid_Module_Root;
- Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem
gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey =
"Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - cui/source
cui/source/options/optaboutconfig.cxx |8 +++-
cui/source/options/treeopt.src|1 +
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 49678807b3730c3971297932af9ca4a7a4ebdb79
Author: Efe Gürkan YALAMAN
Date: Thu Jun 27 17:02:01 2013 +0300
Empty tab page created and added on options dialog
Buttons cause crash on empty tab page.
Change-Id: I34bfb412c4d9dda9fdf71b6803be67939c00ff59
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 55870f9..22aff88 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -13,10 +13,16 @@
using namespace svx;
CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window* pParent, const
SfxItemSet& rItemSet )
-:SfxTabPage( pParent, "AboutConfig", "cui/ui/optaboutconfigdialog.ui",
rItemSet)
+:SfxTabPage( pParent, "AboutConfig", "cui/ui/aboutconfigdialog.ui",
rItemSet)
{
//get(m_pEditBtn, "");
+m_pPrefCtrl = get("preferences");
+
+Size aControlSize(200,200);
+m_pPrefCtrl->set_width_request(aControlSize.Width());
+m_pPrefCtrl->set_height_request(aControlSize.Height());
+
WinBits nBits = WB_SCROLL | WB_SORT;
pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
}
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index af8e332..871c787 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -101,6 +101,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES
< "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ;
< "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ;
< "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ;
+< "About Config" ; RID_SVXPAGE_ABOUT_CONFIG ; > ;
};
};
StringArray SID_LANGUAGE_OPTIONS
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Noel Power changed: What|Removed |Added Depends on||66148 --- Comment #159 from Noel Power --- adding bug #66148 - IDE object catalog latency on big libraries Waiting a couple of seconds trying to switch tabs in the Basic IDE is too much -- 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
[ANN] LibreOffice 3.6.7 RC1 available
Dear Community, The Document Foundation is happy to announce the first release candidate of LibreOffice 3.6.7. The upcoming 3.6.7 will be the seventh in a series of frequent bugfix releases for our stable 3.6 branch. Please be aware that LibreOffice 3.6.7 RC1 is not ready for production use, you should continue to use LibreOffice 3.6.6 for that. The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test - or checkout our manual test database for starting right away - http://manual-test.libreoffice.org/runtests/ For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/get-involved/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/Translation_for_3.5 or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 3.6.7 RC1 is available from our wiki: http://wiki.documentfoundation.org/Releases/3.6.7/RC1 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. Yours, The Document Foundation Board of Directors The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany Rechtsfähige Stiftung des bürgerlichen Rechts Legal details: http://www.documentfoundation.org/imprint signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/source
sw/source/core/edit/eddel.cxx | 11 ---
sw/source/ui/wrtsh/delete.cxx | 12 +---
sw/source/ui/wrtsh/wrtsh4.cxx |5 ++---
3 files changed, 7 insertions(+), 21 deletions(-)
New commits:
commit fd2bd50bb4fbe139cd1ed9332c0d2eeaebc7dabe
Author: Michael Stahl
Date: Thu Jun 27 15:27:03 2013 +0200
Revert "Related: #i121925# fixed by reverting change for issue #i119652#"
This reverts commit e47b7f967bcdd8b1e830d07b2ad941b1302686f7.
The original commit this reverts was never merged anyway and this adds
some line that were context in the AOO commit.
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 05ea03a..2d7adb6 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -35,17 +35,17 @@
void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
{
-// only on a selection
-if ( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark())
+// only for selections
+if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark())
return;
// Is the selection in a table? Then delete only the content of the
selected boxes.
// Here, there are two cases:
// 1. Point and Mark are in one box, delete selection as usual
// 2. Point and Mare are in different boxes, search all selected boxes and
delete content
-
if( rPam.GetNode()->FindTableNode() &&
-rPam.GetNode()->StartOfSectionNode() !=
rPam.GetNode(sal_False)->StartOfSectionNode() )
+rPam.GetNode()->StartOfSectionNode() !=
+rPam.GetNode(sal_False)->StartOfSectionNode() )
{
// group the Undo in the table
if( pUndo && !*pUndo )
@@ -71,9 +71,6 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
aDelPam.Move( fnMoveBackward, fnGoCntnt );
}
// skip protected boxes
-//For i117395, in some situation, the node would be hidden or
invisible, which makes the frame of it unavailable
-//So verify it before use it.
-SwCntntFrm* pFrm = NULL;
if( !pNd->IsCntntNode() ||
!pNd->IsInProtectSect() )
{
commit 97e6ff086e2601c066c32fca8412e939843dae3f
Author: Michael Stahl
Date: Thu Jun 27 15:19:47 2013 +0200
Revert "Resolves: #119652# avoid invalid selection on..."
This reverts commit e6cd5d0b11e7d8562358b883c08a8dba9fd4f61d.
The problem was already solved with
af4b6c94c68b5f67b931cde8d0acda6ec8b288bb.
Change-Id: I21d7ca9fec601377967297bc42835573422c29a7
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index 940a411..f19455e 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -446,17 +446,7 @@ long SwWrtShell::DelToStartOfSentence()
if(IsStartOfDoc())
return 0;
OpenMark();
-
-SwCrsrSaveState aSaveState( *(_GetCrsr()) );
-sal_Bool bSuccessfulSelection = _BwdSentence();
-if ( _GetCrsr()->IsInProtectTable( sal_True )
- || _GetCrsr()->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
- nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
-{
-bSuccessfulSelection = sal_False;
-}
-long nRet = bSuccessfulSelection ? Delete() : 0;
-
+long nRet = _BwdSentence() ? Delete() : 0;
CloseMark( 0 != nRet );
return nRet;
}
diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx
index 6277276..6966e45 100644
--- a/sw/source/ui/wrtsh/wrtsh4.cxx
+++ b/sw/source/ui/wrtsh/wrtsh4.cxx
@@ -198,15 +198,14 @@ sal_Bool SwWrtShell::_BwdSentence()
if(!SwCrsrShell::Left(1,CRSR_SKIP_CHARS))
{
Pop(sal_False);
-return sal_False;
+return 0;
}
if( !GoStartSentence() && !IsSttPara() )
// not found --> go to the beginning of the paragraph
SwCrsrShell::MovePara( fnParaCurr, fnParaStart );
ClearMark();
Combine();
-
-return sal_True;
+return 1;
}
sal_Bool SwWrtShell::_FwdPara()
___
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' - 56/2cc00ca57d00a22d56e61c5da307864e5db2f9
56/2cc00ca57d00a22d56e61c5da307864e5db2f9 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 9edd29d004d2ba49a3ac5ac36b9e5e3dd68ad4c7 Author: Michael Stahl Date: Thu Jun 27 15:36:12 2013 +0200 Notes added by 'git notes add' diff --git a/56/2cc00ca57d00a22d56e61c5da307864e5db2f9 b/56/2cc00ca57d00a22d56e61c5da307864e5db2f9 index 0d2043e..1fe56ce 100644 --- a/56/2cc00ca57d00a22d56e61c5da307864e5db2f9 +++ b/56/2cc00ca57d00a22d56e61c5da307864e5db2f9 @@ -1 +1 @@ -merged as: e6cd5d0b11e7d8562358b883c08a8dba9fd4f61d +prefer: af4b6c94c68b5f67b931cde8d0acda6ec8b288bb ___ 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' - be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07
be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0d1e879f08555b1e930a2818d9cba619b6067404 Author: Michael Stahl Date: Thu Jun 27 15:32:38 2013 +0200 Notes added by 'git notes add' diff --git a/be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 b/be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 index a34901d..1f0033e 100644 --- a/be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 +++ b/be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 @@ -1 +1 @@ -merged as: e47b7f967bcdd8b1e830d07b2ad941b1302686f7 +reject: revert of rejected patch ___ 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' - external/Package_msvc_dlls.mk instsetoo_native/util solenv/bin
external/Package_msvc_dlls.mk |4 +++-
instsetoo_native/util/openoffice.lst.in |4 ++--
solenv/bin/modules/installer/environment.pm |3 +++
3 files changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 31f9f18f86a4dd587661f210cd866f6ce1608634
Author: Michael Stahl
Date: Thu Jun 27 13:29:08 2013 +0200
fdo#65975: do not put MSVC 64bit runtimes in solver/bin
Apparently causes problems for some people.
Unfortunately the scp2 entries are "non-standard" so i've had to add
another variable to let the installer find it.
(cherry picked from commit 9a6d5f15afa16e68d38e4a0cfd5ef904be481a17)
Conflicts:
instsetoo_native/util/openoffice.lst.in
Change-Id: I7a01160369ed8dc401625c06760008341afcee67
Reviewed-on: https://gerrit.libreoffice.org/4576
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/external/Package_msvc_dlls.mk b/external/Package_msvc_dlls.mk
index b8bec8f..cbf09aa 100644
--- a/external/Package_msvc_dlls.mk
+++ b/external/Package_msvc_dlls.mk
@@ -9,7 +9,9 @@
$(eval $(call gb_Package_Package,msvc_dlls,$(MSVC_DLL_PATH)))
-$(eval $(call gb_Package_add_files,msvc_dlls,bin,\
+$(eval $(call gb_Package_set_outdir,msvc_dlls,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,msvc_dlls,program/shlxthdl,\
$(MSVC_DLLS) \
))
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index 589781e..034aedb 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -82,7 +82,7 @@ LibreOffice
downloadnameLibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname
LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibreOffice_{productversion}_helppack_{os}_install_{languages}
-include
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
+include
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath}
}
}
@@ -138,7 +138,7 @@ LibreOffice_Dev
downloadname
LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname
LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname
LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
-include
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package
+include
{solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath}
}
}
diff --git a/solenv/bin/modules/installer/environment.pm
b/solenv/bin/modules/installer/environment.pm
index 9e2b880..63689a0 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -39,6 +39,9 @@ sub create_pathvariables
my $solarcommonpath = $environment->{'SOLARVERSION'} .
$installer::globals::separator . "common" .
$installer::globals::productextension;
$variables{'solarcommonpath'} = $solarcommonpath;
+my $shlxthdlpath = $ENV{'INSTDIR'} . $installer::globals::separator .
"program" . $installer::globals::separator . "shlxthdl";
+$variables{'shlxthdlpath'} = $shlxthdlpath;
+
$variables{'os'} = $installer::globals::compiler;
my $solarenvpath = "";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 5 commits - oox/source writerfilter/source
oox/source/vml/vmlformatting.cxx | 34 +
oox/source/vml/vmlshape.cxx|7
writerfilter/source/dmapper/GraphicImport.cxx |3 -
writerfilter/source/dmapper/WrapPolygonHandler.cxx |8 ++--
writerfilter/source/dmapper/WrapPolygonHandler.hxx |2 -
5 files changed, 35 insertions(+), 19 deletions(-)
New commits:
commit 8054a7dc0a1b9c27aea7717f58891e49bd25d14c
Author: Cédric Bosdonnat
Date: Wed Jun 26 11:26:56 2013 +0200
n#820504: start a new subpath with m and t in VML path decoding
Change-Id: I7bac4b111ede5e815d2ed121c18f4cfe1ad0950e
(cherry picked from commit 8d6eb11d6965ee93e72513f5e01b67f598edf6c3)
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 31d4f32..267d8e5 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -310,11 +310,16 @@ void ConversionHelper::decodeVmlPath( ::std::vector<
::std::vector< Point > >& r
// Upon finding the next command code, deal with stored
// coordinates for previous command and reset parameters counter
if needed.
// See http://www.w3.org/TR/NOTE-VML#_Toc416858382 for params
count reference
-if ( rPath[ i ] != ',' || nParamCount == 0)
+if ( rPath[ i ] != ',' || nParamCount == 0 )
{
switch ( state )
{
case MOVE_REL: // 2* params -> param count reset
+if ( rPointLists.size() > 0 && rPointLists.back().size() >
0 )
+{
+rPointLists.push_back( ::std::vector< Point >() );
+rFlagLists.push_back( ::std::vector< PolygonFlags >()
);
+}
rPointLists.back().push_back( Point( aCoordList[ 0 ],
aCoordList[ 1 ] ) );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
aCurrentPoint = rPointLists.back().back();
@@ -322,6 +327,11 @@ void ConversionHelper::decodeVmlPath( ::std::vector<
::std::vector< Point > >& r
break;
case MOVE_ABS: // 2 params -> no param count reset
+if ( rPointLists.size() > 0 && rPointLists.back().size() >
0 )
+{
+rPointLists.push_back( ::std::vector< Point >() );
+rFlagLists.push_back( ::std::vector< PolygonFlags >()
);
+}
rPointLists.back().push_back( Point( aCoordList[ 0 ],
aCoordList[ 1 ] ) );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
aCurrentPoint = rPointLists.back().back();
commit a3f2d5c140e9864b1da644ec18ad44fd6ab6334f
Author: Cédric Bosdonnat
Date: Mon Jun 24 11:39:30 2013 +0200
Forgot to remove one case where nParamCount is set to twice the value
Change-Id: I3649364a889b7ef6ce7ac4316a1621b6328170eb
(cherry picked from commit 7f7a1294e2d0da30a58d897558a18a13dbc5e690)
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 69d9b35..31d4f32 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -338,7 +338,7 @@ void ConversionHelper::decodeVmlPath( ::std::vector<
::std::vector< Point > >& r
rFlagLists.back().push_back( PolygonFlags_CONTROL );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
aCurrentPoint = rPointLists.back().back();
-nParamCount = 2 * 6;
+nParamCount = 6;
break;
case BEZIER_ABS: // 6* params -> param count reset
commit b25eb9f78b55ba10636c56e6723b66939239b3f5
Author: Cédric Bosdonnat
Date: Mon Jun 24 10:37:05 2013 +0200
n#820504: VML path import fixes: get back missing points
nParamsCount was set to the double of the expected value, but the code
handling the command only took the first set of parameters. Removing
this 2* in nParamsCount.
(cherry picked from commit 442ad6eef9d6e1588e4985e97ec3eafd6289f9ae)
Conflicts:
oox/source/vml/vmlformatting.cxx
Change-Id: I2a4bb07fc9167e056a52c7adfbee9e1ef8e2636c
diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx
index 806c624..69d9b35 100644
--- a/oox/source/vml/vmlformatting.cxx
+++ b/oox/source/vml/vmlformatting.cxx
@@ -318,7 +318,7 @@ void ConversionHelper::decodeVmlPath( ::std::vector<
::std::vector< Point > >& r
rPointLists.back().push_back( Point( aCoordList[ 0 ],
aCoordList[ 1 ] ) );
rFlagLists.back().push_back( PolygonFlags_NORMAL );
aCurrentPoint = rPointLists.back().back();
-nParamCount = 2 * 2;
+nParamCount = 2;
break;
case MOVE_ABS: // 2 para
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx |8
1 file changed, 8 insertions(+)
New commits:
commit bcb434b47f45f9ffbc32f8bde79226b161c21ffa
Author: Muthu Subramanian
Date: Thu Jun 27 18:46:47 2013 +0530
n#820273: Multilevel labels are rotated.
It looks odd when multilevel labels are rotated as well.
This patch resets the rotation values for outer labels.
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 5e193ac..6d0e7b6 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1529,6 +1529,14 @@ void VCartesianAxis::updatePositions()
,static_cast(aTickScreenPos2D.getY()));
double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
+if( nDepth > 0 )
+{
+/* Multi-level Labels: default to 0 or 90 */
+if( pTickFactory2D->isHorizontalAxis() )
+fRotationAngleDegree = 0.0;
+else
+fRotationAngleDegree = 90;
+}
// #i78696# use mathematically correct rotation now
const double fRotationAnglePi(fRotationAngleDegree * (F_PI
/ -180.0));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: download.lst libmwaw/libmwaw-0.1.9.patch.1 libmwaw/libmwaw-infinite-loop.patch.1 libmwaw/UnpackedTarball_libmwaw.mk
download.lst |4 ++--
libmwaw/UnpackedTarball_libmwaw.mk|5 -
libmwaw/libmwaw-0.1.9.patch.1 | 15 ---
libmwaw/libmwaw-infinite-loop.patch.1 | 32
4 files changed, 2 insertions(+), 54 deletions(-)
New commits:
commit d63bd6914f479ea4cd718b6f0a26b1edfc141562
Author: Fridrich Å trba
Date: Thu Jun 27 14:57:42 2013 +0200
Uploading libmwaw 0.1.10 and dumping unneeded patches
Change-Id: I837b885fb88ccbc1e7980712be4a3342575b3770
diff --git a/download.lst b/download.lst
index 0b43582..858d707 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
export CDR_TARBALL := libcdr-0.0.14.tar.bz2
MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
-MWAW_MD5SUM := 2090daf6e8a27b52e8c5f26c915bd7c5
-export MWAW_TARBALL := libmwaw-0.1.9.tar.bz2
+MWAW_MD5SUM := 2289bb137bbba9b473ce60168895c036
+export MWAW_TARBALL := libmwaw-0.1.10.tar.bz2
VISIO_MD5SUM := 05574c2ec54dd0c29d75cacdf9419f44
export VISIO_TARBALL := libvisio-0.0.28.tar.bz2
diff --git a/libmwaw/UnpackedTarball_libmwaw.mk
b/libmwaw/UnpackedTarball_libmwaw.mk
index a17961d..96fe9df 100644
--- a/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/libmwaw/UnpackedTarball_libmwaw.mk
@@ -11,9 +11,4 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libmwaw))
$(eval $(call gb_UnpackedTarball_set_tarball,libmwaw,$(MWAW_TARBALL)))
-$(eval $(call gb_UnpackedTarball_add_patches,libmwaw,\
- libmwaw/libmwaw-0.1.9.patch.1 \
- libmwaw/libmwaw-infinite-loop.patch.1 \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/libmwaw/libmwaw-0.1.9.patch.1 b/libmwaw/libmwaw-0.1.9.patch.1
deleted file mode 100644
index e5eb6da..000
--- a/libmwaw/libmwaw-0.1.9.patch.1
+++ /dev/null
@@ -1,15 +0,0 @@
a/src/lib/MWAWTable.hxx
-+++ b/src/lib/MWAWTable.hxx
-@@ -117,7 +117,11 @@ protected:
- - c2.m_cell->box().size()[m_coord];
- if (diffF < 0) return true;
- if (diffF > 0) return false;
-- return ssize_t(c1.m_cell) < ssize_t(c2.m_cell);
-+#ifdef _WIN64
-+ return __int64(c1.m_cell) < __int64(c2.m_cell);
-+#else
-+ return long(c1.m_cell) < long(c2.m_cell);
-+#endif
- }
-
- //! the coord to compare
diff --git a/libmwaw/libmwaw-infinite-loop.patch.1
b/libmwaw/libmwaw-infinite-loop.patch.1
deleted file mode 100644
index 9c8e3a8..000
--- a/libmwaw/libmwaw-infinite-loop.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
-fix infinite loop in findCentralDirectoryEnd
-
-WPXSvInputStreamImpl::seek returns -1 if it catches an exception
-
libmwaw/src/lib/MWAWZipStream.cxx 2013-06-18 00:37:57.208657845 +0200
-+++ libmwaw/src/lib/MWAWZipStream.cxx 2013-06-18 00:48:20.971665257 +0200
-@@ -258,18 +258,20 @@
-
- static bool findCentralDirectoryEnd(WPXInputStream *input)
- {
-- input->seek(0, WPX_SEEK_SET);
-+ // seek returns -1 both on error and on seek to position post-the-end
-+ int ret = input->seek(0, WPX_SEEK_SET);
- try {
--while (!input->atEOS())
-- input->seek(1024, WPX_SEEK_CUR);
-+while (-1 != ret && !input->atEOS())
-+ ret = input->seek(1024, WPX_SEEK_CUR);
- input->seek(-1024, WPX_SEEK_CUR);
--while (!input->atEOS()) {
-+ret = 0; // perhaps it's smaller than 1024?
-+while (-1 != ret && !input->atEOS()) {
- unsigned signature = getInt(input);
- if (signature == CDIR_END_SIG) {
- input->seek(-4, WPX_SEEK_CUR);
- return true;
- } else
--input->seek(-3, WPX_SEEK_CUR);
-+ret = input->seek(-3, WPX_SEEK_CUR);
- }
- } catch (...) {
- return false;
___
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/edit/eddel.cxx | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit e47b7f967bcdd8b1e830d07b2ad941b1302686f7
Author: Oliver-Rainer Wittmann
Date: Thu Jun 27 09:56:32 2013 +
Related: #i121925# fixed by reverting change for issue #i119652#
(cherry picked from commit be6ce149c164d8ac06f12a4a1cc04a9299f5fd07)
Conflicts:
sw/source/core/edit/eddel.cxx
Change-Id: I13ff642a7d983a1a1ffe4e3e0b412ec190d900bb
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 2d7adb6..05ea03a 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -35,17 +35,17 @@
void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
{
-// only for selections
-if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark())
+// only on a selection
+if ( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark())
return;
// Is the selection in a table? Then delete only the content of the
selected boxes.
// Here, there are two cases:
// 1. Point and Mark are in one box, delete selection as usual
// 2. Point and Mare are in different boxes, search all selected boxes and
delete content
+
if( rPam.GetNode()->FindTableNode() &&
-rPam.GetNode()->StartOfSectionNode() !=
-rPam.GetNode(sal_False)->StartOfSectionNode() )
+rPam.GetNode()->StartOfSectionNode() !=
rPam.GetNode(sal_False)->StartOfSectionNode() )
{
// group the Undo in the table
if( pUndo && !*pUndo )
@@ -71,6 +71,9 @@ void SwEditShell::DeleteSel( SwPaM& rPam, sal_Bool* pUndo )
aDelPam.Move( fnMoveBackward, fnGoCntnt );
}
// skip protected boxes
+//For i117395, in some situation, the node would be hidden or
invisible, which makes the frame of it unavailable
+//So verify it before use it.
+SwCntntFrm* pFrm = NULL;
if( !pNd->IsCntntNode() ||
!pNd->IsInProtectSect() )
{
___
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' - be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07
be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 |1 + 1 file changed, 1 insertion(+) New commits: commit 2e4a422a97dee29f03dc23ce4b4dc794ba83eb27 Author: Caolán McNamara Date: Thu Jun 27 13:57:38 2013 +0100 Notes added by 'git notes add' diff --git a/be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 b/be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 new file mode 100644 index 000..a34901d --- /dev/null +++ b/be/6ce149c164d8ac06f12a4a1cc04a9299f5fd07 @@ -0,0 +1 @@ +merged as: e47b7f967bcdd8b1e830d07b2ad941b1302686f7 ___ 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' - RepositoryFixes.mk
RepositoryFixes.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 3c1559ba0ba71bb18faacd18016cd9e3b510c598 Author: Michael Stahl Date: Thu Jun 27 14:35:36 2013 +0200 fdo#64672: untested attempt to get unordf to link in raptor with MSVC This is all very different on master. Change-Id: If2a5bf5d13e1ea2b600c707b53339a38627ca86e Reviewed-on: https://gerrit.libreoffice.org/4583 Reviewed-by: David Tardon Tested-by: David Tardon diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index ecc6369..f298f2b 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -116,6 +116,7 @@ gb_Library_FILENAMES := $(patsubst exslt:iexslt%,exslt:libexslt%,$(gb_Library_FI gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst package2:ipackage2%,package2:ipackage%,$(gb_Library_FILENAMES)) +gb_Library_FILENAMES := $(patsubst raptor:iraptor%,raptor:libraptor%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES)) ___ 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 | 29 +++
sw/inc/tblafmt.hxx | 12
sw/source/core/doc/swtblfmt.cxx | 97
sw/source/core/doc/tblafmt.cxx | 93 +-
4 files changed, 170 insertions(+), 61 deletions(-)
New commits:
commit 171093a390fb2c29cee610fd0f6924b3c0a351fd
Author: Alex Ivan
Date: Thu Jun 27 15:28:29 2013 +0300
Move table format information into SwTableFmt
Moved the information currently stored in SwTableAutoFmt
into SwTableFmt class
Change-Id: If0d0cf82a2ea14995410bcf03957d9a85b6e8e17
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 2a9d53a..a068fb9 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -19,6 +19,11 @@
#ifndef _SWTBLFMT_HXX
#define _SWTBLFMT_HXX
+#include
+#include
+#include
+#include
+#include
#include
class SwDoc;
@@ -46,7 +51,11 @@ protected:
SwTableLineFmt* pOddColFmt;
SwTableLineFmt* pEvnColFmt;
+sal_uInt16 m_aRepeatHeading;
+sal_Bool m_bRowSplit;
+
public:
+SwTableFmt& operator=( const SwTableFmt& rNew );
void SetFirstLineFmt( SwTableLineFmt* pNew ) { pFstLineFmt = pNew; }
void SetLastLineFmt( SwTableLineFmt* pNew ) { pLstLineFmt = pNew; }
@@ -68,6 +77,26 @@ 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 SetShadow( const SvxShadowItem& rNew );
+
+const SvxFmtBreakItem& GetBreak() const;
+const SwFmtPageDesc& GetPageDesc() const;
+const SvxFmtKeepItem& GetKeepWithNextPara() const;
+sal_Bool GetLayoutSplit() const;
+sal_Bool GetCollapsingBorders() const;
+const SvxShadowItem& GetShadow() const;
+
TYPEINFO(); // Already in base class Content.
DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 1988933..3ac0123 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -249,16 +249,6 @@ class SW_DLLPUBLIC SwTableAutoFmt
SwBoxAutoFmt* aBoxAutoFmt[ 16 ];
-// Writer-specific options
-SvxFmtBreakItem m_aBreak;
-SwFmtPageDesc m_aPageDesc;
-SvxFmtKeepItem m_aKeepWithNextPara;
-sal_uInt16 m_aRepeatHeading;
-sal_Bool m_bLayoutSplit;
-sal_Bool m_bRowSplit;
-sal_Bool m_bCollapsingBorders;
-SvxShadowItem m_aShadow;
-
public:
SwTableAutoFmt( const String& rName, SwTableFmt* pTableStyle );
SwTableAutoFmt( const SwTableAutoFmt& rNew );
@@ -266,6 +256,8 @@ public:
SwTableAutoFmt& operator=( const SwTableAutoFmt& rNew );
+SwTableFmt* GetTableStyle() { return m_pTableStyle; }
+
void SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos );
const SwBoxAutoFmt& GetBoxFmt( sal_uInt8 nPos ) const;
diff --git a/sw/source/core/doc/swtblfmt.cxx b/sw/source/core/doc/swtblfmt.cxx
index b3cd7ff..c3fcd1a 100644
--- a/sw/source/core/doc/swtblfmt.cxx
+++ b/sw/source/core/doc/swtblfmt.cxx
@@ -22,7 +22,15 @@
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 );
+SetShadow( SvxShadowItem( RES_SHADOW ) );
+
pFstLineFmt = NULL;
pLstLineFmt = NULL;
pOddLineFmt = NULL;
@@ -37,7 +45,15 @@ 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 );
+SetShadow( SvxShadowItem( RES_SHADOW ) );
+
pFstLineFmt = NULL;
pLstLineFmt = NULL;
pOddLineFmt = NULL;
@@ -49,6 +65,87 @@ SwTableFmt::SwTableFmt( SwAttrPool& rPool, const String
&rFmtNm,
pEvnColFmt = NULL;
}
[Libreoffice-commits] core.git: sw/source
sw/source/ui/wrtsh/delete.cxx | 12 +++-
sw/source/ui/wrtsh/wrtsh4.cxx |5 +++--
2 files changed, 14 insertions(+), 3 deletions(-)
New commits:
commit e6cd5d0b11e7d8562358b883c08a8dba9fd4f61d
Author: Oliver-Rainer Wittmann
Date: Thu Jun 27 09:41:05 2013 +
Resolves: #119652# avoid invalid selection on...
Delete-To-Start-Of-Sentence action
(cherry picked from commit 562cc00ca57d00a22d56e61c5da307864e5db2f9)
Conflicts:
sw/source/ui/wrtsh/wrtsh4.cxx
Change-Id: I56e104792f28b462327a53d243baa6c1413b3099
diff --git a/sw/source/ui/wrtsh/delete.cxx b/sw/source/ui/wrtsh/delete.cxx
index f19455e..940a411 100644
--- a/sw/source/ui/wrtsh/delete.cxx
+++ b/sw/source/ui/wrtsh/delete.cxx
@@ -446,7 +446,17 @@ long SwWrtShell::DelToStartOfSentence()
if(IsStartOfDoc())
return 0;
OpenMark();
-long nRet = _BwdSentence() ? Delete() : 0;
+
+SwCrsrSaveState aSaveState( *(_GetCrsr()) );
+sal_Bool bSuccessfulSelection = _BwdSentence();
+if ( _GetCrsr()->IsInProtectTable( sal_True )
+ || _GetCrsr()->IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
+ nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
+{
+bSuccessfulSelection = sal_False;
+}
+long nRet = bSuccessfulSelection ? Delete() : 0;
+
CloseMark( 0 != nRet );
return nRet;
}
diff --git a/sw/source/ui/wrtsh/wrtsh4.cxx b/sw/source/ui/wrtsh/wrtsh4.cxx
index 6966e45..6277276 100644
--- a/sw/source/ui/wrtsh/wrtsh4.cxx
+++ b/sw/source/ui/wrtsh/wrtsh4.cxx
@@ -198,14 +198,15 @@ sal_Bool SwWrtShell::_BwdSentence()
if(!SwCrsrShell::Left(1,CRSR_SKIP_CHARS))
{
Pop(sal_False);
-return 0;
+return sal_False;
}
if( !GoStartSentence() && !IsSttPara() )
// not found --> go to the beginning of the paragraph
SwCrsrShell::MovePara( fnParaCurr, fnParaStart );
ClearMark();
Combine();
-return 1;
+
+return sal_True;
}
sal_Bool SwWrtShell::_FwdPara()
___
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' - 56/2cc00ca57d00a22d56e61c5da307864e5db2f9
56/2cc00ca57d00a22d56e61c5da307864e5db2f9 |1 + 1 file changed, 1 insertion(+) New commits: commit cfd1a477ec204dda2ce8008ee4b8250c708441c8 Author: Caolán McNamara Date: Thu Jun 27 13:45:58 2013 +0100 Notes added by 'git notes add' diff --git a/56/2cc00ca57d00a22d56e61c5da307864e5db2f9 b/56/2cc00ca57d00a22d56e61c5da307864e5db2f9 new file mode 100644 index 000..0d2043e --- /dev/null +++ b/56/2cc00ca57d00a22d56e61c5da307864e5db2f9 @@ -0,0 +1 @@ +merged as: e6cd5d0b11e7d8562358b883c08a8dba9fd4f61d ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/svx
include/svx/nbdtmg.hxx | 27 +++
1 file changed, 23 insertions(+), 4 deletions(-)
New commits:
commit 09650703d3a6f8e579d2d822fbb59de0da8c070e
Author: Norbert Thiebaud
Date: Wed Jun 26 20:24:24 2013 -0500
coverity#1028587-9 Unitialized scalar field
Change-Id: Id8ad238d9aa029df0c5e970b2b8fb2145b87be25
Reviewed-on: https://gerrit.libreoffice.org/4557
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index eb75368..c92bb0f 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -190,9 +190,28 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
voidStoreMapUnit_impl();
public:
-NBOTypeMgrBase(const NBOType
aType):eType(aType),pSet(0),eCoreUnit(SFX_MAPUNIT_TWIP),aNumCharFmtName(String()){}
-NBOTypeMgrBase(const NBOType aType,const SfxItemSet*
pArg):eType(aType),pSet(pArg),eCoreUnit(SFX_MAPUNIT_TWIP),aNumCharFmtName(String()){}
-NBOTypeMgrBase(const NBOTypeMgrBase& aTypeMgr){eType =
aTypeMgr.eType;pSet = aTypeMgr.pSet;eCoreUnit =
aTypeMgr.eCoreUnit;aNumCharFmtName = aTypeMgr.aNumCharFmtName; }
+NBOTypeMgrBase(const NBOType aType)
+: eType(aType)
+, pSet(0)
+, eCoreUnit(SFX_MAPUNIT_TWIP)
+, aNumCharFmtName(String())
+, bIsLoading(false)
+{}
+NBOTypeMgrBase(const NBOType aType,const SfxItemSet* pArg)
+: eType(aType)
+, pSet(pArg)
+, eCoreUnit(SFX_MAPUNIT_TWIP)
+, aNumCharFmtName(String())
+, bIsLoading(false)
+{}
+NBOTypeMgrBase(const NBOTypeMgrBase& aTypeMgr)
+{
+eType = aTypeMgr.eType;
+pSet = aTypeMgr.pSet;
+eCoreUnit = aTypeMgr.eCoreUnit;
+aNumCharFmtName = aTypeMgr.aNumCharFmtName;
+bIsLoading = false;
+}
virtual ~NBOTypeMgrBase() {}
virtual void Init()=0;
virtual sal_uInt16 GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16
mLevel,sal_uInt16 nFromIndex=0)=0;
@@ -208,7 +227,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
String GetBulCharFmtName();
SfxMapUnit GetMapUnit();
protected:
-sal_BoolbIsLoading;
+boolbIsLoading;
voidImplLoad(String filename);
voidImplStore(String filename);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: editeng/source
editeng/source/editeng/impedit2.cxx | 20
1 file changed, 12 insertions(+), 8 deletions(-)
New commits:
commit d9ac156b2d651c1305135938a1e828144aa5742b
Author: Norbert Thiebaud
Date: Wed Jun 26 19:54:50 2013 -0500
coverity#1038307 Negative loop bound
Change-Id: Ib0ca4fc350d84e25283e261cb9f48b0f6f22e81b
Reviewed-on: https://gerrit.libreoffice.org/4556
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index d6e1de5..bba2f2a 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1893,15 +1893,19 @@ void ImpEditEngine::InitWritingDirections( sal_Int32
nPara )
size_t nCount = ubidi_countRuns( pBidi, &nError );
-int32_t nStart = 0;
-int32_t nEnd;
-UBiDiLevel nCurrDir;
-
-for ( size_t nIdx = 0; nIdx < nCount; ++nIdx )
+/* ubidi_countRuns can return -1 in case of error */
+if(nCount > 0)
{
-ubidi_getLogicalRun( pBidi, nStart, &nEnd, &nCurrDir );
-rInfos.push_back( WritingDirectionInfo( nCurrDir,
(sal_uInt16)nStart, (sal_uInt16)nEnd ) );
-nStart = nEnd;
+int32_t nStart = 0;
+int32_t nEnd;
+UBiDiLevel nCurrDir;
+
+for ( size_t nIdx = 0; nIdx < nCount; ++nIdx )
+{
+ubidi_getLogicalRun( pBidi, nStart, &nEnd, &nCurrDir );
+rInfos.push_back( WritingDirectionInfo( nCurrDir,
(sal_uInt16)nStart, (sal_uInt16)nEnd ) );
+nStart = nEnd;
+}
}
ubidi_close( pBidi );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source
cui/source/tabpages/backgrnd.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 3f8445b20e416ae913d68a31d522b948fe4b1684
Author: Norbert Thiebaud
Date: Wed Jun 26 18:13:09 2013 -0500
coverity#1038294 Explicit null dereference
Change-Id: Ifab48223b505a3061e70e5bc8741a293100a24bc
Reviewed-on: https://gerrit.libreoffice.org/4555
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 16f8d95..ea37ea5 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1728,12 +1728,16 @@ IMPL_LINK( SvxBackgroundTabPage,
ParaDestinationHdl_Impl, ListBox*, pBox )
SvxBrushItem* pActItem = NULL;
switch(pParaBck_Impl->nActPos)
{
-case PARA_DEST_PARA:
-pActItem = pParaBck_Impl->pParaBrush;
+case PARA_DEST_PARA:
+pActItem = pParaBck_Impl->pParaBrush;
break;
-case PARA_DEST_CHAR:
-pActItem = pParaBck_Impl->pCharBrush;
+case PARA_DEST_CHAR:
+pActItem = pParaBck_Impl->pCharBrush;
break;
+default:
+/* we assert here because the rest of the code expect pActItem to
be non NULL */
+assert(false);
+return 0;
}
pParaBck_Impl->nActPos = nSelPos;
if(XFILL_SOLID == lcl_getFillStyle(m_pLbSelect)) // brush selected
___
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' - fe/bd0946e8c2686f0a679d3f32fbb39f5ef1c295
fe/bd0946e8c2686f0a679d3f32fbb39f5ef1c295 |1 + 1 file changed, 1 insertion(+) New commits: commit e0796c3d1a9c0241d2a30fbae7e73f59833d1df7 Author: Caolán McNamara Date: Thu Jun 27 13:38:12 2013 +0100 Notes added by 'git notes add' diff --git a/fe/bd0946e8c2686f0a679d3f32fbb39f5ef1c295 b/fe/bd0946e8c2686f0a679d3f32fbb39f5ef1c295 new file mode 100644 index 000..edeca16 --- /dev/null +++ b/fe/bd0946e8c2686f0a679d3f32fbb39f5ef1c295 @@ -0,0 +1 @@ +merged as: 5080a76a9f965bf9658e5f543188961d9ff8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svtools/source
svtools/source/table/tablecontrol_impl.cxx |7 +++
1 file changed, 7 insertions(+)
New commits:
commit 5080a76a9f965bf9658e5f543188961d9ff8
Author: Jürgen Schmidt
Date: Thu Jun 27 10:57:58 2013 +
Resolves: #i122586# recalcuate width when scrolling to last column
(cherry picked from commit febd0946e8c2686f0a679d3f32fbb39f5ef1c295)
Change-Id: Ia1aba1eddf9035504677d10a7414f9a498b952e1
diff --git a/svtools/source/table/tablecontrol_impl.cxx
b/svtools/source/table/tablecontrol_impl.cxx
index cf89b13..e27dbac 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -2063,6 +2063,7 @@ namespace svt { namespace table
case TableAreaAll:
m_pDataWindow->Invalidate();
+m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT );
break;
}
}
@@ -2343,7 +2344,10 @@ namespace svt { namespace table
m_pDataWindow->Scroll( 0, (long)-nPixelDelta, aDataArea,
SCROLL_CLIP | SCROLL_UPDATE | SCROLL_CHILDREN);
}
else
+{
m_pDataWindow->Invalidate( INVALIDATE_UPDATE );
+m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT
);
+}
// update the position at the vertical scrollbar
if ( m_pVScroll != NULL )
@@ -2420,7 +2424,10 @@ namespace svt { namespace table
m_pDataWindow->Scroll( nPixelDelta, 0, aDataArea, SCROLL_CLIP
| SCROLL_UPDATE );
}
else
+{
m_pDataWindow->Invalidate( INVALIDATE_UPDATE );
+m_pDataWindow->GetParent()->Invalidate( INVALIDATE_TRANSPARENT
);
+}
// update the position at the horizontal scrollbar
if ( m_pHScroll != NULL )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 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 6391e823dcb5dd87b0f7f3039144b8cccd8626c8
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
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/postgresql/pq_tools.cxx
index 11e0c30..dcdc30b 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/
[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/Library_avmediavlc.mk avmedia/source
avmedia/Library_avmediavlc.mk|1
avmedia/source/vlc/vlccommon.hxx |1
avmedia/source/vlc/vlcwindow.cpp | 122 ---
avmedia/source/vlc/vlcwindow.cxx | 122 +++
4 files changed, 124 insertions(+), 122 deletions(-)
New commits:
commit ec1cbc4c11deba910a1eede9bd791d0991ca51d1
Author: Michael Meeks
Date: Thu Jun 27 13:29:40 2013 +0100
get vlcwindow compiling.
Change-Id: I188a8ecf30e3816bd915ccdd452f6a93bd9d021d
diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index 465fe2f..ced6c41 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_Library_add_exception_objects,avmediavlc,\
avmedia/source/vlc/vlcmanager \
avmedia/source/vlc/vlcplayer \
avmedia/source/vlc/vlcuno \
+ avmedia/source/vlc/vlcwindow \
))
# vim: set noet sw=4 ts=4:
diff --git a/avmedia/source/vlc/vlccommon.hxx b/avmedia/source/vlc/vlccommon.hxx
index e9cc864..efc022f 100644
--- a/avmedia/source/vlc/vlccommon.hxx
+++ b/avmedia/source/vlc/vlccommon.hxx
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#endif // _VLCCOMMOM_HXX
diff --git a/avmedia/source/vlc/vlcwindow.cpp b/avmedia/source/vlc/vlcwindow.cpp
deleted file mode 100644
index c92dd7a..000
--- a/avmedia/source/vlc/vlcwindow.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-#include "vlcwindow.hxx"
-
-using namespace ;
-
-namespace avmedia {
-namespace vlc {
-
-void SAL_CALL VLCWindow::pdate()
-{
-}
-
-::sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel ZoomLevel )
-{
-return false;
-}
-
-css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel()
-{
-return css::media::ZoomLevel_NOT_AVAILABLE;
-}
-
-void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 SystemPointerType )
-{
-}
-
-::rtl::OUString SAL_CALL VLCWindow::getImplementationName()
-{
-return ::rtl::OUString();
-}
-
-::sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString&
ServiceName )
-{
-return false;
-}
-
-::uno::Sequence< ::rtl::OUString > SAL_CALL
VLCWindow::getSupportedServiceNames()
-{
-return ::uno::Sequence< ::rtl::OUString >();
-}
-
-void SAL_CALL VLCWindow::dispose() throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::addEventListener( const ::uno::Reference<
::lang::XEventListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::removeEventListener( const ::uno::Reference<
:::lang::XEventListener >& aListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32
Width, sal_Int32 Height, sal_Int16 Flags ) throw (::uno::RuntimeException)
-{
-}
-
-::awt::Rectangle SAL_CALL VLCWindow::getPosSize() throw
(::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::setVisible( sal_Bool Visible ) throw
(::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::setEnable( sal_Bool Enable ) throw
(::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::setFocus() throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::addWindowListener( const ::uno::Reference<
::awt::XWindowListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::removeWindowListener( const ::uno::Reference<
::awt::XWindowListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::addFocusListener( const ::uno::Reference<
::awt::XFocusListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::removeFocusListener( const ::uno::Reference<
::awt::XFocusListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::addKeyListener( const ::uno::Reference<
::awt::XKeyListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::removeKeyListener( const ::uno::Reference<
::awt::XKeyListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::addMouseListener( const ::uno::Reference<
::awt::XMouseListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::removeMouseListener( const ::uno::Reference<
::awt::XMouseListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::addMouseMotionListener( const ::uno::Reference<
::awt::XMouseMotionListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::removeMouseMotionListener( const ::uno::Reference<
::awt::XMouseMotionListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::addPaintListener( const ::uno::Reference<
::awt::XPaintListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-void SAL_CALL VLCWindow::removePaintListener( const ::uno::Reference<
::awt::XPaintListener >& xListener ) throw (::uno::RuntimeException)
-{
-}
-
-}
-}
\ No newline at end of file
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - i18npool/Library_i18npool.mk
i18npool/Library_i18npool.mk | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) New commits: commit 4e11246cc8f0b39562daf083e894ded86a8e2146 Author: David Tardon Date: Fri Jun 21 16:31:03 2013 +0200 Revert "better dependency working also for libmerged" It might work with libmerged, but it does not work otherwise. This reverts commit f8fd2e6a3b21ec3899a74d7400cafaba4e83ff6c. (cherry picked from commit 247f37890060330f3c3d2d05bbd8e36d689e9ada) Change-Id: I3b9f8831cf64514a089289dfd0631b7b9e24c6b7 Signed-off-by: David Tardon Reviewed-on: https://gerrit.libreoffice.org/4571 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk index b578664..e91465b 100644 --- a/i18npool/Library_i18npool.mk +++ b/i18npool/Library_i18npool.mk @@ -136,10 +136,10 @@ $(eval $(call gb_Library_add_generated_cobjects,i18npool,\ # i18npool dlopens localedata_* libraries. # This is runtime dependency to prevent tests # to be run sooner then localedata_* exists. -$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,i18npool)) :| \ - $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_en)) \ - $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_es)) \ - $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_euro)) \ - $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,localedata_others)) \ +$(call gb_Library_get_target,i18npool) : | \ + $(call gb_Library_get_target,localedata_en) \ + $(call gb_Library_get_target,localedata_es) \ + $(call gb_Library_get_target,localedata_euro) \ + $(call gb_Library_get_target,localedata_others) \ # 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 'libreoffice-4-1' - starmath/source
starmath/source/view.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit af93691a3d9dd81fed39295dcc6bc18be2071d59
Author: Caolán McNamara
Date: Thu Jun 27 11:24:53 2013 +0100
valgrind: bInsertIntoEditWindow uninitialized
Change-Id: I3da23e991a70e12bdfefeda5f5e7669ab111cfb4
(cherry picked from commit 2278e3cc31f97259ba2eea86e99739006a23b8e3)
Reviewed-on: https://gerrit.libreoffice.org/4574
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index d144dde..d0272aa 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1989,6 +1989,7 @@ SmViewShell::SmViewShell(SfxViewFrame *pFrame_,
SfxViewShell *):
pImpl( new SmViewShell_Impl ),
aGraphic(this),
aGraphicController(aGraphic, SID_GAPHIC_SM, pFrame_->GetBindings())
+, bInsertIntoEditWindow(false)
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmViewShell::SmViewShell" );
___
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' - e6/e39deca7a612966dd63051023a870be8146891
e6/e39deca7a612966dd63051023a870be8146891 |1 + 1 file changed, 1 insertion(+) New commits: commit fd9ca6d6c90496633ed1b25929d9962aca8b40d6 Author: Caolán McNamara Date: Thu Jun 27 13:26:17 2013 +0100 Notes added by 'git notes add' diff --git a/e6/e39deca7a612966dd63051023a870be8146891 b/e6/e39deca7a612966dd63051023a870be8146891 new file mode 100644 index 000..8e5c182 --- /dev/null +++ b/e6/e39deca7a612966dd63051023a870be8146891 @@ -0,0 +1 @@ +ignore: aoo ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 00/fca2ceeb6338462a5022587bc18b57f768e877
00/fca2ceeb6338462a5022587bc18b57f768e877 |1 + 1 file changed, 1 insertion(+) New commits: commit 9b677e1dd62b2d6d944198228eaac9f1c89c4ba6 Author: Caolán McNamara Date: Thu Jun 27 13:25:51 2013 +0100 Notes added by 'git notes add' diff --git a/00/fca2ceeb6338462a5022587bc18b57f768e877 b/00/fca2ceeb6338462a5022587bc18b57f768e877 new file mode 100644 index 000..00b55a3 --- /dev/null +++ b/00/fca2ceeb6338462a5022587bc18b57f768e877 @@ -0,0 +1 @@ +ignore: branding ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
