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 <kohei.yosh...@gmail.com>
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 0000000..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(testCellValueXLSX);
CPPUNIT_TEST(testControlImport);
CPPUNIT_TEST(testChartImportODS);
@@ -1190,41 +1188,6 @@ void ScFiltersTest::testBrokenQuotesCSV()
xDocSh->DoClose();
}
-void ScFiltersTest::testSharedFormulaXLSX()
-{
- const OUString aFileNameBase("shared-formula.");
- OUString aFileExtension(aFileFormats[XLSX].pName,
strlen(aFileFormats[XLSX].pName), RTL_TEXTENCODING_UTF8 );
- OUString aFilterName(aFileFormats[XLSX].pFilterName,
strlen(aFileFormats[XLSX].pFilterName), RTL_TEXTENCODING_UTF8) ;
- OUString aFileName;
- createFileURL(aFileNameBase, aFileExtension, aFileName);
- OUString aFilterType(aFileFormats[XLSX].pTypeName,
strlen(aFileFormats[XLSX].pTypeName), RTL_TEXTENCODING_UTF8);
- std::cout << aFileFormats[XLSX].pName << " Test" << std::endl;
-
- unsigned int nFormatType = aFileFormats[XLSX].nFormatType;
- unsigned int nClipboardId = nFormatType ? SFX_FILTER_IMPORT |
SFX_FILTER_USESOPTIONS : 0;
- ScDocShellRef xDocSh = ScBootstrapFixture::load(aFileName, aFilterName,
OUString(), aFilterType,
- nFormatType, nClipboardId, SOFFICE_FILEFORMAT_CURRENT);
-
- xDocSh->DoHardRecalc(true);
-
- CPPUNIT_ASSERT_MESSAGE("Failed to load shared-formula.xlsx", xDocSh.Is());
- ScDocument* pDoc = xDocSh->GetDocument();
- CPPUNIT_ASSERT_MESSAGE("No Document", pDoc); //remove with first test
-
- OUString aCSVPath;
- createCSVPath( aFileNameBase, aCSVPath );
- testFile( aCSVPath, pDoc, 0 );
-
- //test some additional properties
- ScRangeName* pName = pDoc->GetRangeName();
- for (ScRangeName::iterator itr = pName->begin(); itr != pName->end();
++itr)
- {
- CPPUNIT_ASSERT(itr->second->GetType() & RT_SHARED);
- }
-
- xDocSh->DoClose();
-}
-
void ScFiltersTest::testCellValueXLSX()
{
const OUString aFileNameBase("cell-value.");
commit 04293f3e4ebd714d1a0f89e6d3efe49c7f02e1c1
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
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, \
commit a4c5e8e5c4d18605e5d582b2dafcd47f4a6da72e
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
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<SCROW>(9), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(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<SCROW>(8), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(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<SCROW>(8), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(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<SCROW>(14), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(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<SCROW>(8), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(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<SCROW>(8), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(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<SCROW>(12), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(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<SCROW>(12), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(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, pFC->GetSharedTopRow());
- CPPUNIT_ASSERT_EQUAL(3, pFC->GetSharedLength());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(12), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(3), pFC->GetSharedLength());
aPos.SetRow(23); // B24
pFC = m_pDoc->GetFormulaCell(aPos);
CPPUNIT_ASSERT_MESSAGE("This cell is expected to be a shared formula
cell.", pFC && pFC->IsShared());
- CPPUNIT_ASSERT_EQUAL(20, pFC->GetSharedTopRow());
- CPPUNIT_ASSERT_EQUAL(5, pFC->GetSharedLength());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(20), pFC->GetSharedTopRow());
+ CPPUNIT_ASSERT_EQUAL(static_cast<SCROW>(5), pFC->GetSharedLength());
#endif
m_pDoc->DeleteTab(0);
commit 006d982840da63ec9605b8bf3a211453e7c7d46c
Author: Kohei Yoshida <kohei.yosh...@gmail.com>
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 4cccc36..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
commit b0086348c68d3930b015bd10121fc75ee57ec83c
Author: Julien Nabet <serval2...@yahoo.fr>
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.
<p>Returns `TRUE` only if the PopupMenu is being executed
- as a result of invoking <member >XPopupMenu::execute()</member>; that
is,
+ as a result of invoking XPopupMenu::execute(); that is,
for a PopupMenu activated by a MenuBar item,
this methods returns `FALSE`.</p>
@@ -110,15 +110,15 @@ published interface XPopupMenu: XMenu
`TRUE` if the PopupMenu is being executed,
`FALSE` otherwise.
- @see <member >XPopupMenu::execute()</member>
+ @see XPopupMenu::execute()
*/
boolean isInExecute();
/** ends the execution of the PopupMenu.
- <p><member scope="com::sun::star::awt">XPopupMenu::execute()</member>
+ <p>com::sun::star::awt::XPopupMenu::execute()
will then return 0.</p>
- @see <member scope="com::sun::star::awt">XPopupMenu::execute()</member>
+ @see com::sun::star::awt::XPopupMenu::execute()
*/
void endExecute();
@@ -143,7 +143,7 @@ published interface XPopupMenu: XMenu
<p>The KeyEvent is <b>only</b> used as a container to transport
the shortcut information, so that in this case
- <member scope="::com::sun::star::lang::">EventObject::Source</member>
is <NULL/>.</p>
+ ::com::sun::star::lang::EventObject::Source is NULL.</p>
@param nItemId
specifies the menu item identifier for which the KeyEvent should
be retrieved.
commit c9b5e09adbd0547c9156adfef69e5db1067caba1
Author: Julien Nabet <serval2...@yahoo.fr>
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.
<br>
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
- <p>If this property is present, it interacts with the #ImageURLin the
+ <p>If this property is present, it interacts with the #ImageURL in the
following way:
<ul><li>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
- <p>If this property is present, it interacts with the #ImageURLin the
+ <p>If this property is present, it interacts with the #ImageURL in the
following way:
<ul><li>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
- <p>If this property is present, it interacts with the #ImageURLin the
+ <p>If this property is present, it interacts with the #ImageURL in the
following way:
<ul><li>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
- <p>If this property is present, it interacts with the #ImageURLin the
+ <p>If this property is present, it interacts with the #ImageURL in the
following way:
<ul><li>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/UnoControlRadioButtonModel.idl
b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
index fa81bf4..775ae7d 100644
--- a/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRadioButtonModel.idl
@@ -102,7 +102,7 @@ published service UnoControlRadioButtonModel
/** specifies a graphic to be displayed besides the label of the control
- <p>If this property is present, it interacts with the #ImageURLin the
+ <p>If this property is present, it interacts with the #ImageURL in the
following way:
<ul><li>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/UnoControlRoadmapModel.idl
b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
index 6d1a242..70d8c15 100644
--- a/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlRoadmapModel.idl
@@ -77,7 +77,7 @@ service UnoControlRoadmapModel
/** specifies a graphic to be displayed on the control
- <p>If this property is present, it interacts with the #ImageURLin the
+ <p>If this property is present, it interacts with the #ImageURL in the
following way:
<ul><li>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/modules.idl b/offapi/com/sun/star/modules.idl
index d7bf65d..fe80558 100644
--- a/offapi/com/sun/star/modules.idl
+++ b/offapi/com/sun/star/modules.idl
@@ -38,7 +38,7 @@ module com { module sun { module star {
This interface's only method returns the actual accessibility object, an
instance of ::com::sun::star::accessibility::XAccessibleContext.
These two interfaces may be implemented by the same class in which case
- a call to ::com::sun::star::accessibility::XAccessible::getAccessible()
+ a call to ::com::sun::star::accessibility::XAccessible getAccessible()
returns the same object that is
called. Alternatively the implementation of the
::com::sun::star::accessibility::XAccessibleContext
commit 07b8fe9adba0dba91483b3b74745fe29a5aff235
Author: Andras Timar <ati...@suse.com>
Date: Thu Jun 27 21:37:38 2013 +0200
Updated core
Project: translations 05ab1fefb5b317f213960a06fcab7dc1afdcb7e0
diff --git a/translations b/translations
index 379fd93..05ab1fe 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 379fd9390159208a5c453ee611d1425537bb91b8
+Subproject commit 05ab1fefb5b317f213960a06fcab7dc1afdcb7e0
commit 1456e3c5f6675739f6930e41f27f1d34a36764f1
Author: Andras Timar <ati...@suse.com>
Date: Fri Jun 21 21:47:35 2013 +0200
Updated core
Project: translations 379fd9390159208a5c453ee611d1425537bb91b8
diff --git a/translations b/translations
index 56f4367..379fd93 160000
--- 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
