[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 73de30ca9ca0d3d4edd00e0e8f22451238699989
Author: navin patidar pati...@kacst.edu.sa
Date: Sat Feb 2 08:40:30 2013 +0300
fix fdo#59892 completely and fdo#33302 partially.
fix fdo#33302 for rtl scripts in cal,impress and draw.
Change-Id: I83b1e077faf0f2578308e03b7598557f60e7cfd8
Reviewed-on: https://gerrit.libreoffice.org/1961
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 74f6f9e..4458937 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4275,7 +4275,7 @@ void ImpEditEngine::ImplInitDigitMode(OutputDevice*
pOutDev, LanguageType eCurLa
void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16
nPara, sal_uInt16 nIndex )
{
sal_Bool bCTL = sal_False;
-sal_uInt8 bR2L = sal_False;
+sal_Bool bR2L = sal_False;
if ( nIndex == 0x )
{
bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
@@ -4286,8 +4286,9 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice*
pOutDev, sal_uInt16 nPara,
ContentNode* pNode = GetEditDoc().GetObject( nPara );
short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
bCTL = nScriptType == i18n::ScriptType::COMPLEX;
-bR2L = GetRightToLeft( nPara, nIndex + 1); // this change was
discussed in issue 37190
-// it also works for issue
55927
+// this change was discussed in issue 37190
+bR2L = GetRightToLeft( nPara, nIndex + 1) == 1 /*RTL*/ ? true : false;
+// it also works for issue 55927
}
sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editobj2.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 63c19c881247bbb7730bdb767697018f61340697 Author: Kohei Yoshida kohei.yosh...@gmail.com Date: Tue Jan 8 22:28:07 2013 -0500 Remove unnecessary virtual keywords. Change-Id: I1227a4e04bc962da96b77947a706293f9a2a3850 diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx index 04b6ba1..6c0f586 100644 --- a/editeng/source/editeng/editobj2.hxx +++ b/editeng/source/editeng/editobj2.hxx @@ -213,7 +213,7 @@ public: String GetText(size_t nParagraph) const; void Insert(const EditTextObject rObj, size_t nPara); EditTextObject* CreateTextObject(size_t nPara, size_t nParas = 1) const; -virtual void RemoveParagraph(size_t nPara); +void RemoveParagraph(size_t nPara); bool HasPortionInfo() const; void ClearPortionInfo(); @@ -240,7 +240,7 @@ public: void SetStyleSheet(size_t nPara, const String rName, const SfxStyleFamily eFamily); bool ChangeStyleSheets( const XubString rOldName, SfxStyleFamily eOldFamily, const String rNewName, SfxStyleFamily eNewFamily ); -virtual voidChangeStyleSheetName( SfxStyleFamily eFamily, const XubString rOldName, const XubString rNewName ); +void ChangeStyleSheetName( SfxStyleFamily eFamily, const XubString rOldName, const XubString rNewName ); editeng::FieldUpdater GetFieldUpdater(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editobj.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit a796fdf07ba6196eaa1ed41b2846c99a9eda421a
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Jan 8 22:32:56 2013 -0500
Explicitly initialize SfxItemPoolUser in copy constructor.
To keep MacOSX-Intel tinderbox happy.
Change-Id: I8dbc8330fd688fc1c1ed005d1603ff52f8b7a16d
diff --git a/editeng/source/editeng/editobj.cxx
b/editeng/source/editeng/editobj.cxx
index 06a2d34..41698af 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -185,6 +185,7 @@ EditTextObject::EditTextObject( SfxItemPool* pPool ) :
}
EditTextObject::EditTextObject( const EditTextObject r ) :
+SfxItemPoolUser(),
mpImpl(new EditTextObjectImpl(this, *r.mpImpl))
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sc/source sw/source
editeng/source/editeng/editeng.src |2 +-
sc/source/ui/src/globstr.src |2 +-
sw/source/core/undo/undo.src |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 93a9e52dccf15b53fc1935145df24306e3a4fc3e
Author: Korrawit Pruegsanusak detective.conan.1...@gmail.com
Date: Sun Dec 23 12:40:09 2012 +0700
fdo#58671: Remove accelerators from Undo action texts
These three texts appear in Undo dropdown list, so they don't need
accelerators
Change-Id: Icec8e199c7cc3990b6316937e49aacb7eb1015fb
Reviewed-on: https://gerrit.libreoffice.org/1473
Reviewed-by: Ivan Timofeev timofeev@gmail.com
Tested-by: Ivan Timofeev timofeev@gmail.com
diff --git a/editeng/source/editeng/editeng.src
b/editeng/source/editeng/editeng.src
index 655861b..ad881e3 100644
--- a/editeng/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
@@ -61,7 +61,7 @@ String RID_EDITUNDO_SETSTYLE
String RID_EDITUNDO_TRANSLITERATE
{
-Text [ en-US ] = ~Change Case;
+Text [ en-US ] = Change Case;
};
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 79ad06e..a5ac8b2 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -354,7 +354,7 @@ Resource RID_GLOBSTR
};
String STR_UNDO_TRANSLITERATE
{
-Text [ en-US ] = ~Change Case;
+Text [ en-US ] = Change Case;
};
String STR_DBNAME_IMPORT
{
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index aebd3b8..d5c1ac4 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -267,7 +267,7 @@ String STR_MERGE_TABLE
String STR_TRANSLITERATE
{
-Text [ en-US ] = ~Change Case;
+Text [ en-US ] = Change Case;
};
String STR_DELNUM
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editeng.src |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d39f1fb508128c23c39c24e04b20a2f56c03cb5e
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date: Fri Jan 4 00:55:23 2013 +0100
Spellcheck menu: Rename 'Add' to 'Add to Dictionary'
Change-Id: I601bf1fc34f3e4cccef02d1d4a5ecd1959007cf7
Reviewed-on: https://gerrit.libreoffice.org/1539
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz
diff --git a/editeng/source/editeng/editeng.src
b/editeng/source/editeng/editeng.src
index 2bea4aa..655861b 100644
--- a/editeng/source/editeng/editeng.src
+++ b/editeng/source/editeng/editeng.src
@@ -82,13 +82,13 @@ Menu RID_MENU_SPELL
SubMenu = Menu
{
};
-Text [ en-US ] = ~Add ;
+Text [ en-US ] = ~Add to Dictionary ;
};
MenuItem
{
Identifier = MN_INSERT_SINGLE ;
HelpId = HID_EDITENG_SPELLER_ADDWORD;
-Text [ en-US ] = ~Add ;
+Text [ en-US ] = ~Add to Dictionary ;
};
MenuItem
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/accessibility/AccessibleContextBase.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0897b55183dc76f5c9833fb2649116f560a1f034
Author: Peter Foley pefol...@verizon.net
Date: Tue Dec 25 09:44:16 2012 -0500
build fix for editeng OUString cleanup
Change-Id: I82fdca86631d5b364224d151d85da5baef1a54a8
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 895f655..14cb720 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -504,8 +504,8 @@ uno::Sequence OUString SAL_CALL
{
ThrowIfDisposed ();
static const OUString sServiceNames[2] = {
-com.sun.star.accessibility.Accessible,
-com.sun.star.accessibility.AccessibleContext
+OUString(com.sun.star.accessibility.Accessible),
+OUString(com.sun.star.accessibility.AccessibleContext)
};
return uno::SequenceOUString (sServiceNames, 2);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/accessibility/AccessibleComponentBase.cxx| 10 -
editeng/source/accessibility/AccessibleContextBase.cxx | 39 ++---
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 88 ++--
editeng/source/accessibility/AccessibleHyperlink.cxx|6
editeng/source/accessibility/AccessibleHyperlink.hxx|6
5 files changed, 70 insertions(+), 79 deletions(-)
New commits:
commit 0e028d6ceb2a3900af06f50efecfdc0565b5e7b2
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri Dec 21 23:10:24 2012 -0200
OUString cleanups in editeng/accessibility
Change-Id: Ie280c48cabec4ef9e0c623f8966a65027b975fe4
Reviewed-on: https://gerrit.libreoffice.org/1468
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/editeng/source/accessibility/AccessibleComponentBase.cxx
b/editeng/source/accessibility/AccessibleComponentBase.cxx
index 79ef598..f796c33 100644
--- a/editeng/source/accessibility/AccessibleComponentBase.cxx
+++ b/editeng/source/accessibility/AccessibleComponentBase.cxx
@@ -184,19 +184,17 @@ sal_Int32 SAL_CALL AccessibleComponentBase::getBackground
(void)
-::rtl::OUString SAL_CALL AccessibleComponentBase::getTitledBorderText (void)
+OUString SAL_CALL AccessibleComponentBase::getTitledBorderText (void)
throw (::com::sun::star::uno::RuntimeException)
{
-return ::rtl::OUString ();
+return OUString();
}
-
-
-::rtl::OUString SAL_CALL AccessibleComponentBase::getToolTipText (void)
+OUString SAL_CALL AccessibleComponentBase::getToolTipText (void)
throw (::com::sun::star::uno::RuntimeException)
{
-return ::rtl::OUString ();
+return OUString();
}
diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 8a11762..895f655 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -33,7 +33,6 @@
#include utility
-using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
@@ -231,7 +230,7 @@ uno::ReferenceXAccessible SAL_CALL
{
ThrowIfDisposed ();
throw lang::IndexOutOfBoundsException (
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(no child with index ) +
nIndex),
+no child with index + OUString(nIndex),
NULL);
}
@@ -296,7 +295,7 @@ sal_Int16 SAL_CALL
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
AccessibleContextBase::getAccessibleDescription (void)
throw (::com::sun::star::uno::RuntimeException)
{
@@ -423,8 +422,7 @@ lang::Locale SAL_CALL
//= XAccessibleEventListener
-void SAL_CALL
-AccessibleContextBase::addAccessibleEventListener (
+void SAL_CALL AccessibleContextBase::addAccessibleEventListener (
const uno::ReferenceXAccessibleEventListener rxListener)
throw (uno::RuntimeException)
{
@@ -447,8 +445,7 @@ void SAL_CALL
-void SAL_CALL
-AccessibleContextBase::removeAccessibleEventListener (
+void SAL_CALL AccessibleContextBase::removeAccessibleEventListener (
const uno::ReferenceXAccessibleEventListener rxListener )
throw (uno::RuntimeException)
{
@@ -473,8 +470,7 @@ void SAL_CALL
//= XServiceInfo
-::rtl::OUString SAL_CALL
- AccessibleContextBase::getImplementationName (void)
+OUString SAL_CALL AccessibleContextBase::getImplementationName (void)
throw (::com::sun::star::uno::RuntimeException)
{
ThrowIfDisposed ();
@@ -491,7 +487,7 @@ sal_Bool SAL_CALL
ThrowIfDisposed ();
// Iterate over all supported service names and return true if on of them
// matches the given name.
-uno::Sequence ::rtl::OUString aSupportedServices (
+uno::Sequence OUString aSupportedServices (
getSupportedServiceNames ());
for (int i=0; iaSupportedServices.getLength(); i++)
if (sServiceName == aSupportedServices[i])
@@ -502,16 +498,14 @@ sal_Bool SAL_CALL
-uno::Sequence ::rtl::OUString SAL_CALL
+uno::Sequence OUString SAL_CALL
AccessibleContextBase::getSupportedServiceNames (void)
throw (::com::sun::star::uno::RuntimeException)
{
ThrowIfDisposed ();
static const OUString sServiceNames[2] = {
-OUString(
-com.sun.star.accessibility.Accessible),
-OUString(
-com.sun.star.accessibility.AccessibleContext)
+com.sun.star.accessibility.Accessible,
+com.sun.star.accessibility.AccessibleContext
};
return uno::SequenceOUString (sServiceNames, 2);
}
@@ -564,7 +558,7 @@ void SAL_CALL AccessibleContextBase::disposing (void)
void
[Libreoffice-commits] .: editeng/source
editeng/source/accessibility/AccessibleParaManager.cxx|2 -
editeng/source/accessibility/AccessibleSelectionBase.cxx |1
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 25 ++
3 files changed, 13 insertions(+), 15 deletions(-)
New commits:
commit cd546700457c61b209deae7a4b75b5932127c1d0
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri Dec 21 23:19:35 2012 -0200
OUString cleanup in editeng/acessibility
Change-Id: I5f8b73aab1e67a5ac071427574fa943a844fbf96
Reviewed-on: https://gerrit.libreoffice.org/1469
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/editeng/source/accessibility/AccessibleParaManager.cxx
b/editeng/source/accessibility/AccessibleParaManager.cxx
index f215062..c3c24d6 100644
--- a/editeng/source/accessibility/AccessibleParaManager.cxx
+++ b/editeng/source/accessibility/AccessibleParaManager.cxx
@@ -185,7 +185,7 @@ namespace accessibility
uno::Reference XAccessible xChild( static_cast
::cppu::OWeakObject* (pChild), uno::UNO_QUERY );
if( !xChild.is() )
-throw
uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Child
creation failed)), xFrontEnd);
+throw uno::RuntimeException(Child creation failed,
xFrontEnd);
aChild = WeakPara::HardRefType( xChild, pChild );
diff --git a/editeng/source/accessibility/AccessibleSelectionBase.cxx
b/editeng/source/accessibility/AccessibleSelectionBase.cxx
index 0a97ebd..4f9936e 100644
--- a/editeng/source/accessibility/AccessibleSelectionBase.cxx
+++ b/editeng/source/accessibility/AccessibleSelectionBase.cxx
@@ -20,7 +20,6 @@
#include editeng/AccessibleSelectionBase.hxx
-using namespace ::rtl;
using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 6843dfe..7a5f57a 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -300,8 +300,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( !mpTextParagraph )
-throw lang::DisposedException (
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(object has been
already disposed)), mxThis );
+throw lang::DisposedException (object has been already disposed,
mxThis );
// TODO: Have a differnt method on AccessibleEditableTextPara
// that does not care about state changes
@@ -353,7 +352,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleStaticTextBase_Impl, NULL );
if( nFlatIndex 0 )
-throw
lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(AccessibleStaticTextBase_Impl::Index2Internal:
character index out of bounds)),
+throw
lang::IndexOutOfBoundsException(AccessibleStaticTextBase_Impl::Index2Internal:
character index out of bounds,
mxThis);
// gratuitously accepting larger indices here,
AccessibleEditableTextPara will throw eventually
@@ -386,7 +385,7 @@ namespace accessibility
}
// not found? Out of bounds
-throw
lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(AccessibleStaticTextBase_Impl::Index2Internal:
character index out of bounds)),
+throw
lang::IndexOutOfBoundsException(AccessibleStaticTextBase_Impl::Index2Internal:
character index out of bounds,
mxThis);
}
@@ -643,7 +642,7 @@ namespace accessibility
return mpImpl-GetParagraph( aPos.nPara ).getCharacter( aPos.nIndex );
}
-uno::Sequence beans::PropertyValue SAL_CALL
AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const
::com::sun::star::uno::Sequence ::rtl::OUString aRequestedAttributes )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
+uno::Sequence beans::PropertyValue SAL_CALL
AccessibleStaticTextBase::getCharacterAttributes( sal_Int32 nIndex, const
::com::sun::star::uno::Sequence OUString aRequestedAttributes ) throw
(lang::IndexOutOfBoundsException, uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -709,7 +708,7 @@ namespace accessibility
return -1;
}
-::rtl::OUString SAL_CALL AccessibleStaticTextBase::getSelectedText() throw
(uno::RuntimeException)
+OUString SAL_CALL AccessibleStaticTextBase::getSelectedText() throw
(uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -718,7 +717,7 @@ namespace accessibility
// #104481# Return the empty string for 'no
[Libreoffice-commits] .: editeng/source
editeng/source/accessibility/AccessibleImageBullet.cxx | 38 -
1 file changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 071b7eea798acfbe765c462c5d5b9a45abd13f63
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Sat Dec 22 18:00:14 2012 -0200
OUString cleanup in editeng/acessibility
Change-Id: I253444e2859685cae88aa65fae755af2674bd4b4
Reviewed-on: https://gerrit.libreoffice.org/1471
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx
b/editeng/source/accessibility/AccessibleImageBullet.cxx
index 8d97477..177ccef 100644
--- a/editeng/source/accessibility/AccessibleImageBullet.cxx
+++ b/editeng/source/accessibility/AccessibleImageBullet.cxx
@@ -127,7 +127,7 @@ namespace accessibility
DBG_CHKTHIS( AccessibleImageBullet, NULL );
(void)i;
-throw
lang::IndexOutOfBoundsException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(No
children available)),
+throw lang::IndexOutOfBoundsException(No children available,
uno::Reference uno::XInterface
( static_cast
::cppu::OWeakObject* (this) ) ); // static_cast: disambiguate hierarchy
}
@@ -153,7 +153,7 @@ namespace accessibility
return AccessibleRole::GRAPHIC;
}
-::rtl::OUString SAL_CALL
AccessibleImageBullet::getAccessibleDescription() throw (uno::RuntimeException)
+OUString SAL_CALL AccessibleImageBullet::getAccessibleDescription() throw
(uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
@@ -163,7 +163,7 @@ namespace accessibility
return EE_RESSTR(RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION);
}
-::rtl::OUString SAL_CALL AccessibleImageBullet::getAccessibleName() throw
(uno::RuntimeException)
+OUString SAL_CALL AccessibleImageBullet::getAccessibleName() throw
(uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
@@ -321,7 +321,7 @@ namespace accessibility
}
}
-throw
uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Cannot
access parent)),
+throw uno::RuntimeException(Cannot access parent,
uno::Reference uno::XInterface
( static_cast XAccessible* (this) ) );
// disambiguate hierarchy
}
@@ -341,7 +341,7 @@ namespace accessibility
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
-throw
uno::RuntimeException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(Not
focusable)),
+throw uno::RuntimeException(Not focusable,
uno::Reference uno::XInterface
( static_cast XAccessible* (this) ) );
// disambiguate hierarchy
}
@@ -369,20 +369,20 @@ namespace accessibility
return static_castsal_Int32( aColor.GetColor() );
}
-::rtl::OUString SAL_CALL AccessibleImageBullet::getImplementationName
(void) throw (uno::RuntimeException)
+OUString SAL_CALL AccessibleImageBullet::getImplementationName (void)
throw (uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
-return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
(AccessibleImageBullet));
+return OUString(AccessibleImageBullet);
}
-sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const
::rtl::OUString sServiceName) throw (uno::RuntimeException)
+sal_Bool SAL_CALL AccessibleImageBullet::supportsService (const OUString
sServiceName) throw (uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
// Iterate over all supported service names and return true if on of
them
// matches the given name.
-uno::Sequence ::rtl::OUString aSupportedServices (
+uno::Sequence OUString aSupportedServices (
getSupportedServiceNames ());
for (int i=0; iaSupportedServices.getLength(); i++)
if (sServiceName == aSupportedServices[i])
@@ -390,19 +390,19 @@ namespace accessibility
return sal_False;
}
-uno::Sequence ::rtl::OUString SAL_CALL
AccessibleImageBullet::getSupportedServiceNames (void) throw
(uno::RuntimeException)
+uno::Sequence OUString SAL_CALL
AccessibleImageBullet::getSupportedServiceNames (void) throw
(uno::RuntimeException)
{
DBG_CHKTHIS( AccessibleImageBullet, NULL );
-const ::rtl::OUString sServiceName (RTL_CONSTASCII_USTRINGPARAM
(com.sun.star.accessibility.AccessibleContext));
-return uno::Sequence ::rtl::OUString (sServiceName, 1);
+const OUString sServiceName
(com.sun.star.accessibility.AccessibleContext);
+return uno::Sequence OUString (sServiceName, 1);
}
-::rtl::OUString SAL_CALL
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editview.cxx |2 -
editeng/source/items/borderline.cxx | 40
editeng/source/items/frmitems.cxx |1
3 files changed, 1 insertion(+), 42 deletions(-)
New commits:
commit 8e25844811ebcf313f4ae9d0caae1f97fd230a7d
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Dec 22 08:27:57 2012 +0100
Some cppcheck cleaning in editeng
Change-Id: I94bf89867cec9cc24f8b96635c515d9477b561a9
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 461a1f7..7d07aea 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -998,9 +998,9 @@ void EditView::ExecuteSpellPopup( const Point rPosPixel,
Link* pCallBack )
Reference XDictionaryList xDicList( SvxGetDictionaryList() );
Sequence Reference XDictionaryaDics;
-const Reference XDictionary *pDic = NULL;
if (xDicList.is())
{
+const Reference XDictionary *pDic = NULL;
// add the default positive dictionary to dic-list (if not already
done).
// This is to ensure that there is at least one dictionary to which
// words could be added.
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 646a348..9e1d8f6 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -123,62 +123,45 @@ ConvertBorderStyleFromWord(int const nWordLineStyle)
case 9:
case 20:
return SOLID;
-break;
case 6:
return DOTTED;
-break;
case 7:
return DASHED;
-break;
case 22:
return FINE_DASHED;
-break;
// then the shading beams which we represent by a double line
case 23:
return DOUBLE;
-break;
// then the double lines, for which we have good matches
case 3:
case 10: // Don't have triple so use double
case 21: // Don't have double wave: use double instead
return DOUBLE;
-break;
case 11:
return THINTHICK_SMALLGAP;
-break;
case 12:
case 13: // Don't have thin thick thin, so use thick thin
return THICKTHIN_SMALLGAP;
-break;
case 14:
return THINTHICK_MEDIUMGAP;
-break;
case 15:
case 16: // Don't have thin thick thin, so use thick thin
return THICKTHIN_MEDIUMGAP;
-break;
case 17:
return THINTHICK_LARGEGAP;
-break;
case 18:
case 19: // Don't have thin thick thin, so use thick thin
return THICKTHIN_LARGEGAP;
-break;
case 24:
return EMBOSSED;
-break;
case 25:
return ENGRAVED;
-break;
case 26:
return OUTSET;
-break;
case 27:
return INSET;
-break;
default:
return NONE;
-break;
}
}
@@ -205,13 +188,10 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle,
double const fWidth,
{
case 2:
return (fWidth * 2.0); // thick
-break;
case 5: // fdo#55526: map 0 hairline width to 0
return (fWidth 1.0) ? fWidth : 1.0;
-break;
default:
return fWidth;
-break;
}
break;
@@ -222,48 +202,38 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle,
double const fWidth,
// Display a minimum effective border width of 1pt
case FINE_DASHED:
return (fWidth 0 fWidth 20) ? 20 : fWidth;
-break;
// Double lines
case DOUBLE:
return fWidth * 3.0;
-break;
case THINTHICK_MEDIUMGAP:
case THICKTHIN_MEDIUMGAP:
case EMBOSSED:
case ENGRAVED:
return fWidth * 2.0;
-break;
case THINTHICK_SMALLGAP:
return fWidth + THINTHICK_SMALLGAP_line2 + THINTHICK_SMALLGAP_gap;
-break;
case THINTHICK_LARGEGAP:
return fWidth + THINTHICK_LARGEGAP_line1 +
THINTHICK_LARGEGAP_line2;
-break;
case THICKTHIN_SMALLGAP:
return fWidth + THICKTHIN_SMALLGAP_line1 + THICKTHIN_SMALLGAP_gap;
-break;
case THICKTHIN_LARGEGAP:
return fWidth + THICKTHIN_LARGEGAP_line1 +
THICKTHIN_LARGEGAP_line2;
-break;
case OUTSET:
return (fWidth * 2.0) + OUTSET_line1;
-break;
case INSET:
return (fWidth * 2.0) + INSET_line2;
-break;
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit a61928d2f7512d573e598b23c7fd3cf341f97780
Author: Michael Meeks michael.me...@suse.com
Date: Wed Dec 12 22:16:53 2012 +
fdo#58060 - use empty-string for LANGUAGE_DONTKNOW ie. acorr_.dat
Change-Id: I399dcc41484c8b86f13c80bc1e92af919c9aeaff
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 0d8ff52..b4fa5d0 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1870,6 +1870,10 @@ String SvxAutoCorrect::GetAutoCorrFileName( LanguageType
eLang,
sal_Bool bNewFile, sal_Bool bTst )
const
{
String sRet, sExt( LanguageTag( eLang ).getBcp47() );
+
+// fdo#58060 user added dictionary - saved as acorr_.dat
+if (eLang == LANGUAGE_DONTKNOW)
+sExt = String();
sExt.Insert('_', 0);
sExt.AppendAscii( .dat );
if( bNewFile )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 0efcfcdf40661023d8b516d6461d164e4ab7
Author: Caolán McNamara caol...@redhat.com
Date: Tue Dec 11 09:12:03 2012 +
cppcheck: size() == 0 - empty()
Change-Id: I23b6b8fdbb9c4f367a590a21e40e7bbaa76f7fce
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index aaee953..4bba278 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2669,7 +2669,7 @@ void SvxAutocorrWordList::DeleteAndDestroyAll()
// returns true if inserted
bool SvxAutocorrWordList::Insert(SvxAutocorrWord *pWord)
{
-if ( maSet.size() == 0 ) // use the hash
+if ( maSet.empty() ) // use the hash
{
rtl::OUString aShort( pWord-GetShort() );
bool bThere = maHash.find( aShort ) != maHash.end();
@@ -2697,7 +2697,7 @@ SvxAutocorrWord
*SvxAutocorrWordList::FindAndRemove(SvxAutocorrWord *pWord)
{
SvxAutocorrWord *pMatch = NULL;
-if ( maSet.size() == 0 ) // use the hash
+if ( maSet.empty() ) // use the hash
{
SvxAutocorrWordList_Hash::iterator it = maHash.find( pWord-GetShort()
);
if( it != maHash.end() )
@@ -2724,7 +2724,7 @@ SvxAutocorrWordList::Content
SvxAutocorrWordList::getSortedContent() const
Content aContent;
// convert from hash to set permanantly
-if ( maSet.size() == 0 )
+if ( maSet.empty() )
{
// This beasty has some O(N log(N)) in a terribly slow ICU collate fn.
for( SvxAutocorrWordList_Hash::const_iterator it = maHash.begin(); it
!= maHash.end(); ++it )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source offapi/com svtools/inc svtools/source
editeng/source/items/borderline.cxx | 11 ++-
editeng/source/items/frmitems.cxx |2 +-
offapi/com/sun/star/table/BorderLineStyle.idl |8
svtools/inc/svtools/ctrlbox.hxx |1 +
svtools/source/control/ctrlbox.cxx|7 +++
5 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit 7d632ff29e601c2e680c4a689997fbf552592a4b
Author: Eilidh McAdam eil...@lanedo.com
Date: Thu Nov 15 00:29:58 2012 +
Support added for fine dashing on table borders.
When reading in docx documents, fine dashing provides a better visual
match for some border types.
Added in this patch:
- FINE_DASHED in BorderLineStyle UNO enum and in internals
- Import of docx table borders using this border style
Change-Id: I39cfa18c915ec94d8e4ecfc6a2ca637076d1e468
Reviewed-on: https://gerrit.libreoffice.org/1123
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 1904916..646a348 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -128,9 +128,11 @@ ConvertBorderStyleFromWord(int const nWordLineStyle)
return DOTTED;
break;
case 7:
-case 22:
return DASHED;
break;
+case 22:
+return FINE_DASHED;
+break;
// then the shading beams which we represent by a double line
case 23:
return DOUBLE;
@@ -216,6 +218,10 @@ ConvertBorderWidthFromWord(SvxBorderStyle const eStyle,
double const fWidth,
case DOTTED:
case DASHED:
return fWidth;
+
+// Display a minimum effective border width of 1pt
+case FINE_DASHED:
+return (fWidth 0 fWidth 20) ? 20 : fWidth;
break;
// Double lines
@@ -270,6 +276,7 @@ ConvertBorderWidthToWord(SvxBorderStyle const eStyle,
double const fWidth)
case SOLID:
case DOTTED:
case DASHED:
+case FINE_DASHED:
return fWidth;
break;
@@ -335,6 +342,7 @@ BorderWidthImpl SvxBorderLine::getWidthImpl( SvxBorderStyle
nStyle )
case SOLID:
case DOTTED:
case DASHED:
+case FINE_DASHED:
aImpl = BorderWidthImpl( CHANGE_LINE1, 1.0 );
break;
@@ -514,6 +522,7 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
case SOLID:
case DOTTED:
case DASHED:
+case FINE_DASHED:
::std::swap( nOut, nIn);
break;
default:
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index 6f410c6..5ee12a8 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1794,7 +1794,7 @@ sal_Bool
SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2 rLine,
SvxBorderLine rSvxLine, sal_Bool bConvert)
{
SvxBorderStyle const nStyle =
-(rLine.LineStyle 0 || INSET rLine.LineStyle)
+(rLine.LineStyle 0 || BORDER_LINE_STYLE_MAX rLine.LineStyle)
? SOLID // default
: rLine.LineStyle;
diff --git a/offapi/com/sun/star/table/BorderLineStyle.idl
b/offapi/com/sun/star/table/BorderLineStyle.idl
index 0007118..7613272 100644
--- a/offapi/com/sun/star/table/BorderLineStyle.idl
+++ b/offapi/com/sun/star/table/BorderLineStyle.idl
@@ -90,6 +90,14 @@ constants BorderLineStyle
/** Inset border line.
*/
const short INSET = 13;
+
+/** Finely dashed border line.
+ */
+const short FINE_DASHED = 14;
+
+/** Maximum valid border line style value.
+ */
+const short BORDER_LINE_STYLE_MAX = 14;
};
diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index a6b26b8..2d6e6a2 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -44,6 +44,7 @@ typedef ::std::vector FontInfo ImplFontList;
#define STYLE_SOLID( ( sal_uInt16 ) 0 )
#define STYLE_DOTTED ( ( sal_uInt16 ) 1 )
#define STYLE_DASHED ( ( sal_uInt16 ) 2 )
+#define STYLE_FINE_DASHED ( ( sal_uInt16 ) 14 )
#define STYLE_NONE ( ( sal_uInt16 ) -1)
#define CHANGE_LINE1 ( ( sal_uInt16 ) 1 )
diff --git a/svtools/source/control/ctrlbox.cxx
b/svtools/source/control/ctrlbox.cxx
index 017422f..dd739d4 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -615,6 +615,13 @@ namespace svtools
aPattern.push_back( 20 );
}
break;
+case STYLE_FINE_DASHED:
+if ( eUnit == MAP_PIXEL )
+{
+
[Libreoffice-commits] .: editeng/source
editeng/source/items/textitem.cxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit cb523b62a4a63b70054d7a16385faf5f3a76be28 Author: Eike Rathke er...@redhat.com Date: Tue Nov 27 21:42:32 2012 +0100 SvxLanguageItem::PutValue: empty locale is not LANGUAGE_NONE Change-Id: I8d788f53b54a7429124a653417d422db300238d7 diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 25f998b..d5846a0 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -2634,10 +2634,7 @@ bool SvxLanguageItem::PutValue( const uno::Any rVal, sal_uInt8 nMemberId ) if(!(rVal = aLocale)) return sal_False; -if (!aLocale.Language.isEmpty() || !aLocale.Country.isEmpty()) -SetValue( LanguageTag( aLocale ).getLanguageType( false)); -else -SetValue(LANGUAGE_NONE); +SetValue( LanguageTag( aLocale ).getLanguageType( false)); } break; } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sc/source
editeng/source/rtf/rtfitem.cxx |6 ++--
sc/source/core/data/attrib.cxx | 20 +++---
sc/source/ui/view/preview.cxx | 55 -
3 files changed, 42 insertions(+), 39 deletions(-)
New commits:
commit fa6be97997f6142884accef5a88d6491bb1b3b76
Author: Peter Baumgarten peter10...@gmail.com
Date: Sat Nov 24 11:30:28 2012 +
Translation of German comments
Change-Id: I729049b8fa9c26926423c6990a06377e6884e840
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index b1ff8ec..dde178b 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -220,7 +220,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
int bChkStkPos = !bNewGroup !aAttrStack.empty();
-while( bWeiter IsParserWorking() ) // as long as known Attribute are
recognized
+while( bWeiter IsParserWorking() ) // as long as known
+Attribute are recognized
{
switch( nToken )
{
@@ -293,7 +294,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
else
{
nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue);
-// setze am akt. auf dem AttrStack stehenden Style die
+/* setze am akt. auf dem AttrStack stehenden Style die
+ I sit on akt. which is on the immiediate sytle
AttrStack */
// StyleNummer
SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 :
aAttrStack.back();
if( !pAkt )
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index d666229..310aa1d 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -65,7 +65,7 @@ TYPEINIT1(ScCondFormatItem,SfxPoolItem);
//
//
-// allgemeine Hilfsfunktionen
+// General Help Function
//
bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const
::editeng::SvxBorderLine* pOther )
@@ -493,7 +493,7 @@ SfxItemPresentation ScRangeItem::GetPresentation
}
// ---
-// ScTableListItem - Liste von Tabellen(-nummern)
+// ScTableListItem - List from Tables (-numbers)
// ---
ScTableListItem::ScTableListItem( const ScTableListItem rCpy )
@@ -618,7 +618,7 @@ SfxItemPresentation ScTableListItem::GetPresentation
// ---
-// ScPageHFItem - Daten der Kopf-/Fusszeilen
+// ScPageHFItem - Dates from the Head and Foot lines
// ---
ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP )
@@ -691,7 +691,7 @@ bool ScPageHFItem::PutValue( const uno::Any rVal,
sal_uInt8 /* nMemberId */ )
if ( !pLeftArea || !pCenterArea || !pRightArea )
{
-// keine Texte auf NULL stehen lassen
+// no Text with Null are left
ScEditEngineDefaulter aEngine( EditEngine::CreatePool(),
true );
if (!pLeftArea)
pLeftArea = aEngine.CreateTextObject();
@@ -745,7 +745,7 @@ SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const
static void lcl_SetSpace( String rStr, const ESelection rSel )
{
-// Text durch ein Leerzeichen ersetzen, damit Positionen stimmen:
+// Text replaced by a space to ensure they are positions:
xub_StrLen nLen = rSel.nEndPos-rSel.nStartPos;
rStr.Erase( rSel.nStartPos, nLen-1 );
@@ -837,7 +837,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream rStream,
sal_uInt16 nVer ) const
}
}
-if ( nVer 1 ) // alte Feldbefehle umsetzen
+if ( nVer 1 ) //old field command conversions
{
sal_uInt16 i;
const String rDel = ScGlobal::GetRscString( STR_HFCMD_DELIMITER );
@@ -874,7 +874,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream rStream,
sal_uInt16 nVer ) const
}
}
else if ( nVer 2 )
-{ // nichts tun, SvxFileField nicht gegen SvxExtFileField austauschen
+{ // not to do, SvxFileField is not exchanged for SvxExtFileField
}
ScPageHFItem* pItem = new ScPageHFItem( Which() );
@@ -923,7 +923,7 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea
)
}
//---
-// ScViewObjectModeItem - Darstellungsmodus von ViewObjekten
+// ScViewObjectModeItem - Display Mode of View Objects
//---
ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP )
@@ -979,7 +979,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation
[Libreoffice-commits] .: editeng/source
editeng/source/rtf/rtfitem.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit b82ecd0448ca97df79243b2d22547324d08dc130
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Nov 24 18:52:06 2012 +0400
fix build
Change-Id: Iebbb690f3beacca026d584636b9ef505dfe9ac89
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index dde178b..a8b100c 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -220,8 +220,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
int bChkStkPos = !bNewGroup !aAttrStack.empty();
-while( bWeiter IsParserWorking() ) // as long as known
-Attribute are recognized
+while( bWeiter IsParserWorking() ) // as long as known Attribute are
recognized
{
switch( nToken )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sw/source
editeng/source/editeng/editview.cxx |8 editeng/source/editeng/impedit4.cxx |4 ++-- editeng/source/misc/unolingu.cxx|2 +- sw/source/ui/lingu/olmenu.cxx |8 4 files changed, 11 insertions(+), 11 deletions(-) New commits: commit 117184c3e14bb01cc4482bb2a47569008358e6fc Author: Eike Rathke er...@redhat.com Date: Sat Nov 24 19:03:56 2012 +0100 kill a few more SvxCreateLocale() Co remainders Change-Id: I2b70bf76a495b9edb79b5b3c4ae1b06abed30f54 diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index d40ac27..461a1f7 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -130,10 +130,10 @@ static LanguageType lcl_CheckLanguage( // en-US aLangList[3] = LANGUAGE_ENGLISH_US; #ifdef DEBUG -lang::Locale a0( SvxCreateLocale( aLangList[0] ) ); -lang::Locale a1( SvxCreateLocale( aLangList[1] ) ); -lang::Locale a2( SvxCreateLocale( aLangList[2] ) ); -lang::Locale a3( SvxCreateLocale( aLangList[3] ) ); +lang::Locale a0( LanguageTag( aLangList[0] ).getLocale() ); +lang::Locale a1( LanguageTag( aLangList[1] ).getLocale() ); +lang::Locale a2( LanguageTag( aLangList[2] ).getLocale() ); +lang::Locale a3( LanguageTag( aLangList[3] ).getLocale() ); #endif sal_Int32 nCount = sizeof (aLangList) / sizeof (aLangList[0]); diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index d885d8d..d66e1b5 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1500,7 +1500,7 @@ sal_Bool ImpEditEngine::HasConvertibleTextPortion( LanguageType nSrcLang ) ++nStart; LanguageType nLangFound = pEditEngine-GetLanguage( k, nStart ); #ifdef DEBUG -lang::Locale aLocale( SvxCreateLocale( nLangFound ) ); +lang::Locale aLocale( LanguageTag( nLangFound ).getLocale() ); #endif bHasConvTxt = (nSrcLang == nLangFound) || (editeng::HangulHanjaConversion::IsChinese( nLangFound ) @@ -1692,7 +1692,7 @@ void ImpEditEngine::ImpConvert( rtl::OUString rConvTxt, LanguageType rConvTxtL sal_uInt16 nLangIdx = nEnd nStart ? nStart + 1 : nStart; LanguageType nLangFound = pEditEngine-GetLanguage( aCurStart.nPara, nLangIdx ); #ifdef DEBUG -lang::Locale aLocale( SvxCreateLocale( nLangFound ) ); +lang::Locale aLocale( LanguageTag( nLangFound ).getLocale() ); #endif sal_Bool bLangOk = (nLangFound == nSrcLang) || (editeng::HangulHanjaConversion::IsChinese( nLangFound ) diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index 5c78f07..7fa98c1 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -741,7 +741,7 @@ uno::Reference XDictionary LinguMgr::GetStandard() uno::Reference XStorable xStor( xDic, UNO_QUERY ); OSL_ENSURE( xDic.is() xDic-getDictionaryType() == DictionaryType_POSITIVE, wrong dictionary type); -OSL_ENSURE( xDic.is() SvxLocaleToLanguage( xDic-getLocale() ) == LANGUAGE_NONE, +OSL_ENSURE( xDic.is() LanguageTag( xDic-getLocale() ).getLanguageType() == LANGUAGE_NONE, wrong dictionary language); OSL_ENSURE( !xStor.is() || (xStor-hasLocation() !xStor-isReadonly()), dictionary not editable ); diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index f5d24ca..f337aa8 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -157,10 +157,10 @@ static LanguageType lcl_CheckLanguage( // en-US aLangList[3] = LANGUAGE_ENGLISH_US; #if OSL_DEBUG_LEVEL 1 -lang::Locale a0( SvxCreateLocale( aLangList[0] ) ); -lang::Locale a1( SvxCreateLocale( aLangList[1] ) ); -lang::Locale a2( SvxCreateLocale( aLangList[2] ) ); -lang::Locale a3( SvxCreateLocale( aLangList[3] ) ); +lang::Locale a0( LanguageTag( aLangList[0] ).getLocale() ); +lang::Locale a1( LanguageTag( aLangList[1] ).getLocale() ); +lang::Locale a2( LanguageTag( aLangList[2] ).getLocale() ); +lang::Locale a3( LanguageTag( aLangList[3] ).getLocale() ); #endif sal_Int32 nCount = SAL_N_ELEMENTS(aLangList); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editeng.cxx |2 +-
editeng/source/editeng/editview.cxx |4 ++--
editeng/source/items/textitem.cxx |6 +++---
editeng/source/misc/svxacorr.cxx|2 +-
editeng/source/misc/unolingu.cxx| 10 +-
editeng/source/outliner/outlvw.cxx |4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 378e437fbe313e87b7e56f8f0a1fc4009470679c
Author: Eike Rathke er...@redhat.com
Date: Fri Nov 16 23:22:11 2012 +0100
use LanguageTag
Change-Id: If056193c803f70f8707373ed7ff7b1abbf953852
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index f437564..8b191ea 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1362,7 +1362,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent
rKeyEvent, EditView* pEditVie
String aComplete;
LanguageType eLang =
pImpEditEngine-GetLanguage( EditPaM( aStart.GetNode(), aStart.GetIndex()+1));
-lang::Locale aLocale(
MsLangId::convertLanguageToLocale( eLang));
+lang::Locale aLocale( LanguageTag(
eLang).getLocale());
if
(!pImpEditEngine-xLocaleDataWrapper.isInitialized())
pImpEditEngine-xLocaleDataWrapper.init(
SvtSysLocale().GetLocaleData().getComponentContext(), aLocale, eLang);
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index 1ed54fc..86084a7 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -27,7 +27,7 @@
#include com/sun/star/i18n/WordType.hpp
#include vcl/metric.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include svl/languageoptions.hxx
#include svtools/ctrltool.hxx
#include svtools/langtab.hxx
@@ -102,7 +102,7 @@ static LanguageType lcl_CheckLanguage(
nLang = nTmpLang;
}
if (nLang == LANGUAGE_NONE) // language not found by looking up the
sytem language...
-nLang = MsLangId::convertLocaleToLanguageWithFallback( aLocale );
+nLang = LanguageTag( aLocale ).makeFallback().getLanguageType();
if (nLang == LANGUAGE_SYSTEM)
nLang = nTmpLang;
if (nLang == LANGUAGE_DONTKNOW)
diff --git a/editeng/source/items/textitem.cxx
b/editeng/source/items/textitem.cxx
index 401ca6f..25f998b 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -37,7 +37,7 @@
#include tools/tenccvt.hxx
#include rtl/ustring.hxx
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include svl/itemset.hxx
#include svtools/langtab.hxx
@@ -2607,7 +2607,7 @@ bool SvxLanguageItem::QueryValue( uno::Any rVal,
sal_uInt8 nMemberId ) const
rVal = (sal_Int16)(GetValue());
break;
case MID_LANG_LOCALE:
-lang::Locale aRet( MsLangId::convertLanguageToLocale( GetValue(),
false));
+lang::Locale aRet( LanguageTag( GetValue()).getLocale( false));
rVal = aRet;
break;
}
@@ -2635,7 +2635,7 @@ bool SvxLanguageItem::PutValue( const uno::Any rVal,
sal_uInt8 nMemberId )
return sal_False;
if (!aLocale.Language.isEmpty() || !aLocale.Country.isEmpty())
-SetValue(MsLangId::convertLocaleToLanguage( aLocale ));
+SetValue( LanguageTag( aLocale ).getLanguageType( false));
else
SetValue(LANGUAGE_NONE);
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 3f2298a..d8ae94c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1905,7 +1905,7 @@ sal_Bool
SvxAutoCorrect::FindInCplSttExceptList(LanguageType eLang,
String SvxAutoCorrect::GetAutoCorrFileName( LanguageType eLang,
sal_Bool bNewFile, sal_Bool bTst )
const
{
-String sRet, sExt( MsLangId::convertLanguageToIsoString( eLang ) );
+String sRet, sExt( LanguageTag( eLang ).getBcp47() );
sExt.Insert('_', 0);
sExt.AppendAscii( .dat );
if( bNewFile )
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index 022ab11..4648636 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -40,7 +40,7 @@
#include comphelper/processfactory.hxx
#include cppuhelper/implbase1.hxx // helper for implementations
-#include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
#include unotools/lingucfg.hxx
#include unotools/ucbhelper.hxx
#include unotools/localfilehelper.hxx
@@ -131,7 +131,7 @@ void ThesDummy_Impl::GetCfgLocales()
for (sal_Int32 i = 0; i nLen; ++i)
{
pLocale[i] = SvxCreateLocale(
-MsLangId::convertIsoStringToLanguage(
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit fa694a21b806ed7837c1337ec49a4b299c478393
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Oct 12 17:41:49 2012 +0200
fdo#55931 Fix renderding of subscript/superscript with Autofit Text.
We are using font metrics to compute the stretch ratio for autofit; but that
collides with nPropr property of SvxFont - it is then counted twice, ie. in
the case of nPropr == 25, we actually behave as if it was much less; and
worse, only in the horizontal direction.
Change-Id: Idba62f1e3f40802651b93f1344e376048866b1b6
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 5878822..2e00179 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2651,10 +2651,7 @@ void ImpEditEngine::SeekCursor( ContentNode* pNode,
sal_uInt16 nPos, SvxFont rF
// ugly on the screen!
OutputDevice* pDev = pOut ? pOut : GetRefDevice();
rFont.SetPhysFont( pDev );
-FontMetric aMetric( pDev-GetFontMetric() );
-// For the height do not consider the metrics, because it will go
-// wrong at Superscript/Subscript.
-Size aRealSz( aMetric.GetSize().Width(), rFont.GetSize().Height() );
+Size aRealSz( rFont.GetSize().Width(), rFont.GetSize().Height() );
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] .: editeng/source
editeng/source/editeng/editdoc.cxx | 15 +++
editeng/source/editeng/editdoc.hxx |9 ++---
2 files changed, 17 insertions(+), 7 deletions(-)
New commits:
commit f3f706274172879324884e845629ef74b2e2e443
Author: Thorsten Behrens tbehr...@suse.com
Date: Mon Oct 1 19:33:34 2012 +0200
Outline methods with conditionals in editeng
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index cb13c91..560d7ca 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1034,6 +1034,21 @@ sal_Bool operator != ( const EditLine r1, const
EditLine r2 )
return !( r1 == r2 );
}
+void EditLine::SetHeight( sal_uInt16 nH, sal_uInt16 nTxtH, sal_uInt16 nCrsrH )
+{
+nHeight = nH;
+nTxtHeight = ( nTxtH ? nTxtH : nH );
+nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight );
+}
+
+void EditLine::SetStartPosX( long start )
+{
+if (start 0)
+nStartPosX = start;
+else
+nStartPosX = 0;
+}
+
Size EditLine::CalcTextSize( ParaPortion rParaPortion )
{
Size aSz;
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index c595ea8..2c303ee 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -513,11 +513,7 @@ public:
sal_uInt16 GetEndPortion() const { return nEndPortion; }
sal_uInt16 GetEndPortion() { return nEndPortion; }
-voidSetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16
nCrsrH = 0 )
-{ nHeight = nH;
-nTxtHeight = ( nTxtH ? nTxtH : nH );
-nCrsrHeight = ( nCrsrH ? nCrsrH : nTxtHeight );
-}
+voidSetHeight( sal_uInt16 nH, sal_uInt16 nTxtH = 0, sal_uInt16
nCrsrH = 0 );
sal_uInt16 GetHeight() const { return nHeight; }
sal_uInt16 GetTxtHeight() const{ return nTxtHeight; }
sal_uInt16 GetCrsrHeight() const { return nCrsrHeight; }
@@ -534,8 +530,7 @@ public:
sal_uInt16 GetLen() const { return nEnd -
nStart; }
sal_uInt16 GetStartPosX() const{ return nStartPosX; }
-voidSetStartPosX( long start ) { if (start 0)
nStartPosX = start; else nStartPosX = 0; }
-
+voidSetStartPosX( long start );
SizeCalcTextSize( ParaPortion rParaPortion );
boolIsInvalid() const { return bInvalid; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editview.cxx |2 +-
editeng/source/editeng/impedit2.cxx |2 +-
editeng/source/editeng/impedit3.cxx |4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 45bae63f0f56060e2a609ebb2610502a3722dfee
Author: Tor Lillqvist t...@iki.fi
Date: Thu Sep 20 14:19:46 2012 +0300
Add some static goodness here, too, to avoid duplicate symbols
Change-Id: Ie5e7aecd4f1c0e5b4dda9250ae755bf9210e048f
diff --git a/editeng/source/editeng/editview.cxx
b/editeng/source/editeng/editview.cxx
index bd13494..9cb8900 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -85,7 +85,7 @@ DBG_NAME( EditView )
// From SW = Create common method
-LanguageType lcl_CheckLanguage(
+static LanguageType lcl_CheckLanguage(
const OUString rText,
Reference XSpellChecker1 xSpell,
Reference linguistic2::XLanguageGuessing xLangGuess,
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index a85b163..3c9990e 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -1675,7 +1675,7 @@ sal_Bool ImpEditEngine::IsInputSequenceCheckingRequired(
sal_Unicode nChar, cons
return bIsSequenceChecking;
}
- bool lcl_HasStrongLTR ( const String rTxt, xub_StrLen nStart, xub_StrLen
nEnd )
+static bool lcl_HasStrongLTR ( const String rTxt, xub_StrLen nStart,
xub_StrLen nEnd )
{
for ( xub_StrLen nCharIdx = nStart; nCharIdx nEnd; ++nCharIdx )
{
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 027302f..8e20ae0 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -254,7 +254,7 @@ Point lcl_ImplCalcRotatedPos( Point rPos, Point rOrigin,
double nSin, double nCo
return aTranslatedPos;
}
-sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) // For
Kashidas from sw/source/core/text/porlay.txt
+static sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode cNextCh ) // For
Kashidas from sw/source/core/text/porlay.txt
{
// Lam + Alef
return ( 0x644 == cCh 0x627 == cNextCh ) ||
@@ -262,7 +262,7 @@ sal_Bool lcl_IsLigature( xub_Unicode cCh, xub_Unicode
cNextCh ) // For Kashidas
( 0x628 == cCh 0x631 == cNextCh );
}
-sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) // For
Kashidas from sw/source/core/text/porlay.txt
+static sal_Bool lcl_ConnectToPrev( xub_Unicode cCh, xub_Unicode cPrevCh ) //
For Kashidas from sw/source/core/text/porlay.txt
{
// Alef, Dal, Thal, Reh, Zain, and Waw do not connect to the left
sal_Bool bRet = 0x627 != cPrevCh 0x62F != cPrevCh 0x630 != cPrevCh
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx | 30 +-
1 file changed, 17 insertions(+), 13 deletions(-)
New commits:
commit 4f177fbbab1619b9a2f9afa04d882c5fd415fcc0
Author: Caolán McNamara caol...@redhat.com
Date: Wed Aug 22 14:38:50 2012 +0100
Resolves: rhbz#841092 don't crash on empty portions (a11y?)
Change-Id: Ibd08fa09370580bff12f19f867219098f0d4980e
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index a0aedb1..027302f 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2477,22 +2477,26 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
pTP-GetLen() = pTP-GetLen() + nNewChars;
}
-// No HYPHENATOR portion is allowed to get stuck right at the end...
-DBG_ASSERT( pParaPortion-GetTextPortions().Count(),
RecalcTextPortions: Nothing left! );
-sal_uInt16 nLastPortion = pParaPortion-GetTextPortions().Count() - 1;
-pTP = pParaPortion-GetTextPortions()[nLastPortion];
-if ( pTP-GetKind() == PORTIONKIND_HYPHENATOR )
+sal_uInt16 nPortionCount = pParaPortion-GetTextPortions().Count();
+assert( nPortionCount );
+if (nPortionCount)
{
-// Discard portion; if possible, correct the ones before,
-// if the Hyphenator portion has swallowed one character...
-if ( nLastPortion pTP-GetLen() )
+// No HYPHENATOR portion is allowed to get stuck right at the
end...
+sal_uInt16 nLastPortion = nPortionCount - 1;
+pTP = pParaPortion-GetTextPortions()[nLastPortion];
+if ( pTP-GetKind() == PORTIONKIND_HYPHENATOR )
{
-TextPortion* pPrev =
pParaPortion-GetTextPortions()[nLastPortion - 1];
-DBG_ASSERT( pPrev-GetKind() == PORTIONKIND_TEXT, Portion?!
);
-pPrev-SetLen( pPrev-GetLen() + pTP-GetLen() );
-pPrev-GetSize().Width() = (-1);
+// Discard portion; if possible, correct the ones before,
+// if the Hyphenator portion has swallowed one character...
+if ( nLastPortion pTP-GetLen() )
+{
+TextPortion* pPrev =
pParaPortion-GetTextPortions()[nLastPortion - 1];
+DBG_ASSERT( pPrev-GetKind() == PORTIONKIND_TEXT,
Portion?! );
+pPrev-SetLen( pPrev-GetLen() + pTP-GetLen() );
+pPrev-GetSize().Width() = (-1);
+}
+pParaPortion-GetTextPortions().Remove( nLastPortion );
}
-pParaPortion-GetTextPortions().Remove( nLastPortion );
}
}
#if OSL_DEBUG_LEVEL 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 069caf79d716ba73d3281beb13fa2af67cac24f9
Author: Caolán McNamara caol...@redhat.com
Date: Thu Aug 9 10:34:50 2012 +0100
valgrind: use after free
i.e. since b35980d9b
seems remove, remove, delete was old pattern, new patterns ended up
as remove+delete, remove. Reorder to remove, remove+delete
Change-Id: I54ec8d0296e751110c516516465be2ac0615f6a1
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index b4a08e5..cb13c91 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2688,8 +2688,8 @@ void CharAttribList::OptimizeRanges( SfxItemPool
rItemPool )
if (*rNext.GetItem() == *rAttr.GetItem())
{
rAttr.GetEnd() = rNext.GetEnd();
-aAttribs.erase(aAttribs.begin()+nNext);
rItemPool.Remove(*rNext.GetItem());
+aAttribs.erase(aAttribs.begin()+nNext);
}
break; // only 1 attr with same which can start here.
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/lookuptree/Node.cxx |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 9d75ea50e7e64b7d282655e986564acb640bf04e
Author: Stephan Bergmann sberg...@redhat.com
Date: Tue Jul 31 09:15:34 2012 +0200
error: attempt to increment a past-the-end iterator
...when running editeng/CppunitTest_editeng_lookuptree.mk
Change-Id: Ida1cbb16965138a42bec9e675b630bcbf2f6617e
diff --git a/editeng/source/lookuptree/Node.cxx
b/editeng/source/lookuptree/Node.cxx
index 6d5e320..2492a88 100644
--- a/editeng/source/lookuptree/Node.cxx
+++ b/editeng/source/lookuptree/Node.cxx
@@ -56,7 +56,10 @@ void Node::removeChild(Node* pChild)
{
i = m_lChildren.erase( i );
}
-++i;
+else
+{
+++i;
+}
}
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 058116026965ad31164fe60d5cd8a6d5fbbe8f65
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 12 15:07:13 2012 +0100
make this a const_iterator for windows buildbot
Change-Id: I6e242de572595fdf39553d76932bc0e953cd3a34
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 31a1cda..68473fd 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1658,7 +1658,7 @@ static const SvxAutocorrWord* lcl_SearchWordsInList(
{
const SvxAutocorrWordList* pAutoCorrWordList =
pList-GetAutocorrWordList();
TransliterationWrapper rCmp = GetIgnoreTranslWrapper();
-for( SvxAutocorrWordList::iterator it = pAutoCorrWordList-begin(); it !=
pAutoCorrWordList-end(); ++it )
+for( SvxAutocorrWordList::const_iterator it = pAutoCorrWordList-begin();
it != pAutoCorrWordList-end(); ++it )
{
const SvxAutocorrWord* pFnd = *it;
const String rChk = pFnd-GetShort();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/misc/SvXMLAutoCorrectExport.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1d2ba733d758cbf7a6878debc8d183960996bde6
Author: Caolán McNamara caol...@redhat.com
Date: Thu Jul 12 17:13:35 2012 +0100
throw some const love at SvxAutocorrWordList
Change-Id: I41d59d386b8f1fd5dc1fb9744a649085c66143f9
diff --git a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
index 6719b39..2552f2f 100644
--- a/editeng/source/misc/SvXMLAutoCorrectExport.cxx
+++ b/editeng/source/misc/SvXMLAutoCorrectExport.cxx
@@ -61,9 +61,9 @@ sal_uInt32 SvXMLAutoCorrectExport::exportDoc(enum
XMLTokenEnum /*eClass*/)
_GetNamespaceMap().GetNameByKey ( XML_NAMESPACE_BLOCKLIST )
);
{
SvXMLElementExport aRoot (*this, XML_NAMESPACE_BLOCKLIST,
XML_BLOCK_LIST, sal_True, sal_True);
-for ( SvxAutocorrWordList::iterator it = pAutocorr_List-begin(); it
!= pAutocorr_List-end(); ++it )
+for ( SvxAutocorrWordList::const_iterator it =
pAutocorr_List-begin(); it != pAutocorr_List-end(); ++it )
{
-SvxAutocorrWord* p = *it;
+const SvxAutocorrWord* p = *it;
AddAttribute( XML_NAMESPACE_BLOCKLIST,
XML_ABBREVIATED_NAME,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/borderline.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 927f1e56d57ef9238a4574699ae36626b3daaf22 Author: Michael Stahl mst...@redhat.com Date: Thu Jul 5 18:28:41 2012 +0200 ConvertBorderWidthToWord: fix wrong INSET/OUSET conversion: This should do the inverse of ConvertBorderWidthFromWord. Change-Id: If0b2a8a83a7faa6600a07ecfcb13a124d7cdeab6 diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx index 225d914..704bbfa 100644 --- a/editeng/source/items/borderline.cxx +++ b/editeng/source/items/borderline.cxx @@ -224,11 +224,11 @@ ConvertBorderWidthToWord(SvxBorderStyle const eStyle, double const fWidth) break; case OUTSET: -return (fWidth / 2.0) - OUTSET_line1; +return (fWidth - OUTSET_line1) / 2.0; break; case INSET: -return (fWidth / 2.0) - INSET_line2; +return (fWidth - INSET_line2) / 2.0; break; default: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 6cf78c72be5f8f1b0a037b03a6fc63cbace0a2d9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Mon Jul 2 13:27:52 2012 -0400
fdo#51582: Avoid double deletion of a text portion.
Change-Id: Ia1c31cc8122c99a7e37bc285f61f8c5d2779b577
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 3a5ac2b..504d774 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -896,18 +896,19 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
{
// Throw away a Portion, if necessary correct the one before,
// if the Hyph portion has swallowed a character ...
+sal_uInt16 nTmpLen = pPortion-GetLen();
pParaPortion-GetTextPortions().Remove( nTmpPortion );
-if ( nTmpPortion pPortion-GetLen() )
+if (nTmpPortion nTmpLen)
{
nTmpPortion--;
TextPortion* pPrev =
pParaPortion-GetTextPortions()[nTmpPortion];
DBG_ASSERT( pPrev-GetKind() == PORTIONKIND_TEXT,
Portion?! );
nTmpWidth -= pPrev-GetSize().Width();
nTmpPos = nTmpPos - pPrev-GetLen();
-pPrev-SetLen( pPrev-GetLen() + pPortion-GetLen() );
+pPrev-SetLen(pPrev-GetLen() + nTmpLen);
pPrev-GetSize().Width() = (-1);
}
-delete pPortion;
+
DBG_ASSERT( nTmpPortion
pParaPortion-GetTextPortions().Count(), No more Portions left! );
pPortion = pParaPortion-GetTextPortions()[nTmpPortion];
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |3 +++ 1 file changed, 3 insertions(+) New commits: commit a4242df3ae36d9158317298fe01b5cfa0aae4b32 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Jun 13 14:09:38 2012 +0200 Take care of short strings Change-Id: I469b27a45bb5676570b59a829419f3959210a1a6 diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index fe747c3..08722a5 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -68,6 +68,7 @@ #include tools/shl.hxx #include com/sun/star/i18n/ScriptType.hpp +#include cassert #include limits #include boost/bind.hpp @@ -2064,6 +2065,8 @@ XubString EditDoc::GetText( LineEnd eEnd ) const pCur += nSepSize; } } +assert(pCur - newStr-buffer = newStr-length); +newStr-length = pCur - newStr-buffer; return rtl::OUString(newStr, SAL_NO_ACQUIRE); } ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 5c47001d38af7b61db2089f5b3b8dc97e9f8d891
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jun 13 15:26:36 2012 +0200
Better fix for those short strings
...that are not intended to be short after all; just the length
calculation turned out to be wrong.
Change-Id: Ic3a81c935161564f980ddd0241575fff2f76b467
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 08722a5..0ef70bb 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2044,7 +2044,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
sal_Int32 nSepSize = aSep.getLength();
if ( nSepSize )
-nLen += nNodes * nSepSize;
+nLen += (nNodes - 1) * nSepSize;
if ( nLen 0xFFFb / sizeof(xub_Unicode) )
{
OSL_FAIL( Text too large for String );
@@ -2065,8 +2065,7 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
pCur += nSepSize;
}
}
-assert(pCur - newStr-buffer = newStr-length);
-newStr-length = pCur - newStr-buffer;
+assert(pCur - newStr-buffer == newStr-length);
return rtl::OUString(newStr, SAL_NO_ACQUIRE);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |5 -
1 file changed, 5 deletions(-)
New commits:
commit 59f5d8f54bd485f828aa1266b2bc11a9b05bd1e7
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jun 13 16:37:39 2012 +0200
Remove unnecessary size-too-large check
...it is done in UniString(rtl::OUString const) ctor anyway
Change-Id: I890ab21a6c04fe0ddc0a9b2c9a356359984e516e
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 0ef70bb..59f4524 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2045,11 +2045,6 @@ XubString EditDoc::GetText( LineEnd eEnd ) const
if ( nSepSize )
nLen += (nNodes - 1) * nSepSize;
-if ( nLen 0xFFFb / sizeof(xub_Unicode) )
-{
-OSL_FAIL( Text too large for String );
-return rtl::OUString();
-}
rtl_uString* newStr = comphelper::string::rtl_uString_alloc(nLen);
xub_Unicode* pCur = newStr-buffer;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit2.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 7093b2418d036b47ed706464956f330cfb89707a Author: Caolán McNamara caol...@redhat.com Date: Wed Jun 6 16:23:36 2012 +0100 valgrind: uninitialized value Change-Id: I405733a77a721f3d5562782e654a1942fe3b073e diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 246ad29..be1e766 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -99,6 +99,7 @@ ImpEditEngine::ImpEditEngine( EditEngine* pEE, SfxItemPool* pItemPool ) : bAddExtLeading(false), bIsFormatting(false), bFormatted(false), +bInSelection(false), bIsInUndo(false), bUpdate(true), bUndoEnabled(true), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.hxx |1
editeng/source/editeng/impedit3.cxx | 70 ++--
2 files changed, 69 insertions(+), 2 deletions(-)
New commits:
commit 0eaed74b10714c005ea28db4ecb4cb92f56ca0d8
Author: Muthu Subramanian sumu...@suse.com
Date: Mon Jun 4 10:58:18 2012 +0530
Hyperlinks/Fields wrapping feature.
* Known issue: If the hyperlink wraps the next content is always from
the new line! :(
* Pending: Creation of unit test case for this.
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index 8dfe4f6..a97fcec 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -375,6 +375,7 @@ struct ExtraPortionInfo
sal_BoolbCompressed;
sal_Int32*pOrgDXArray;
+::std::vector sal_Int32 lineBreaksList;
ExtraPortionInfo();
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 451ba16..9bac785 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1009,7 +1009,31 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
pPortion-GetSize() = aTmpFont.QuickGetTextSize(
GetRefDevice(), aFieldValue, 0, aFieldValue.getLength(), 0 );
// So no scrolling for oversized fields
if ( pPortion-GetSize().Width() nXWidth )
+{
+sal_Int32 nWidthOrg =
pPortion-GetSize().Width();
+sal_Int32 nChars=
aFieldValue.Len();
+sal_Int32 nApproxWC = nXWidth / (
nWidthOrg / nChars );
+ExtraPortionInfo *pExtraInfo=
pPortion-GetExtraInfos();
+if( !nApproxWC ) nApproxWC++;
+if( pExtraInfo == NULL )
+{
+pExtraInfo = new ExtraPortionInfo();
+pExtraInfo-nOrgWidth = nXWidth;
+pPortion-SetExtraInfos( pExtraInfo );
+}
+else
+{
+pExtraInfo-lineBreaksList.clear();
+}
+
pPortion-GetSize().Width() = nXWidth;
+
+while( nChars 0 )
+{
+pExtraInfo-lineBreaksList.push_back(
aFieldValue.Len() - nChars );
+nChars -= nApproxWC;
+}
+}
}
nTmpWidth += pPortion-GetSize().Width();
EditLine::CharPosArrayType rArray =
pLine-GetCharPosArray();
@@ -2922,6 +2946,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
// Over the Portions of the line ...
// --
sal_uInt16 nIndex = pLine-GetStart();
+bool bParsingFields = false;
+::std::vector sal_Int32 ::iterator itSubLines;
for ( sal_uInt16 y = pLine-GetStartPortion(); y =
pLine-GetEndPortion(); y++ )
{
DBG_ASSERT( pPortion-GetTextPortions().Count(), Line
without Textportion in Paint! );
@@ -3098,12 +3124,48 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
aText =
((EditCharAttribField*)pAttr)-GetFieldValue();
nTextStart = 0;
nTextLen = aText.Len();
+ExtraPortionInfo *pExtraInfo =
pTextPortion-GetExtraInfos();
+// Do not split the Fields into different
lines while editing
+if( bStripOnly !bParsingFields
pExtraInfo pExtraInfo-lineBreaksList.size() )
+{
+bParsingFields = true;
+itSubLines =
pExtraInfo-lineBreaksList.begin();
+}
+if( bParsingFields )
+{
+if( itSubLines !=
pExtraInfo-lineBreaksList.begin() )
+{
+if ( !IsVertical() )
+{
+aStartPos.Y() +=
pLine-GetMaxAscent();
+
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c3b12e24ce5e62e05d524a338e1c17f8e7a53f53
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jun 4 07:58:01 2012 +0200
Fix call of getLength
Change-Id: I5fb5bc5016bd2779643ecfcf2df40e00c4741a2c
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 9bac785..83e5689 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1011,7 +1011,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
if ( pPortion-GetSize().Width() nXWidth )
{
sal_Int32 nWidthOrg =
pPortion-GetSize().Width();
-sal_Int32 nChars=
aFieldValue.Len();
+sal_Int32 nChars=
aFieldValue.getLength();
sal_Int32 nApproxWC = nXWidth / (
nWidthOrg / nChars );
ExtraPortionInfo *pExtraInfo=
pPortion-GetExtraInfos();
if( !nApproxWC ) nApproxWC++;
@@ -1030,7 +1030,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
while( nChars 0 )
{
-pExtraInfo-lineBreaksList.push_back(
aFieldValue.Len() - nChars );
+pExtraInfo-lineBreaksList.push_back(
aFieldValue.getLength() - nChars );
nChars -= nApproxWC;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source offapi/com sc/source sd/source svx/source
editeng/source/items/flditem.cxx|1 -
editeng/source/uno/unofield.cxx | 10 --
editeng/source/xml/xmltxtexp.cxx|2 +-
offapi/com/sun/star/text/textfield/Type.idl |2 --
sc/source/ui/unoobj/fielduno.cxx|5 +
sd/source/ui/unoidl/unomodel.cxx|2 +-
svx/source/unodraw/unomod.cxx |2 +-
7 files changed, 4 insertions(+), 20 deletions(-)
New commits:
commit ee5fc5d25fe102c30daf7d181b8181d40b85a4f3
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Fri May 11 13:03:07 2012 -0400
Removing EXTENDED_DATE. There is really no such thing.
This can be safely substituted by the normal DATE.
Change-Id: I I6b4ccfa342a8d7b638b013cdce64a0b7ff477ec0
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index d5aec5b..bcc578d 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -63,7 +63,6 @@ SvxFieldData* SvxFieldData::Create(const
uno::Referencetext::XTextContent xTe
case text::textfield::Type::TIME:
case text::textfield::Type::EXTENDED_TIME:
case text::textfield::Type::DATE:
-case text::textfield::Type::EXTENDED_DATE:
{
sal_Bool bIsDate = false;
xPropSet-getPropertyValue(UNO_TC_PROP_IS_DATE) = bIsDate;
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 83cad2d..a156c89 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -146,7 +146,6 @@ const SfxItemPropertySet* ImplGetFieldItemPropertySet(
sal_Int32 mnId )
switch( mnId )
{
-case text::textfield::Type::EXTENDED_DATE:
case text::textfield::Type::EXTENDED_TIME:
case text::textfield::Type::DATE:
return aExDateTimeFieldPropertySet_Impl;
@@ -266,7 +265,6 @@ SvxUnoTextField::SvxUnoTextField( sal_Int32 nServiceId )
throw()
switch( nServiceId )
{
-case text::textfield::Type::EXTENDED_DATE:
case text::textfield::Type::DATE:
mpImpl-mbBoolean2 = sal_True;
mpImpl-mnInt32 = SVXDATEFORMAT_STDSMALL;
@@ -329,7 +327,6 @@ SvxUnoTextField::SvxUnoTextField( uno::Reference
text::XTextRange xAnchor, co
switch( mnServiceId )
{
case text::textfield::Type::DATE:
-case text::textfield::Type::EXTENDED_DATE:
{
mpImpl-mbBoolean2 = sal_True;
// #i35416# for variable date field, don't use invalid
-00-00 date,
@@ -403,7 +400,6 @@ SvxFieldData* SvxUnoTextField::CreateFieldData() const
throw()
case text::textfield::Type::TIME:
case text::textfield::Type::EXTENDED_TIME:
case text::textfield::Type::DATE:
-case text::textfield::Type::EXTENDED_DATE:
{
if( mpImpl-mbBoolean2 ) // IsDate?
{
@@ -630,8 +626,6 @@ OUString SAL_CALL SvxUnoTextField::getPresentation(
sal_Bool bShowCommand )
return OUString(Footer);
case text::textfield::Type::PRESENTATION_DATE_TIME:
return OUString(DateTime);
-case text::textfield::Type::EXTENDED_DATE:
-return OUString(ExtDate);
default:
return OUString(Unknown);
}
@@ -879,10 +873,6 @@ uno::Sequence OUString SAL_CALL
SvxUnoTextField::getSupportedServiceNames()
pServices[2] = com.sun.star.presentation.TextField.DateTime;
pServices[3] = com.sun.star.presentation.textfield.DateTime;
break;
-case text::textfield::Type::EXTENDED_DATE:
-pServices[2] = com.sun.star.text.TextField.DateTime;
-pServices[3] = com.sun.star.text.textfield.DateTime;
-break;
default:
aSeq.realloc(0);
}
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 15ea264..a0455ff 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -245,7 +245,7 @@ uno::Reference uno::XInterface SAL_CALL
SvxSimpleUnoModel::createInstance( co
RTL_CONSTASCII_STRINGPARAM(com.sun.star.text.TextField.DateTime)))
)
{
-return (::cppu::OWeakObject * )new SvxUnoTextField(
text::textfield::Type::EXTENDED_DATE );
+return (::cppu::OWeakObject * )new SvxUnoTextField(
text::textfield::Type::DATE );
}
return SvxUnoTextCreateTextField( aServiceSpecifier );
diff --git a/offapi/com/sun/star/text/textfield/Type.idl
b/offapi/com/sun/star/text/textfield/Type.idl
index a9a2653..cfa864a 100644
--- a/offapi/com/sun/star/text/textfield/Type.idl
+++ b/offapi/com/sun/star/text/textfield/Type.idl
@@ -60,8 +60,6 @@ constants Type
const long PRESENTATION_HEADER= 11;
const long PRESENTATION_FOOTER= 12;
const long PRESENTATION_DATE_TIME = 13;
-
-const long EXTENDED_DATE = 14;
};
}; }; }; }; };
diff --git
[Libreoffice-commits] .: editeng/source filter/source sfx2/source svtools/inc svtools/source svx/source toolkit/source tools/source unotools/source vcl/source
editeng/source/outliner/outliner.cxx |2 +-
filter/source/graphicfilter/icgm/chart.cxx|2 +-
filter/source/graphicfilter/icgm/elements.cxx |2 +-
filter/source/msfilter/svdfppt.cxx|4 ++--
sfx2/source/view/viewsh.cxx |2 +-
svtools/inc/svtools/treelist.hxx |2 +-
svtools/source/contnr/imivctl1.cxx|2 +-
svtools/source/contnr/treelist.cxx|2 +-
svtools/source/filter/filter.cxx |2 +-
svtools/source/graphic/grfmgr2.cxx|2 +-
svx/source/form/fmexpl.cxx|2 +-
svx/source/gallery2/gallery1.cxx |4 ++--
toolkit/source/awt/vclxgraphics.cxx |2 +-
tools/source/stream/strmunx.cxx |2 +-
unotools/source/config/options.cxx|2 +-
vcl/source/app/idlemgr.cxx|2 +-
vcl/source/window/accmgr.cxx |2 +-
vcl/source/window/toolbox.cxx |2 +-
18 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 46c01657d505a021673449ff0f874bc080d23ba6
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed May 2 21:57:04 2012 +0200
!= instead of for comparison with end iterator
Change-Id: I7baa34c1cf7161fb55914d41b451b842ad4ab0c8
diff --git a/editeng/source/outliner/outliner.cxx
b/editeng/source/outliner/outliner.cxx
index b1690e9..ffefcfb 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -1352,7 +1352,7 @@ OutlinerView* Outliner::RemoveView( OutlinerView* pView )
{
DBG_CHKTHIS(Outliner,0);
-for ( ViewList::iterator it = aViewList.begin(); it aViewList.end();
++it )
+for ( ViewList::iterator it = aViewList.begin(); it != aViewList.end();
++it )
{
if ( *it == pView )
{
diff --git a/filter/source/graphicfilter/icgm/chart.cxx
b/filter/source/graphicfilter/icgm/chart.cxx
index 7e34fdf..4651a04 100644
--- a/filter/source/graphicfilter/icgm/chart.cxx
+++ b/filter/source/graphicfilter/icgm/chart.cxx
@@ -71,7 +71,7 @@ void CGMChart::DeleteTextEntry( TextEntry* pTextEntry )
}
delete pTextEntry;
::std::vector TextEntry* ::iterator it;
-for ( it = maTextEntryList.begin(); it maTextEntryList.end(); ++it )
+for ( it = maTextEntryList.begin(); it != maTextEntryList.end(); ++it )
{
if ( *it == pTextEntry )
{
diff --git a/filter/source/graphicfilter/icgm/elements.cxx
b/filter/source/graphicfilter/icgm/elements.cxx
index a3f5892..07fef99 100644
--- a/filter/source/graphicfilter/icgm/elements.cxx
+++ b/filter/source/graphicfilter/icgm/elements.cxx
@@ -357,7 +357,7 @@ Bundle* CGMElements::InsertBundle( BundleList rList,
Bundle rBundle )
Bundle* pBundle = GetBundle( rList, rBundle.GetIndex() );
if ( pBundle )
{
-for ( BundleList::iterator it = rList.begin(); it rList.end(); ++it
) {
+for ( BundleList::iterator it = rList.begin(); it != rList.end(); ++it
) {
if ( *it == pBundle ) {
rList.erase( it );
delete pBundle;
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 7f36b99..d61ab39 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6721,12 +6721,12 @@ PPTTextObj::PPTTextObj( SvStream rIn,
SdrPowerPointImport rSdrPowerPointImport
{
// sorting fields ( hi lo )
::std::vector PPTFieldEntry* ::iterator
it = FieldList.begin();
-for( ; it FieldList.end(); ++it ) {
+for( ; it != FieldList.end(); ++it ) {
if ( (*it)-nPos pEntry-nPos ) {
break;
}
}
-if ( it FieldList.end() ) {
+if ( it != FieldList.end() ) {
FieldList.insert( it, pEntry );
} else {
FieldList.push_back( pEntry );
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index b961592..d4cb20b 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -433,7 +433,7 @@ SAL_DLLPRIVATE void SfxViewShell::IPClientGone_Impl(
SfxInPlaceClient *pIPClient
{
SfxInPlaceClientList* pClientList = GetIPClientList_Impl(sal_True);
-for( SfxInPlaceClientList::iterator it = pClientList-begin(); it
pClientList-end(); ++it )
+for( SfxInPlaceClientList::iterator it = pClientList-begin(); it !=
pClientList-end(); ++it )
{
if ( *it == pIPClient )
{
diff --git
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit4.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 953ba47e75a449c464b4ca488073360cf622553d
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 28 22:56:44 2012 +0200
Some cppcheck cleaning
Change-Id: Idf2e6e3e2870429541b3b5c225470cc80a13c102
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index 7316d7e..f2373fa 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -2160,7 +2160,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView
rEditView,
}
else
{
-DBG_ASSERT( pSpellInfo-aLastSpellContentSelections.size() 0,
aLastSpellContentSelections should not be empty here );
+DBG_ASSERT( !pSpellInfo-aLastSpellContentSelections.empty(),
aLastSpellContentSelections should not be empty here );
//select the complete sentence
SpellContentSelections::const_iterator aCurrentEndPosition =
pSpellInfo-aLastSpellContentSelections.end();
@@ -2217,7 +2217,7 @@ void ImpEditEngine::ApplyChangedSentence(EditView
rEditView,
void ImpEditEngine::PutSpellingToSentenceStart( EditView rEditView )
{
-if( pSpellInfo pSpellInfo-aLastSpellContentSelections.size() )
+if( pSpellInfo !pSpellInfo-aLastSpellContentSelections.empty() )
{
rEditView.pImpEditView-SetEditSelection(
pSpellInfo-aLastSpellContentSelections.begin()-Min() );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx | 14 ++
1 file changed, 14 insertions(+)
New commits:
commit b269dced445494891a8e6e8d1d62b931a31dddbd
Author: Michael Meeks michael.me...@suse.com
Date: Thu Apr 26 11:59:02 2012 +0100
fdo#46805 - special-case appending items to autocorrect lists
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index f459af0..ce5c71c 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -68,6 +68,7 @@
#include com/sun/star/ucb/NameClash.hpp
#include xmloff/xmltoken.hxx
#include vcl/help.hxx
+#include rtl/logfile.hxx
#define CHAR_HARDBLANK ((sal_Unicode)0x00A0)
@@ -233,15 +234,27 @@ void SvxAutocorrWordList::DeleteAndDestroy( sal_uInt16
nP, sal_uInt16 nL )
}
+// Keep the list sorted ...
sal_Bool SvxAutocorrWordList::Seek_Entry( const SvxAutocorrWordPtr aE,
sal_uInt16* pP ) const
{
register sal_uInt16 nO = SvxAutocorrWordList_SAR::Count(),
nM,
nU = 0;
+
if( nO 0 )
{
CollatorWrapper rCmp = ::GetCollatorWrapper();
nO--;
+
+// quick check of the end of the list
+if (rCmp.compareString( aE-GetShort(),
+(*((SvxAutocorrWordPtr*)pData +
nO))-GetShort() ) 0)
+{
+if( pP ) *pP = nO + 1;
+return sal_False;
+}
+
+// Incredibly crude sort algorithm, should use some partitioning
search.
while( nU = nO )
{
nM = nU + ( nO - nU ) / 2;
@@ -2169,6 +2182,7 @@ SvxAutocorrWordList*
SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
OSL_ENSURE( xXMLParser.is(), XMLReader::Read:
com.sun.star.xml.sax.Parser service missing );
if( xXMLParser.is() )
{
+RTL_LOGFILE_PRODUCT_CONTEXT( aLog, AutoCorrect Import );
uno::Reference xml::sax::XDocumentHandler xFilter = new
SvXMLAutoCorrectImport( xServiceFactory, pAutocorr_List, rAutoCorrect, xStg );
// connect parser and filter
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/frmitems.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 1489254311e75a379a129bceeab49643ebea04e0
Author: Dezsi Szabolcs dezsisz...@hotmail.com
Date: Fri Apr 20 14:10:56 2012 +0530
fdo#47436: Fixed crash while opening odt file.
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index efdcadb..d4b876b 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1951,7 +1951,8 @@ bool SvxBoxItem::PutValue( const uno::Any rVal,
sal_uInt8 nMemberId )
for (int n(0); n != SAL_N_ELEMENTS(aBorders); ++n)
{
editeng::SvxBorderLine* pLine = const_cast
editeng::SvxBorderLine* ( GetLine( aBorders[n] ) );
-pLine-SetStyle( eBorderStyle );
+if( pLine )
+pLine-SetStyle( eBorderStyle );
}
return sal_True;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 25de2a561b8f2618c2fa42dab39f57c727ce03e5
Author: Stephan Bergmann sberg...@redhat.com
Date: Mon Apr 16 15:52:46 2012 +0200
Corret size_t format specifier
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 98b4e9c..79c2c14 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -461,7 +461,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
fprintf( fp, \nMaxAutoPaperSize: %li x %li,
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
fprintf( fp, \nMinAutoPaperSize: %li x %li,
pEE-GetMinAutoPaperSize().Width(), pEE-GetMinAutoPaperSize().Height() );
fprintf( fp, \nUpdate: %i, pEE-GetUpdateMode() );
-fprintf( fp, \nNumber of Views: % SAL_PRIuUINT64, pEE-GetViewCount() );
+fprintf( fp, \nNumber of Views: % SAL_PRI_SIZET i, pEE-GetViewCount()
);
for ( sal_uInt16 nView = 0; nView pEE-GetViewCount(); nView++ )
{
EditView* pV = pEE-GetView( nView );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit daae05ccf52e37afc41dc1976afcc1f7c6fd978c
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 14 10:05:34 2012 +0200
WaE fix
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index af2e37f..98b4e9c 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -461,7 +461,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
fprintf( fp, \nMaxAutoPaperSize: %li x %li,
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
fprintf( fp, \nMinAutoPaperSize: %li x %li,
pEE-GetMinAutoPaperSize().Width(), pEE-GetMinAutoPaperSize().Height() );
fprintf( fp, \nUpdate: %i, pEE-GetUpdateMode() );
-fprintf( fp, \nNumber of Views: %i, pEE-GetViewCount() );
+fprintf( fp, \nNumber of Views: % SAL_PRIuUINT64, pEE-GetViewCount() );
for ( sal_uInt16 nView = 0; nView pEE-GetViewCount(); nView++ )
{
EditView* pV = pEE-GetView( nView );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 95cc5de63b20c5986fe8f3913da86002eabd7cb1
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Apr 14 18:06:08 2012 +0200
Resolves: fdo#48683 nice crash when hitting DEL
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 0d6877b..5ea5d71 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2436,7 +2436,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
// Remove portion;
sal_uInt8 nType = pTP-GetKind();
pParaPortion-GetTextPortions().Remove( nPortion );
-delete pTP;
if ( nType == PORTIONKIND_LINEBREAK )
{
TextPortion* pNext = pParaPortion-GetTextPortions()[ nPortion
];
@@ -2444,7 +2443,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
{
// Remove dummy portion
pParaPortion-GetTextPortions().Remove( nPortion );
-delete pNext;
}
}
}
@@ -2462,7 +2460,6 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
{
// Discard portion; if possible, correct the ones before,
// if the Hyphenator portion has swallowed one character...
-pParaPortion-GetTextPortions().Remove( nLastPortion );
if ( nLastPortion pTP-GetLen() )
{
TextPortion* pPrev =
pParaPortion-GetTextPortions()[nLastPortion - 1];
@@ -2470,7 +2467,7 @@ void ImpEditEngine::RecalcTextPortion( ParaPortion*
pParaPortion, sal_uInt16 nSt
pPrev-SetLen( pPrev-GetLen() + pTP-GetLen() );
pPrev-GetSize().Width() = (-1);
}
-delete pTP;
+pParaPortion-GetTextPortions().Remove( nLastPortion );
}
}
#if OSL_DEBUG_LEVEL 2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a78a7ee9f7b1db56a6fa7e082f410db5a8db2f18
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Apr 11 15:36:00 2012 -0400
Do this special case search only when the array is large enough.
Otherwise the normal linear search should be sufficient. Eventually
we need to use a better algorithm here than this special case handling...
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index f797d24..c791aa2 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -688,7 +688,7 @@ size_t FastGetPos(const _Array rArray, const _Val* p,
size_t rLastPos)
// Through certain filter code-paths we do a lot of appends, which in
// turn call GetPos - creating some N^2 nightmares. If we have a
// non-trivially large list, do a few checks from the end first.
-if (rLastPos 16)
+if (rLastPos 16 nArrayLen 16)
{
size_t nEnd;
if (rLastPos nArrayLen - 2)
@@ -698,7 +698,7 @@ size_t FastGetPos(const _Array rArray, const _Val* p,
size_t rLastPos)
for (size_t nIdx = rLastPos - 2; nIdx nEnd; ++nIdx)
{
-if (rArray[nIdx] == p)
+if (rArray.at(nIdx) == p)
{
rLastPos = nIdx;
return nIdx;
@@ -707,7 +707,7 @@ size_t FastGetPos(const _Array rArray, const _Val* p,
size_t rLastPos)
}
// The world's lamest linear search from svarray ...
for (size_t nIdx = 0; nIdx nArrayLen; ++nIdx)
-if (rArray[nIdx] == p)
+if (rArray.at(nIdx) == p)
return rLastPos = nIdx;
// 0x is used to signify not found condition. We need to change this.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source slideshow/source xmlsecurity/source
editeng/source/editeng/impedit3.cxx |2 +-
slideshow/source/engine/slideshowimpl.cxx |2 +-
xmlsecurity/source/helper/documentsignaturehelper.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a16060116346533923c607bd406d3fea511b41ec
Author: Julien Nabet serval2...@yahoo.fr
Date: Sun Apr 8 01:01:31 2012 +0200
Fix Prefer prefix ++/-- operators
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index a380c08..46cfe04 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -2349,7 +2349,7 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
DBG_ASSERT( (nInvPos != aPositions.end()), InvPos ?! );
::std::set sal_uInt32 ::iterator i = nInvPos;
-i++;
+++i;
while ( i != aPositions.end() )
{
TextPortion* pNew = new TextPortion( static_castsal_uInt16(*i++) -
static_castsal_uInt16(*nInvPos++) );
diff --git a/slideshow/source/engine/slideshowimpl.cxx
b/slideshow/source/engine/slideshowimpl.cxx
index ca91a6c..7718019 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -902,7 +902,7 @@ PolygonMap::iterator SlideShowImpl::findPolygons(
uno::Referencedrawing::XDrawP
if(aIter-first == xDrawPage)
bFound = true;
else
-aIter++;
+++aIter;
}
return aIter;
diff --git a/xmlsecurity/source/helper/documentsignaturehelper.cxx
b/xmlsecurity/source/helper/documentsignaturehelper.cxx
index 7523bf1..8b10f03 100644
--- a/xmlsecurity/source/helper/documentsignaturehelper.cxx
+++ b/xmlsecurity/source/helper/documentsignaturehelper.cxx
@@ -374,7 +374,7 @@ bool DocumentSignatureHelper::checkIfAllFilesAreSigned(
//find the file in the element list
typedef ::std::vector ::rtl::OUString ::const_iterator CIT;
-for (CIT aIter = sElementList.begin(); aIter sElementList.end();
aIter++)
+for (CIT aIter = sElementList.begin(); aIter !=
sElementList.end(); ++aIter)
{
::rtl::OUString sElementListURI = *aIter;
if (alg == OOo2Document)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit e0fd2c61e47c994d050d9afcb9578e096e1489b6
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Apr 4 16:22:32 2012 -0400
dbgutil fix.
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 9142ec1..c1ef702 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -334,13 +334,14 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE,
sal_Bool bInfoBox )
fprintf( fp,
\n
);
for ( sal_uInt16 nPortion = 0; nPortion
pEE-pImpEditEngine-GetParaPortions(). Count(); nPortion++)
{
-
ParaPortion* pPPortion =
pEE-pImpEditEngine-GetParaPortions()[nPortion];
-fprintf( fp, \nParagraph %i: Length = %i, Invalid = %i\nText = '%s',
nPortion, pPPortion-GetNode()-Len(), pPPortion-IsInvalid(),
rtl::OUStringToOString( *pPPortion-GetNode(), RTL_TEXTENCODING_ASCII_US
).getStr() );
+fprintf( fp, \nParagraph %i: Length = %i, Invalid = %i\nText = '%s',
+ nPortion, pPPortion-GetNode()-Len(), pPPortion-IsInvalid(),
+ rtl::OUStringToOString(pPPortion-GetNode()-GetString(),
RTL_TEXTENCODING_UTF8).getStr() );
fprintf( fp, \nVorlage: );
SfxStyleSheet* pStyle = pPPortion-GetNode()-GetStyleSheet();
if ( pStyle )
-fprintf( fp, %s, rtl::OUStringToOString( pStyle-GetName(),
RTL_TEXTENCODING_ASCII_US ).getStr() );
+fprintf( fp, %s, rtl::OUStringToOString( pStyle-GetName(),
RTL_TEXTENCODING_UTF8).getStr() );
fprintf( fp, \nParagraph attribute: );
DbgOutItemSet( fp,
pPPortion-GetNode()-GetContentAttribs().GetItems(), sal_False, sal_False );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 2c4e811049e9f2cad823e372a01a5afc09ead25c
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 11:44:06 2012 -0400
Fix the dbgutil build.
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 48f6e00..9142ec1 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -384,7 +384,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
sal_uLong n = 0;
for ( z = 0; z nTextPortions; z++ )
{
-TextPortion* pPortion = pPPortion-GetTextPortions().GetObject( z
);
+TextPortion* pPortion = pPPortion-GetTextPortions()[z];
aPortionStr.append(' ');
aPortionStr.append(static_castsal_Int32(pPortion-GetLen()));
aPortionStr.append('(');
@@ -409,7 +409,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
sal_uInt16 nLine;
for ( nLine = 0; nLine pPPortion-GetLines().Count(); nLine++ )
{
-EditLine* pLine = pPPortion-GetLines().GetObject( nLine );
+EditLine* pLine = pPPortion-GetLines()[nLine];
rtl::OString
aLine(rtl::OUStringToOString(pPPortion-GetNode()-Copy(pLine-GetStart(),
pLine-GetEnd() - pLine-GetStart()), RTL_TEXTENCODING_ASCII_US));
fprintf( fp, \nLine %i\t%s, nLine, aLine.getStr() );
@@ -417,7 +417,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
// then the internal data ...
for ( nLine = 0; nLine pPPortion-GetLines().Count(); nLine++ )
{
-EditLine* pLine = pPPortion-GetLines().GetObject( nLine );
+EditLine* pLine = pPPortion-GetLines()[nLine];
fprintf( fp, \nZeile %i:\tStart: %i,\tEnd: %i, nLine,
pLine-GetStart(), pLine-GetEnd() );
fprintf( fp, \t\tPortions: %i - %i.\tHight: %i, Ascent=%i,
pLine-GetStartPortion(), pLine-GetEndPortion(), pLine-GetHeight(),
pLine-GetMaxAscent() );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit2.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 97bcf0b645fa5ce14cfd806548c6805952fd3e76
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 11:51:18 2012 -0400
WaE: for Norbert's Mac OS tinderbox.
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 6a01a0f..ec74f29 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3965,7 +3965,7 @@ long ImpEditEngine::GetXPos(
// End of Portion
if ( pPortion-GetKind() == PORTIONKIND_TAB )
{
-if ( (nTextPortion+1)
pParaPortion-GetTextPortions().Count() )
+if ( static_castsize_t(nTextPortion+1)
pParaPortion-GetTextPortions().Count() )
{
const TextPortion* pNextPortion =
pParaPortion-GetTextPortions()[nTextPortion+1];
if ( pNextPortion-GetKind() != PORTIONKIND_TAB )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |2 +-
editeng/source/editeng/impedit4.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 881fa8d5cbb937b033f87f7da813419895b31b28
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 13:15:57 2012 -0400
More dbgutil build fix.
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 091c329..83396c9 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1697,7 +1697,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine(
ParaPortion* pParaPortion, sal_uIn
{
// -2: The new one is already inserted.
#ifdef DBG_UTIL
-EditLine* pLastLine = pParaPortion-GetLines().GetObject(
pParaPortion-GetLines().Count()-2 );
+EditLine* pLastLine =
pParaPortion-GetLines()[pParaPortion-GetLines().Count()-2];
DBG_ASSERT( pLastLine, soft wrap no line?! );
DBG_ASSERT( pLastLine-GetEnd() == pParaPortion-GetNode()-Len(),
different anyway? );
#endif
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index dd45a57..63b9402 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -1167,9 +1167,9 @@ EditTextObject* ImpEditEngine::CreateBinTextObject(
EditSelection aSel, SfxItemP
sal_uInt16 nTest;
int nTPLen = 0, nTxtLen = 0;
for ( nTest = pParaPortion-GetTextPortions().Count(); nTest; )
-nTPLen += pParaPortion-GetTextPortions().GetObject( --nTest
)-GetLen();
+nTPLen += pParaPortion-GetTextPortions()[--nTest]-GetLen();
for ( nTest = pParaPortion-GetLines().Count(); nTest; )
-nTxtLen += pParaPortion-GetLines().GetObject( --nTest
)-GetLen();
+nTxtLen += pParaPortion-GetLines()[--nTest]-GetLen();
DBG_ASSERT( ( nTPLen == pParaPortion-GetNode()-Len() ) (
nTxtLen == pParaPortion-GetNode()-Len() ), CreateBinTextObject: ParaPortion
not completely formatted! );
#endif
}
@@ -1363,9 +1363,9 @@ EditSelection ImpEditEngine::InsertBinTextObject(
BinTextObject rTextObject, Ed
sal_uInt16 nTest;
int nTPLen = 0, nTxtLen = 0;
for ( nTest = pParaPortion-GetTextPortions().Count(); nTest; )
-nTPLen += pParaPortion-GetTextPortions().GetObject(
--nTest )-GetLen();
+nTPLen +=
pParaPortion-GetTextPortions()[--nTest]-GetLen();
for ( nTest = pParaPortion-GetLines().Count(); nTest; )
-nTxtLen += pParaPortion-GetLines().GetObject( --nTest
)-GetLen();
+nTxtLen += pParaPortion-GetLines()[--nTest]-GetLen();
DBG_ASSERT( ( nTPLen == pParaPortion-GetNode()-Len() ) (
nTxtLen == pParaPortion-GetNode()-Len() ), InsertBinTextObject: ParaPortion
not completely formatted! );
#endif
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit e7e882715872303dc8feabc899ceab572d1c2337
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 13:53:15 2012 -0400
Unused local variables.
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index b01c830..d3268ce 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -491,7 +491,6 @@ void ImpEditView::ResetOutputArea( const Rectangle rRec )
void ImpEditView::RecalcOutputArea()
{
-Rectangle aOldArea( aOutArea );
Point aNewTopLeft( aOutArea.TopLeft() );
Size aNewSz( aOutArea.GetSize() );
@@ -886,7 +885,6 @@ Pair ImpEditView::Scroll( long ndX, long ndY, sal_uInt8
nRangeCheck )
#endif
Rectangle aNewVisArea( GetVisDocArea() );
-Size aPaperSz( pEditEngine-pImpEditEngine-GetPaperSize() );
// Vertical:
if ( !IsVertical() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit e5d378b1ba04c470e0c6c16b48af97ab5818e2bb
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 18:26:29 2012 -0400
Check for empty-ness of vector before accessing the first element.
I hope this will keep Stephan's tinderbox happy. If not...
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 83396c9..4e9c393 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1241,7 +1241,9 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara,
sal_uInt32 nStartPosY )
if ( bCompressedChars pPortion ( pPortion-GetLen() 1 )
pPortion-GetExtraInfos() pPortion-GetExtraInfos()-bCompressed )
{
// I need the manipulated DXArray for determining the break
postion...
-sal_Int32* pDXArray = pLine-GetCharPosArray()[0] +
(nPortionStart - pLine-GetStart());
+sal_Int32* pDXArray = NULL;
+if (!pLine-GetCharPosArray().empty())
+pDXArray = pLine-GetCharPosArray()[0] + (nPortionStart -
pLine-GetStart());
ImplCalcAsianCompression(
pNode, pPortion, nPortionStart, pDXArray, 1, true);
}
@@ -2997,7 +2999,8 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
Rectangle aClipRec, Point aSta
aText = *pPortion-GetNode();
nTextStart = nIndex;
nTextLen = pTextPortion-GetLen();
-pDXArray = pLine-GetCharPosArray()[0]+(
nIndex-pLine-GetStart() );
+if (!pLine-GetCharPosArray().empty())
+pDXArray =
pLine-GetCharPosArray()[0]+( nIndex-pLine-GetStart() );
// Paint control characters (#i55716#)
if ( aStatus.MarkFields() )
@@ -4457,7 +4460,9 @@ void ImpEditEngine::ImplExpandCompressedPortions(
EditLine* pLine, ParaPortion*
size_t nTxtPortion = pParaPortion-GetTextPortions().GetPos(
pTP );
sal_uInt16 nTxtPortionStart =
pParaPortion-GetTextPortions().GetStartPos( nTxtPortion );
DBG_ASSERT( nTxtPortionStart = pLine-GetStart(), Portion
doesn't belong to the line!!! );
-sal_Int32* pDXArray = pLine-GetCharPosArray()[0]+(
nTxtPortionStart-pLine-GetStart() );
+sal_Int32* pDXArray = NULL;
+if (!pLine-GetCharPosArray().empty())
+pDXArray = pLine-GetCharPosArray()[0]+(
nTxtPortionStart-pLine-GetStart() );
if ( pTP-GetExtraInfos()-pOrgDXArray )
memcpy( pDXArray, pTP-GetExtraInfos()-pOrgDXArray,
(pTP-GetLen()-1)*sizeof(sal_Int32) );
ImplCalcAsianCompression( pParaPortion-GetNode(), pTP,
nTxtPortionStart, pDXArray, (sal_uInt16)nCompressPercent, sal_True );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit2.cxx |4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 71da75abda60172ee9b8f42c1bf5de2f48a731b9
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Apr 3 18:45:55 2012 -0400
I need to check for empty-ness here too.
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index ec74f29..ecb4a89 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -4021,7 +4021,9 @@ long ImpEditEngine::GetXPos(
if ( nType == CHAR_PUNCTUATIONRIGHT )
{
sal_uInt16 n = nIndex - nTextPortionStart;
-const sal_Int32* pDXArray =
pLine-GetCharPosArray()[0]+( nTextPortionStart-pLine-GetStart() );
+const sal_Int32* pDXArray = NULL;
+if (!pLine-GetCharPosArray().empty())
+pDXArray = pLine-GetCharPosArray()[0]+(
nTextPortionStart-pLine-GetStart() );
sal_Int32 nCharWidth = ( ( (n+1)
pPortion-GetLen() ) ? pDXArray[n] : pPortion-GetSize().Width() )
- ( n ?
pDXArray[n-1] : 0 );
if ( (n+1) pPortion-GetLen() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editattr.cxx | 10 --
editeng/source/editeng/editattr.hxx |4 +---
editeng/source/editeng/editdoc.cxx |2 +-
3 files changed, 2 insertions(+), 14 deletions(-)
New commits:
commit d52d301660df47527a69c12bca49bb4e0199b4f5
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 30 16:36:01 2012 +0200
avoid sc crashes
Boost is reportedly 'expertly designed C++ library', so why do I
find the idea of a container containing pointers but exposing them
by value to be rather retarded? I don't know why exactly this
crashes, but I expect std::sort() either either does unwanted
copies that break things or the copies slice off inherited classes.
diff --git a/editeng/source/editeng/editattr.cxx
b/editeng/source/editeng/editattr.cxx
index 171eb36..2e79644 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -66,12 +66,6 @@ EditAttrib::EditAttrib( const SfxPoolItem rAttr )
pItem = rAttr;
}
-EditAttrib::EditAttrib(const EditAttrib r) :
-pItem(r.pItem)
-{
-DBG_CTOR( EE_EditAttrib, 0 );
-}
-
EditAttrib::~EditAttrib()
{
DBG_DTOR( EE_EditAttrib, 0 );
@@ -88,10 +82,6 @@ EditCharAttrib::EditCharAttrib( const SfxPoolItem rAttr,
sal_uInt16 nS, sal_uIn
DBG_ASSERT( ( rAttr.Which() EE_FEATURE_START ) || ( rAttr.Which()
EE_FEATURE_END ) || ( nE == (nS+1) ), EditCharAttrib CTOR: Invalid feature! );
}
-EditCharAttrib::EditCharAttrib(const EditCharAttrib r) :
-EditAttrib(r),
-nStart(r.nStart), nEnd(r.nEnd), bFeature(r.bFeature), bEdge(r.bEdge) {}
-
void EditCharAttrib::SetFont( SvxFont, OutputDevice* )
{
}
diff --git a/editeng/source/editeng/editattr.hxx
b/editeng/source/editeng/editattr.hxx
index 0ad35a2..5855e47 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -68,7 +68,7 @@ class SfxVoidItem;
// -
// class EditAttrib
// -
-class EditAttrib
+class EditAttrib : public boost::noncopyable
{
private:
EditAttrib();
@@ -77,7 +77,6 @@ protected:
const SfxPoolItem* pItem;
EditAttrib( const SfxPoolItem rAttr );
-EditAttrib(const EditAttrib r);
virtual ~EditAttrib();
public:
@@ -104,7 +103,6 @@ protected:
public:
EditCharAttrib( const SfxPoolItem rAttr, sal_uInt16 nStart, sal_uInt16
nEnd );
-EditCharAttrib(const EditCharAttrib r);
sal_uInt16 GetStart() { return nStart; }
sal_uInt16 GetEnd(){ return nEnd; }
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 6b35b47..86a709b 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2005,7 +2005,7 @@ void CharAttribList::InsertAttrib( EditCharAttrib*
pAttrib )
void CharAttribList::ResortAttribs()
{
-std::sort(aAttribs.begin(), aAttribs.end(), LessByStart());
+aAttribs.sort(LessByStart());
}
void CharAttribList::OptimizeRanges( SfxItemPool rItemPool )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx |9 -
editeng/source/editeng/editdoc.hxx |4
editeng/source/editeng/editdoc2.cxx |8
editeng/source/editeng/impedit2.cxx |7 ---
4 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit 46da0b6837bffa7d8a72624d2587159737e3d7e2
Author: LuboÅ¡ LuÅák l.lu...@suse.cz
Date: Fri Mar 30 23:32:21 2012 +0200
further sc/editeng unbreaking
this boost::ptr_vector idea is seriously broken
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 51f0112..c05e379 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -1816,7 +1816,7 @@ void EditDoc::InsertAttrib( ContentNode* pNode,
sal_uInt16 nStart, sal_uInt16 nE
if ( pAttr )
{
// Remove attribute
-rAttrList.Remove(pAttr);
+rAttrList.Release(pAttr);
}
// check whether 'the same' attribute exist at this place.
@@ -2137,6 +2137,13 @@ void CharAttribList::Remove(size_t nPos)
aAttribs.erase(aAttribs.begin()+nPos);
}
+void CharAttribList::Release(const EditCharAttrib* p)
+{
+AttribsType::iterator it = std::find_if(aAttribs.begin(), aAttribs.end(),
FindByAddress(p));
+if (it != aAttribs.end())
+aAttribs.release(it).release();
+}
+
void CharAttribList::SetHasEmptyAttribs(bool b)
{
bHasEmptyAttribs = b;
diff --git a/editeng/source/editeng/editdoc.hxx
b/editeng/source/editeng/editdoc.hxx
index bf00c76..609e2bd 100644
--- a/editeng/source/editeng/editdoc.hxx
+++ b/editeng/source/editeng/editdoc.hxx
@@ -253,6 +253,7 @@ public:
void Remove(const EditCharAttrib* p);
void Remove(size_t nPos);
+void Release(const EditCharAttrib* p);
#if OSL_DEBUG_LEVEL 2
// Debug:
@@ -315,7 +316,10 @@ public:
ContentNode* operator[](size_t nPos);
void Insert(size_t nPos, ContentNode* p);
+/// deletes
void Remove(size_t nPos);
+/// does not delete
+void Release(size_t nPos);
size_t Count() const;
void Clear();
};
diff --git a/editeng/source/editeng/editdoc2.cxx
b/editeng/source/editeng/editdoc2.cxx
index b22c10b..fc65c9c 100644
--- a/editeng/source/editeng/editdoc2.cxx
+++ b/editeng/source/editeng/editdoc2.cxx
@@ -419,6 +419,14 @@ void ContentList::Remove(size_t nPos)
maContents.erase(maContents.begin() + nPos);
}
+void ContentList::Release(size_t nPos)
+{
+if (nPos = maContents.size())
+return;
+
+maContents.release(maContents.begin() + nPos).release();
+}
+
size_t ContentList::Count() const
{
return maContents.size();
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index a4654f0..9bab5db 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2192,7 +2192,7 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range
aOldPositions, sal_uInt16
{
// always aOldPositions.Min(), since Remove().
ParaPortion* pTmpPortion =
GetParaPortions().Release(aOldPositions.Min());
-aEditDoc.Remove( (sal_uInt16)aOldPositions.Min() );
+aEditDoc.Release( (sal_uInt16)aOldPositions.Min() );
aTmpPortionList.Append(pTmpPortion);
}
@@ -2237,7 +2237,8 @@ EditSelection ImpEditEngine::ImpMoveParagraphs( Range
aOldPositions, sal_uInt16
if ( pRecalc4 )
CalcHeight( pRecalc4 );
-aTmpPortionList.Reset();
+while( aTmpPortionList.Count() 0 )
+aTmpPortionList.Release( aTmpPortionList.Count() - 1 );
#if OSL_DEBUG_LEVEL 2
GetParaPortions().DbgCheck(aEditDoc);
@@ -2484,7 +2485,7 @@ void ImpEditEngine::ImpRemoveParagraph( sal_uInt16 nPara )
aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
// The node is managed by the undo and possibly destroyed!
-aEditDoc.Remove( nPara );
+aEditDoc.Release( nPara );
GetParaPortions().Remove( nPara );
if ( IsCallParaInsertedOrDeleted() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit2.cxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit b512c3ca29735f15383c5f6215348fccfaddd40e
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Thu Mar 29 02:00:02 2012 -0400
No need to delete ParaPortion outside of the container any more.
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 04cebce..e7d2bbc 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2477,18 +2477,15 @@ void ImpEditEngine::ImpRemoveParagraph( sal_uInt16
nPara )
{
ContentNode* pNode = aEditDoc.SaveGetObject( nPara );
ContentNode* pNextNode = aEditDoc.SaveGetObject( nPara+1 );
-ParaPortion* pPortion = GetParaPortions().SaveGetObject( nPara );
OSL_ENSURE( pNode, Blind Node in ImpRemoveParagraph );
-OSL_ENSURE( pPortion, Blind Portion in ImpRemoveParagraph(2) );
DeletedNodeInfo* pInf = new DeletedNodeInfo( (sal_uLong)pNode, nPara );
aDeletedNodes.Insert( pInf, aDeletedNodes.Count() );
// The node is managed by the undo and possibly destroyed!
-/* delete */ aEditDoc.Remove( nPara );
+aEditDoc.Remove( nPara );
GetParaPortions().Remove( nPara );
-delete pPortion;
if ( IsCallParaInsertedOrDeleted() )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editeng.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a159dfbea39dd3470837e73bf2df4cd2a0f3e806
Author: Stephan Bergmann sberg...@redhat.com
Date: Thu Mar 29 11:04:03 2012 +0200
-Werror=sign-compare
...solved by recasting the offending expression.
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 2b246c9..4f9184f 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1320,7 +1320,7 @@ EditTextObject* EditEngine::CreateTextObject( sal_uInt16
nPara, sal_uInt16 nPara
{
DBG_CHKTHIS( EditEngine, 0 );
DBG_ASSERT( nPara pImpEditEngine-GetEditDoc().Count(),
CreateTextObject: Startpara out of Range );
-DBG_ASSERT( nPara+nParas-1 pImpEditEngine-GetEditDoc().Count(),
CreateTextObject: Endpara out of Range );
+DBG_ASSERT( nParas = pImpEditEngine-GetEditDoc().Count() - nPara,
CreateTextObject: Endpara out of Range );
ContentNode* pStartNode = pImpEditEngine-GetEditDoc().SafeGetObject(
nPara );
ContentNode* pEndNode = pImpEditEngine-GetEditDoc().SafeGetObject(
nPara+nParas-1 );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source filter/source sc/source starmath/source svtools/inc toolkit/source
editeng/source/editeng/editdoc.hxx |1 - editeng/source/misc/svxacorr.cxx|1 - filter/source/xsltdialog/xmlfileview.hxx|1 - sc/source/filter/html/htmlpars.cxx |1 - starmath/source/math_pch.cxx|1 - svtools/inc/svtools/treelist.hxx|2 +- toolkit/source/controls/unocontrol.cxx |1 - toolkit/source/controls/unocontrolmodel.cxx |1 - 8 files changed, 1 insertion(+), 8 deletions(-) New commits: commit 82f5a3b5df000966d344b26fe36e776bc947c6ef Author: Noel Grandin n...@peralex.com Date: Thu Mar 29 16:49:07 2012 +0200 Remove unnecessary tools/table.hxx #includes diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 59010d6..bf00c76 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -37,7 +37,6 @@ #include svl/itemset.hxx #include svl/style.hxx #include svl/itempool.hxx -#include tools/table.hxx #include vector #include deque diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index ac726c8..651b9eb 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -29,7 +29,6 @@ #include com/sun/star/io/XStream.hpp #include com/sun/star/lang/Locale.hpp #include tools/urlobj.hxx -#include tools/table.hxx #include i18npool/mslangid.hxx #include vcl/svapp.hxx #include sot/storinfo.hxx diff --git a/filter/source/xsltdialog/xmlfileview.hxx b/filter/source/xsltdialog/xmlfileview.hxx index 4ff36a4..5623fab 100644 --- a/filter/source/xsltdialog/xmlfileview.hxx +++ b/filter/source/xsltdialog/xmlfileview.hxx @@ -32,7 +32,6 @@ #include svl/lstner.hxx #include vcl/timer.hxx -#include tools/table.hxx #include svtools/xtextedt.hxx #include vcl/timer.hxx #include vcl/wrkwin.hxx diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index aaae381..019d057 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -58,7 +58,6 @@ #include vcl/svapp.hxx #include tools/urlobj.hxx #include tools/tenccvt.hxx -#include tools/table.hxx #include htmlpars.hxx #include global.hxx diff --git a/starmath/source/math_pch.cxx b/starmath/source/math_pch.cxx index ee17d65..945025c 100644 --- a/starmath/source/math_pch.cxx +++ b/starmath/source/math_pch.cxx @@ -349,7 +349,6 @@ #include vcl/metric.hxx #include sfx2/inimgr.hxx #include node.hxx -#include tools/table.hxx #include sfx2/docfac.hxx #include svl/ownlist.hxx #include sfx2/objsh.hxx diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx index b2a7173..c505e27 100644 --- a/svtools/inc/svtools/treelist.hxx +++ b/svtools/inc/svtools/treelist.hxx @@ -29,12 +29,12 @@ #ifndef _SVTREELIST_HXX #define _SVTREELIST_HXX +#include limits.h #include svtools/svtdllapi.h #include tools/solar.h #include vector #include boost/ptr_container/ptr_map.hpp -#include tools/table.hxx #include tools/link.hxx #include tools/string.hxx #include tools/debug.hxx diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index b845b59..cec8c40 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -39,7 +39,6 @@ #include rtl/memory.h #include rtl/uuid.h #include osl/mutex.hxx -#include tools/table.hxx #include tools/date.hxx #include tools/debug.hxx #include tools/diagnose_ex.h diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index ac7f3ed..8afc19e 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -43,7 +43,6 @@ #include rtl/memory.h #include rtl/uuid.h #include tools/diagnose_ex.h -#include tools/table.hxx #include tools/date.hxx #include tools/time.hxx #include tools/debug.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdbg.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 736bf5c26f4f220171d95f52b933669c1ff6b172
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Wed Mar 28 14:00:06 2012 -0400
Keep tinderbox happy.
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index a1b4575..4070002 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -349,21 +349,21 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE,
sal_Bool bInfoBox )
sal_uInt16 z;
for ( z = 0; z pPPortion-GetNode()-GetCharAttribs().Count(); z++ )
{
-EditCharAttrib* pAttr =
pPPortion-GetNode()-GetCharAttribs().GetAttribs().GetObject( z );
+const EditCharAttrib rAttr =
pPPortion-GetNode()-GetCharAttribs().GetAttribs()[z];
rtl::OStringBuffer aCharAttribs;
aCharAttribs.append(RTL_CONSTASCII_STRINGPARAM(\nA));
aCharAttribs.append(static_castsal_Int32(nPortion));
aCharAttribs.append(RTL_CONSTASCII_STRINGPARAM(: ));
-
aCharAttribs.append(static_castsal_Int32(pAttr-GetItem()-Which()));
+
aCharAttribs.append(static_castsal_Int32(rAttr.GetItem()-Which()));
aCharAttribs.append('\t');
-aCharAttribs.append(static_castsal_Int32(pAttr-GetStart()));
+aCharAttribs.append(static_castsal_Int32(rAttr.GetStart()));
aCharAttribs.append('\t');
-aCharAttribs.append(static_castsal_Int32(pAttr-GetEnd()));
-if ( pAttr-IsEmpty() )
+aCharAttribs.append(static_castsal_Int32(rAttr.GetEnd()));
+if ( rAttr.IsEmpty() )
bZeroAttr = sal_True;
fprintf(fp, %s = , aCharAttribs.getStr());
-rtl::OString aDebStr = DbgOutItem( rPool, *pAttr-GetItem() );
+rtl::OString aDebStr = DbgOutItem( rPool, *rAttr.GetItem() );
fprintf( fp, %s, aDebStr.getStr() );
}
if ( bZeroAttr )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sc/source
editeng/source/items/flditem.cxx | 16
sc/source/ui/app/scdll.cxx |6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit df827af160fa255c56b9aaef644a2d9c4680977d
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date: Tue Mar 27 01:34:35 2012 -0400
Let's not use a macro for this...
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index a182a36..58f6ab1 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -948,14 +948,14 @@ SvClassManager SvxFieldItem::GetClassManager()
if ( !pClassMgr )
{
pClassMgr = new SvClassManager;
-pClassMgr-SV_CLASS_REGISTER( SvxFieldData );
-pClassMgr-SV_CLASS_REGISTER( SvxURLField );
-pClassMgr-SV_CLASS_REGISTER( SvxDateField );
-pClassMgr-SV_CLASS_REGISTER( SvxPageField );
-pClassMgr-SV_CLASS_REGISTER( SvxTimeField );
-pClassMgr-SV_CLASS_REGISTER( SvxExtTimeField );
-pClassMgr-SV_CLASS_REGISTER( SvxExtFileField );
-pClassMgr-SV_CLASS_REGISTER( SvxAuthorField );
+pClassMgr-Register(SvxFieldData::StaticClassId(),
SvxFieldData::CreateInstance);
+pClassMgr-Register(SvxURLField::StaticClassId(),
SvxURLField::CreateInstance);
+pClassMgr-Register(SvxDateField::StaticClassId(),
SvxDateField::CreateInstance);
+pClassMgr-Register(SvxPageField::StaticClassId(),
SvxPageField::CreateInstance);
+pClassMgr-Register(SvxTimeField::StaticClassId(),
SvxTimeField::CreateInstance);
+pClassMgr-Register(SvxExtTimeField::StaticClassId(),
SvxExtTimeField::CreateInstance);
+pClassMgr-Register(SvxExtFileField::StaticClassId(),
SvxExtFileField::CreateInstance);
+pClassMgr-Register(SvxAuthorField::StaticClassId(),
SvxAuthorField::CreateInstance);
}
return *pClassMgr;
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 25712d4..2d9af16 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -295,9 +295,9 @@ void ScDLL::Init()
// Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
SvClassManager rClassManager = SvxFieldItem::GetClassManager();
-rClassManager.SV_CLASS_REGISTER( SvxPagesField );
-rClassManager.SV_CLASS_REGISTER( SvxFileField );
-rClassManager.SV_CLASS_REGISTER( SvxTableField );
+rClassManager.Register(SvxPagesField::StaticClassId(),
SvxPagesField::CreateInstance);
+rClassManager.Register(SvxFileField::StaticClassId(),
SvxFileField::CreateInstance);
+rClassManager.Register(SvxTableField::StaticClassId(),
SvxTableField::CreateInstance);
SdrRegisterFieldClasses(); // SvDraw-Felder registrieren
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/frmitems.cxx | 30 ++
1 file changed, 14 insertions(+), 16 deletions(-)
New commits:
commit ffc3c27130faec6c5337943975fa6ebf7623de36
Author: Caolán McNamara caol...@redhat.com
Date: Tue Mar 13 12:58:07 2012 +
Conditional jump or move depends on uninitialised value
diff --git a/editeng/source/items/frmitems.cxx
b/editeng/source/items/frmitems.cxx
index f38ba5d..c2dbce8 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -792,28 +792,26 @@ bool SvxLRSpaceItem::HasMetrics() const
// class SvxULSpaceItem --
-SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId ) :
-
-SfxPoolItem( nId ),
-
-nUpper( 0 ),
-nLower( 0 ),
-nPropUpper( 100 ),
-nPropLower( 100 )
+SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nId )
+: SfxPoolItem(nId)
+, nUpper(0)
+, nLower(0)
+, bContext(false)
+, nPropUpper(100)
+, nPropLower(100)
{
}
// ---
SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
-const sal_uInt16 nId ) :
-
-SfxPoolItem( nId ),
-
-nUpper( nUp ),
-nLower( nLow ),
-nPropUpper( 100 ),
-nPropLower( 100 )
+const sal_uInt16 nId )
+: SfxPoolItem(nId)
+, nUpper(nUp)
+, nLower(nLow)
+, bContext(false)
+, nPropUpper(100)
+, nPropLower(100)
{
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit.hxx |6 ++--
editeng/source/editeng/impedit3.cxx | 50 ++--
editeng/source/editeng/impedit4.cxx |4 +-
3 files changed, 25 insertions(+), 35 deletions(-)
New commits:
commit f2d0fcc26be481c2f872056fb3b8402169d124d8
Author: Bartosz Kosiorek gan...@poczta.onet.pl
Date: Sat Mar 10 22:16:16 2012 +0100
Replace VARARR_SORT with std
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 2076d29..5196703 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -905,7 +905,7 @@ public:
LanguageTypeGetDefaultLanguage() const { return eDefLanguage; }
-LanguageTypeGetLanguage( const EditSelection rSelection ) const;
+LanguageTypeGetLanguage( const EditSelection rSelection ) const;
LanguageTypeGetLanguage( const EditPaM rPaM, sal_uInt16* pEndPos
= NULL ) const;
::com::sun::star::lang::Locale GetLocale( const EditPaM rPaM ) const;
@@ -945,12 +945,12 @@ public:
//adds one or more portions of text to the SpellPortions depending on
language changes
voidAddPortionIterated(
EditView rEditView,
-const EditSelection rSel,
+const EditSelection rSel,
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellAlternatives xAlt,
::svx::SpellPortions rToFill);
//adds one portion to the SpellPortions
voidAddPortion(
-const EditSelection rSel,
+const EditSelection rSel,
::com::sun::star::uno::Reference
::com::sun::star::linguistic2::XSpellAlternatives xAlt,
::svx::SpellPortions rToFill,
bool bIsField );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index d37d8d9..a7919a2 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -68,6 +68,7 @@
#include editeng/unolingu.hxx
+#include set
#include math.h
#include vcl/svapp.hxx
#include vcl/metric.hxx
@@ -86,9 +87,6 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::linguistic2;
-SV_DECL_VARARR_SORT( SortedPositions, sal_uInt32, 16 )
-SV_IMPL_VARARR_SORT( SortedPositions, sal_uInt32 );
-
#define CH_HYPH '-'
#define RESDIFF 10
@@ -2252,14 +2250,14 @@ sal_uInt16 ImpEditEngine::SplitTextPortion(
ParaPortion* pPortion, sal_uInt16 nP
return nSplitPortion;
}
-void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16
rStart /* , sal_Bool bCreateBlockPortions */ )
+void ImpEditEngine::CreateTextPortions( ParaPortion* pParaPortion, sal_uInt16
rStart )
{
sal_uInt16 nStartPos = rStart;
ContentNode* pNode = pParaPortion-GetNode();
DBG_ASSERT( pNode-Len(), CreateTextPortions should not be used for empty
paragraphs! );
-SortedPositions aPositions;
-aPositions.Insert( (sal_uInt32) 0 );
+::std::set sal_uInt32 aPositions;
+aPositions.insert( 0 );
sal_uInt16 nAttr = 0;
EditCharAttrib* pAttrib = GetAttrib( pNode-GetCharAttribs().GetAttribs(),
nAttr );
@@ -2267,23 +2265,23 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
{
// Insert Start and End into the Array...
// The Insert method does not allow for duplicate values
-aPositions.Insert( pAttrib-GetStart() );
-aPositions.Insert( pAttrib-GetEnd() );
+aPositions.insert( pAttrib-GetStart() );
+aPositions.insert( pAttrib-GetEnd() );
nAttr++;
pAttrib = GetAttrib( pNode-GetCharAttribs().GetAttribs(), nAttr );
}
-aPositions.Insert( pNode-Len() );
+aPositions.insert( pNode-Len() );
if ( pParaPortion-aScriptInfos.empty() )
((ImpEditEngine*)this)-InitScriptTypes( GetParaPortions().GetPos(
pParaPortion ) );
const ScriptTypePosInfos rTypes = pParaPortion-aScriptInfos;
for ( size_t nT = 0; nT rTypes.size(); nT++ )
-aPositions.Insert( rTypes[nT].nStartPos );
+aPositions.insert( rTypes[nT].nStartPos );
const WritingDirectionInfos rWritingDirections =
pParaPortion-aWritingDirectionInfos;
for ( size_t nD = 0; nD rWritingDirections.size(); nD++ )
-aPositions.Insert( rWritingDirections[nD].nStartPos );
+aPositions.insert( rWritingDirections[nD].nStartPos );
if ( mpIMEInfos mpIMEInfos-nLen mpIMEInfos-pAttribs (
mpIMEInfos-aPos.GetNode() == pNode ) )
{
@@ -2292,11 +2290,11 @@ void ImpEditEngine::CreateTextPortions( ParaPortion*
pParaPortion, sal_uInt16 r
{
if ( mpIMEInfos-pAttribs[n] != nLastAttr )
{
-aPositions.Insert( mpIMEInfos-aPos.GetIndex() + n );
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/editdoc.cxx | 26 --
editeng/source/editeng/impedit.hxx |5 ++---
editeng/source/editeng/impedit4.cxx | 24
3 files changed, 14 insertions(+), 41 deletions(-)
New commits:
commit a0cd57b926830e8798a5019b30776e94dd97c8a1
Author: Noel Grandin n...@peralex.com
Date: Thu Mar 1 10:22:36 2012 +0200
Remove SvxFontTable and use std::vector instead
In removing tools/table.hxx usage, remove SvxFontTable and
convert to std::vectorSvxFontItem* because it was only
being used as a temporary list, not a map.
diff --git a/editeng/source/editeng/editdoc.cxx
b/editeng/source/editeng/editdoc.cxx
index 50f96a2..98268d9 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -2161,32 +2161,6 @@ bool CharAttribList::DbgCheckAttribs() const
}
#endif
-SvxFontTable::SvxFontTable()
-{
-}
-
-SvxFontTable::~SvxFontTable()
-{
-SvxFontItem* pItem = First();
-while( pItem )
-{
-delete pItem;
-pItem = Next();
-}
-}
-
-sal_uLong SvxFontTable::GetId( const SvxFontItem rFontItem )
-{
-SvxFontItem* pItem = First();
-while ( pItem )
-{
-if ( *pItem == rFontItem )
-return GetCurKey();
-pItem = Next();
-}
-DBG_WARNING( Font not found: GetId() );
-return 0;
-}
SvxColorList::SvxColorList()
{
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 1c008fb..d02a959 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -80,7 +80,6 @@ DBG_NAMEEX( EditEngine )
class EditView;
class EditEngine;
-class SvxFontTable;
class SvxColorList;
class SvxSearchItem;
@@ -640,9 +639,9 @@ private:
sal_uInt32 WriteBin( SvStream rOutput, EditSelection aSel,
sal_Bool bStoreUnicode = sal_False ) const;
voidWriteItemAsRTF( const SfxPoolItem rItem, SvStream
rOutput, sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList );
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList );
sal_BoolWriteItemListAsRTF( ItemList rLst, SvStream rOutput,
sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList );
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList );
sal_Int32 LogicToTwips( sal_Int32 n );
inline shortGetXValue( short nXValue ) const;
diff --git a/editeng/source/editeng/impedit4.cxx
b/editeng/source/editeng/impedit4.cxx
index f76b0ca..07d8074 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -277,7 +277,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream rOutput,
EditSelection aSel )
}
sal_Bool ImpEditEngine::WriteItemListAsRTF( ItemList rLst, SvStream rOutput,
sal_uInt16 nPara, sal_uInt16 nPos,
-SvxFontTable rFontTable, SvxColorList rColorList )
+std::vectorSvxFontItem* rFontTable, SvxColorList
rColorList )
{
const SfxPoolItem* pAttrItem = rLst.First();
while ( pAttrItem )
@@ -358,11 +358,11 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
// Generate and write out Font table ...
-SvxFontTable aFontTable;
+std::vectorSvxFontItem* aFontTable;
// default font must be up front, so DEF font in RTF
-aFontTable.Insert( 0, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO ) ) );
-aFontTable.Insert( 1, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CJK ) ) );
-aFontTable.Insert( 2, new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CTL ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CJK ) ) );
+aFontTable.push_back( new SvxFontItem( (const
SvxFontItem)aEditDoc.GetItemPool().GetDefaultItem( EE_CHAR_FONTINFO_CTL ) ) );
for ( sal_uInt16 nScriptType = 0; nScriptType 3; nScriptType++ )
{
sal_uInt16 nWhich = EE_CHAR_FONTINFO;
@@ -376,14 +376,14 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream rOutput,
EditSelection aSel )
while ( pFontItem )
{
bool bAlreadyExist = false;
-sal_uLong nTestMax = nScriptType ? aFontTable.Count() : 1;
+sal_uLong nTestMax = nScriptType ? aFontTable.size() : 1;
for ( sal_uLong nTest = 0; !bAlreadyExist ( nTest nTestMax );
nTest++ )
{
-bAlreadyExist = *aFontTable.Get( nTest ) == *pFontItem;
+
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/edtspell.cxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 1c85118414d91bc0b881f03ad7fac20454ec43a0
Author: Ivan Timofeev timofeev@gmail.com
Date: Sun Feb 5 22:02:12 2012 +0400
fix debug build
diff --git a/editeng/source/editeng/edtspell.cxx
b/editeng/source/editeng/edtspell.cxx
index eda0d61..a2340aa 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -505,7 +505,6 @@ bool WrongList::operator==(const WrongList rCompare) const
return true;
}
-#ifdef DBG_UTIL
sal_Bool WrongList::DbgIsBuggy() const
{
// Check if the ranges overlap.
@@ -524,7 +523,6 @@ sal_Bool WrongList::DbgIsBuggy() const
}
return bError;
}
-#endif
//
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/borderline.cxx | 16
1 file changed, 16 insertions(+)
New commits:
commit 971f826a96f0938bfcfd8dfe26edd50d8e031bb4
Author: Eike Rathke er...@redhat.com
Date: Thu Feb 2 19:11:37 2012 +0100
resolved fdo#42784 BorderLine with only InnerWidth set does not work
diff --git a/editeng/source/items/borderline.cxx
b/editeng/source/items/borderline.cxx
index 8d073c6..b617ff4 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -298,6 +298,22 @@ void SvxBorderLine::GuessLinesWidths( SvxBorderStyle
nStyle, sal_uInt16 nOut, sa
else
{
SetStyle( nStyle );
+if (nOut == 0 nIn 0)
+{
+// If only inner width is given swap inner and outer widths for
+// single line styles, otherwise GuessWidth() marks this as invalid
+// and returns a 0 width.
+switch (nStyle)
+{
+case SOLID:
+case DOTTED:
+case DASHED:
+::std::swap( nOut, nIn);
+break;
+default:
+; // nothing
+}
+}
m_nWidth = m_aWidthImpl.GuessWidth( nOut, nIn, nDist );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source sw/source
editeng/source/accessibility/AccessibleStaticTextBase.cxx |2 +-
sw/source/core/doc/ftnidx.cxx | 10 ++
2 files changed, 3 insertions(+), 9 deletions(-)
New commits:
commit 428c9d516d3408460f1b7f8ce2c753b9a829de87
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 1 19:36:28 2012 +0100
Some cppcheck cleaning
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 9e234d9..734dc1b 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -344,7 +344,7 @@ namespace accessibility
{
// Keep 'invalid' values at the TextSegment
if( aTextSegment.SegmentStart != -1
-aTextSegment.SegmentStart != -1 )
+aTextSegment.SegmentEnd != -1 )
{
// #112814# Correct TextSegment by paragraph offset
sal_Int32 nOffset(0);
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index 3ccd856..52f9873 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -192,10 +192,7 @@ void SwFtnIdxs::UpdateFtn( const SwNodeIndex rStt )
if( nSectNo )
{
-if( rFtn.IsEndNote() )
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
-else
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
+pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
}
}
}
@@ -281,10 +278,7 @@ void SwFtnIdxs::UpdateAllFtn()
if( nSectNo )
{
-if( rFtn.IsEndNote() )
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
-else
-pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
+pTxtFtn-SetNumber( nSectNo, rFtn.GetNumStr() );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source oox/source sd/source
editeng/source/editeng/editdbg.cxx |2 +-
oox/source/helper/propertymap.cxx| 30 +++---
sd/source/filter/eppt/pptx-epptooxml.cxx | 12 ++--
3 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit fcc8db1d2be9a25f79cbcc14043b495d240bb8bf
Author: Matúš Kukan matus.ku...@gmail.com
Date: Sat Jan 14 11:30:26 2012 +0100
fix for gcc 4.7: unable to find string literal operator
diff --git a/editeng/source/editeng/editdbg.cxx
b/editeng/source/editeng/editdbg.cxx
index 9389001..fc9c562 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -454,7 +454,7 @@ void EditDbg::ShowEditEngineData( EditEngine* pEE, sal_Bool
bInfoBox )
fprintf( fp,
\n\n
);
fprintf( fp, \n== EditEngine Views
== );
fprintf( fp,
\n
);
-fprintf( fp, \nControl: %SAL_PRIxUINT32, pEE-GetControlWord() );
+fprintf( fp, \nControl: % SAL_PRIxUINT32, pEE-GetControlWord() );
fprintf( fp, \nRefMapMode: %i,
pEE-pImpEditEngine-pRefDev-GetMapMode().GetMapUnit() );
fprintf( fp, \nPaperSize: %li x %li, pEE-GetPaperSize().Width(),
pEE-GetPaperSize().Height() );
fprintf( fp, \nMaxAutoPaperSize: %li x %li,
pEE-GetMaxAutoPaperSize().Width(), pEE-GetMaxAutoPaperSize().Height() );
diff --git a/oox/source/helper/propertymap.cxx
b/oox/source/helper/propertymap.cxx
index b4094eb..af0d374 100644
--- a/oox/source/helper/propertymap.cxx
+++ b/oox/source/helper/propertymap.cxx
@@ -355,9 +355,9 @@ static void lclDumpAnyValue( Any value)
} else if( value = aMatrix ) {
fprintf (stderr,Matrix\n%f %f %f\n%f %f %f\n%f %f %f\n,
aMatrix.Line1.Column1, aMatrix.Line1.Column2, aMatrix.Line1.Column3,
aMatrix.Line2.Column1, aMatrix.Line2.Column2, aMatrix.Line2.Column3,
aMatrix.Line3.Column1, aMatrix.Line3.Column2, aMatrix.Line3.Column3);
} else if( value = intValue )
-fprintf (stderr,%SAL_PRIdINT32(hex:
%SAL_PRIxUINT32)\n, intValue, intValue);
+fprintf (stderr,% SAL_PRIdINT32 (hex: %
SAL_PRIxUINT32 )\n, intValue, intValue);
else if( value = uintValue )
-fprintf (stderr,%SAL_PRIdINT32(hex:
%SAL_PRIxUINT32)\n, uintValue, uintValue);
+fprintf (stderr,% SAL_PRIdINT32 (hex: %
SAL_PRIxUINT32 )\n, uintValue, uintValue);
else if( value = int16Value )
fprintf (stderr,%d(hex: %x)\n, int16Value,
int16Value);
else if( value = uint16Value )
@@ -502,7 +502,7 @@ static const char* lclDumpAnyValueCode( Any value, int
level = 0)
return Any (str);
} else if( value = strArray ) {
printLevel (level);
-fprintf (stderr,Sequence OUString aStringSequence
(%SAL_PRIdINT32);\n, strArray.getLength());
+fprintf (stderr,Sequence OUString aStringSequence (%
SAL_PRIdINT32 );\n, strArray.getLength());
for( int i=0; istrArray.getLength(); i++ ) {
printLevel (level);
fprintf (stderr,aStringSequence[%d] = CREATE_OUSTRING
(\%s\);\n, i, USS( strArray[i] ) );
@@ -510,7 +510,7 @@ static const char* lclDumpAnyValueCode( Any value, int
level = 0)
return aStringSequence;
} else if( value = propArray ) {
printLevel (level);
-fprintf (stderr,Sequence PropertyValue aPropSequence
(%SAL_PRIdINT32);\n, propArray.getLength());
+fprintf (stderr,Sequence PropertyValue aPropSequence (%
SAL_PRIdINT32 );\n, propArray.getLength());
for( int i=0; ipropArray.getLength(); i++ ) {
printLevel (level);
fprintf (stderr, {\n);
@@ -525,7 +525,7 @@ static const char* lclDumpAnyValueCode( Any value, int
level = 0)
return aPropSequence;
} else if( value = propArrayArray ) {
printLevel (level);
-fprintf (stderr,Sequence Sequence PropertyValue
aPropSequenceSequence (%SAL_PRIdINT32);\n, propArrayArray.getLength());
+fprintf (stderr,Sequence Sequence PropertyValue
aPropSequenceSequence (% SAL_PRIdINT32 );\n, propArrayArray.getLength());
for( int i=0; ipropArrayArray.getLength(); i++ ) {
printLevel (level);
fprintf (stderr, {\n);
@@ -544,7 +544,7 @@ static const char* lclDumpAnyValueCode( Any value, int
level = 0)
}
} else if( value = adjArray ) {
printLevel (level);
-fprintf (stderr,Sequence EnhancedCustomShapeAdjustmentValue
aAdjSequence (%SAL_PRIdINT32);\n, adjArray.getLength());
+fprintf (stderr,Sequence EnhancedCustomShapeAdjustmentValue
aAdjSequence (% SAL_PRIdINT32 );\n, adjArray.getLength());
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx |1 -
1 file changed, 1 deletion(-)
New commits:
commit 0204bbffbc273782ca3148c7ba6768af4f5a77f9
Author: August Sodora aug...@gmail.com
Date: Wed Jan 11 20:49:52 2012 -0500
Remove an unused SvStringsDtor
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b7df997..169c403 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2155,7 +2155,6 @@ SvxAutocorrWordList*
SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
else
pAutocorr_List = new SvxAutocorrWordList( 16, 16 );
-SvStringsDtor aRemoveArr;
try
{
uno::Reference embed::XStorage xStg =
comphelper::OStorageHelper::GetStorageFromURL( sShareAutoCorrFile,
embed::ElementModes::READ );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/items/svxitems.src | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit b95be347d45c90febdeca85d22b65c03fba283bc
Author: Andras Timar ati...@suse.com
Date: Sat Jan 7 22:08:09 2012 +0100
make measurement units localizable
diff --git a/editeng/source/items/svxitems.src
b/editeng/source/items/svxitems.src
index 222fc2c..6049ad6 100644
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
@@ -598,27 +598,27 @@ String RID_OUTSET
};
String RID_SVXITEMS_METRIC_MM
{
-Text = mm ;
+Text [ en-US ] = mm ;
};
String RID_SVXITEMS_METRIC_CM
{
-Text = cm ;
+Text [ en-US ] = cm ;
};
String RID_SVXITEMS_METRIC_INCH
{
-Text = inch ;
+Text [ en-US ] = inch ;
};
String RID_SVXITEMS_METRIC_POINT
{
-Text = pt ;
+Text [ en-US ] = pt ;
};
String RID_SVXITEMS_METRIC_TWIP
{
-Text = twip ;
+Text [ en-US ] = twip ;
};
String RID_SVXITEMS_METRIC_PIXEL
{
-Text = pixel ;
+Text [ en-US ] = pixel ;
};
// GetValueText von BoolItems
String RID_SVXITEMS_SHADOWED_TRUE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c9f68b6d2356ef81560b5449670b81a1156a5da6
Author: August Sodora aug...@gmail.com
Date: Fri Dec 23 19:44:48 2011 -0500
Fix the build so that this is recognized as an initializer list
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index c2d937a..df191c0 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1644,7 +1644,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType
eLang, sal_Bool bNewFi
}
else if( !bNewFile )
{
-pLastFileTable[eLang] = { std::make_pair(eLang, nAktTime.GetTime()) };
+pLastFileTable[eLang] = { std::make_pair(eLang, nAktTime.GetTime()), };
}
return pLists != 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source
editeng/source/misc/svxacorr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 93d3f6258f8f061dc53b5e6003de65479c2290ba
Author: David Tardon dtar...@redhat.com
Date: Sat Dec 24 06:29:30 2011 +0100
make the line work as intended again
At least I suppose memory corruption is not intended behavior .-)
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index df191c0..f28df9d 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1644,7 +1644,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType
eLang, sal_Bool bNewFi
}
else if( !bNewFile )
{
-pLastFileTable[eLang] = { std::make_pair(eLang, nAktTime.GetTime()), };
+(*pLastFileTable)[eLang] = nAktTime.GetTime();
}
return pLists != 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source oox/inc oox/source svtools/inc svtools/source writerfilter/source
editeng/source/rtf/rtfgrf.cxx |9 ---
oox/inc/oox/helper/graphichelper.hxx |8 ++-
oox/source/helper/graphichelper.cxx| 65 -
svtools/inc/svtools/filter.hxx |6 +-
svtools/inc/svtools/wmf.hxx| 48 ++
svtools/source/filter/filter.cxx |8 +--
svtools/source/filter/wmf/winmtf.hxx | 14 +++--
svtools/source/filter/wmf/winwmf.cxx | 62 ---
svtools/source/filter/wmf/wmf.cxx |4 -
svtools/source/graphic/provider.cxx| 42 +++-
writerfilter/source/rtftok/rtfcontrolwords.cxx |2
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 19 ++-
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1
13 files changed, 187 insertions(+), 101 deletions(-)
New commits:
commit f4f4a899f0d5520a497bbd07ccfef9086c54ca1c
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Thu Nov 24 15:05:25 2011 +0100
RTF import: partly fixed the WMF images scaling.
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 4ff9f35..2906caa 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -495,15 +495,8 @@ sal_Bool SvxRTFParser::ReadBmpData( Graphic rGrf,
SvxRTFPictureType rPicType )
}
String sTmpStr;
-WMF_APMFILEHEADER aAPMHeader;
-aAPMHeader.left=0;
-aAPMHeader.top=0;
-aAPMHeader.right=rPicType.nWidth;
-aAPMHeader.bottom=rPicType.nHeight;
-
-WMF_APMFILEHEADER *pAPMHeader=(aAPMHeader.right0
aAPMHeader.bottom0?aAPMHeader:NULL);
pTmpFile-Seek( STREAM_SEEK_TO_BEGIN );
-bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile,
nImportFilter, NULL, 0, pAPMHeader );
+bValidBmp = 0 == rGF.ImportGraphic( rGrf, sTmpStr, *pTmpFile,
nImportFilter );
}
}
diff --git a/oox/inc/oox/helper/graphichelper.hxx
b/oox/inc/oox/helper/graphichelper.hxx
index f144cd1..d3507fa 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -37,6 +37,8 @@
#include oox/helper/binarystreambase.hxx
#include oox/helper/storagebase.hxx
+struct WMF_EXTERNALHEADER;
+
namespace com { namespace sun { namespace star {
namespace awt { struct Point; }
namespace awt { struct Size; }
@@ -115,7 +117,8 @@ public:
/** Imports a graphic from the passed input stream. */
::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic
importGraphic(
-const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm ) const;
+const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm,
+const WMF_EXTERNALHEADER* pExtHeader = NULL )
const;
/** Imports a graphic from the passed binary memory block. */
::com::sun::star::uno::Reference ::com::sun::star::graphic::XGraphic
@@ -133,7 +136,8 @@ public:
/** Creates a persistent graphic object from the passed input stream.
@return The URL of the created and internally cached graphic object.
*/
::rtl::OUString importGraphicObject(
-const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm ) const;
+const ::com::sun::star::uno::Reference
::com::sun::star::io::XInputStream rxInStrm,
+const WMF_EXTERNALHEADER* pExtHeader = NULL )
const;
/** Creates a persistent graphic object from the passed binary memory
block.
@return The URL of the created and internally cached graphic object.
*/
diff --git a/oox/source/helper/graphichelper.cxx
b/oox/source/helper/graphichelper.cxx
index 941cc80..fd3046e 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -39,6 +39,7 @@
#include com/sun/star/graphic/XGraphicProvider.hpp
#include com/sun/star/util/MeasureUnit.hpp
#include comphelper/seqstream.hxx
+#include svtools/wmf.hxx
#include oox/helper/containerhelper.hxx
#include oox/helper/propertyset.hxx
#include oox/token/tokens.hxx
@@ -47,7 +48,8 @@ namespace oox {
//
-using namespace ::com::sun::star::awt;
+
+using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::graphic;
@@ -130,7 +132,7 @@ GraphicHelper::GraphicHelper( const Reference
XComponentContext rxContext, c
maDeviceInfo.PixelPerMeterX = maDeviceInfo.PixelPerMeterY = 3500.0; //
some default just in case
if( xFrame.is() ) try
{
-Reference XDevice xDevice( xFrame-getContainerWindow(),
UNO_QUERY_THROW );
+
[Libreoffice-commits] .: editeng/source sw/source
editeng/source/uno/unotext.cxx| 34 --
sw/source/filter/xml/xmltexti.cxx |2 +-
2 files changed, 21 insertions(+), 15 deletions(-)
New commits:
commit aa0b7b033098bfc1bf3f06cd112691abc862bd20
Author: Michael Meeks michael.me...@suse.com
Date: Sat Nov 12 11:15:19 2011 +
avoid crasher from unusual odt document fdo#42785
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index ac241d2..5933da3 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -183,6 +183,13 @@ void CheckSelection( struct ESelection rSel,
SvxTextForwarder* pForwarder ) thr
}
}
+void CheckSelection( struct ESelection rSel, SvxEditSource *pEdit ) throw()
+{
+if (!pEdit)
+return;
+CheckSelection( rSel, pEdit-GetTextForwarder() );
+}
+
//
// class SvxUnoTextRangeBase
//
@@ -275,8 +282,7 @@ void SvxUnoTextRangeBase::SetSelection( const ESelection
rSelection ) throw()
SolarMutexGuard aGuard;
maSelection = rSelection;
-if (mpEditSource != NULL)
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
}
// Interface XTextRange ( XText )
@@ -291,7 +297,6 @@ uno::Reference text::XTextRange SAL_CALL
SvxUnoTextRangeBase::getStart(void)
SvxTextForwarder* pForwarder = mpEditSource ?
mpEditSource-GetTextForwarder() : NULL;
if( pForwarder )
{
-
CheckSelection( maSelection, pForwarder );
SvxUnoTextBase* pText = SvxUnoTextBase::getImplementation( getText() );
@@ -406,7 +411,6 @@ void SAL_CALL SvxUnoTextRangeBase::_setPropertyValue( const
OUString PropertyNa
SvxTextForwarder* pForwarder = mpEditSource ?
mpEditSource-GetTextForwarder() : NULL;
if( pForwarder )
{
-
CheckSelection( maSelection, pForwarder );
const SfxItemPropertySimpleEntry* pMap =
mpPropSet-getPropertyMapEntry(PropertyName );
@@ -1308,7 +1312,7 @@ uno::Sequence uno::Any SAL_CALL
SvxUnoTextRangeBase::getPropertyDefaults( con
// internal
void SvxUnoTextRangeBase::CollapseToStart(void) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
maSelection.nEndPara = maSelection.nStartPara;
maSelection.nEndPos = maSelection.nStartPos;
@@ -1316,7 +1320,7 @@ void SvxUnoTextRangeBase::CollapseToStart(void) throw()
void SvxUnoTextRangeBase::CollapseToEnd(void) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
maSelection.nStartPara = maSelection.nEndPara;
maSelection.nStartPos = maSelection.nEndPos;
@@ -1324,7 +1328,7 @@ void SvxUnoTextRangeBase::CollapseToEnd(void) throw()
sal_Bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
return ( maSelection.nStartPara == maSelection.nEndPara
maSelection.nStartPos == maSelection.nEndPos );
@@ -1332,7 +1336,7 @@ sal_Bool SvxUnoTextRangeBase::IsCollapsed(void) throw()
sal_Bool SvxUnoTextRangeBase::GoLeft(sal_Int16 nCount, sal_Bool Expand) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
// #75098# use end position, as in Writer (start is anchor, end is cursor)
sal_uInt16 nNewPos = maSelection.nEndPos;
@@ -1375,7 +1379,6 @@ sal_Bool SvxUnoTextRangeBase::GoRight(sal_Int16 nCount,
sal_Bool Expand) throw(
{
CheckSelection( maSelection, pForwarder );
-
sal_uInt16 nNewPos = maSelection.nEndPos + nCount; //! Overflow???
sal_uInt16 nNewPar = maSelection.nEndPara;
@@ -1419,7 +1422,7 @@ void SvxUnoTextRangeBase::GotoStart(sal_Bool Expand)
throw()
void SvxUnoTextRangeBase::GotoEnd(sal_Bool Expand) throw()
{
-CheckSelection( maSelection, mpEditSource-GetTextForwarder() );
+CheckSelection( maSelection, mpEditSource );
SvxTextForwarder* pForwarder = mpEditSource ?
mpEditSource-GetTextForwarder() : NULL;
if( pForwarder )
@@ -1670,8 +1673,11 @@ void SAL_CALL SvxUnoTextBase::insertString( const
uno::Reference text::XTextRan
return;
ESelection aSelection;
-::GetSelection( aSelection, GetEditSource()-GetTextForwarder() );
-SetSelection( aSelection );
+if (GetEditSource())
+{
+::GetSelection( aSelection, GetEditSource()-GetTextForwarder() );
+SetSelection( aSelection );
+}
SvxUnoTextRangeBase* pRange = SvxUnoTextRange::getImplementation( xRange );
if(pRange)
@@ -1771,10 +1777,10 @@ void SAL_CALL SvxUnoTextBase::insertControlCharacter(
const uno::Reference text
return;
}
[Libreoffice-commits] .: editeng/source
editeng/source/editeng/impedit3.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 3f9df85defed04730fda2c862810b505579fb958 Author: Christina Rossmanith chrrossman...@web.de Date: Wed Nov 9 16:59:47 2011 + _SVSTDARR_sal_uIt16S is a typo and doesn't do anything diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 83695cf..bdf1bbd 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -36,9 +36,6 @@ #include vcl/metaact.hxx #include vcl/gdimtf.hxx -#define _SVSTDARR_sal_uIt16S -#include svl/svstdarr.hxx - #include vcl/wrkwin.hxx #include editeng/adjitem.hxx #include editeng/tstpitem.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: editeng/source formula/source sc/source sd/source svtools/source sw/source vcl/aqua vcl/inc vcl/unx vcl/win
editeng/source/editeng/editeng.cxx |2 +-
editeng/source/editeng/impedit3.cxx |2 +-
formula/source/ui/dlg/formula.cxx|4 ++--
sc/source/core/tool/chartlis.cxx |2 +-
sc/source/ui/app/scmod.cxx |2 +-
sd/source/ui/tools/IdleDetection.cxx |2 +-
svtools/source/control/inettbc.cxx |2 +-
svtools/source/edit/textview.cxx |2 +-
sw/source/core/layout/paintfrm.cxx |2 +-
sw/source/core/view/viewsh.cxx |2 +-
sw/source/ui/docvw/edtwin.cxx|2 +-
vcl/aqua/source/app/salinst.cxx |4 ++--
vcl/inc/vcl/apptypes.hxx |6 +++---
vcl/unx/generic/app/salinst.cxx |4 ++--
vcl/win/source/app/salinst.cxx |2 +-
15 files changed, 20 insertions(+), 20 deletions(-)
New commits:
commit b0224f8050373cbdde58c3dee1bbda71976b50b6
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Fri Oct 21 16:54:35 2011 -0200
Fix for bug fdo#41997, cleanup vcl enumeration
diff --git a/editeng/source/editeng/editeng.cxx
b/editeng/source/editeng/editeng.cxx
index 5d745c0..573b30b 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1195,7 +1195,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent
rKeyEvent, EditView* pEditVie
DBG_ASSERT( !bReadOnly, ReadOnly but modified??? );
// Idle-Formatter only when AnyInput.
if ( bAllowIdle pImpEditEngine-GetStatus().UseIdleFormatter()
- Application::AnyInput( INPUT_KEYBOARD) )
+ Application::AnyInput( VCL_INPUT_KEYBOARD) )
pImpEditEngine-IdleFormatAndUpdate( pEditView );
else
pImpEditEngine-FormatAndUpdate( pEditView );
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index b4efe14..8f059a3 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -327,7 +327,7 @@ void ImpEditEngine::UpdateViews( EditView* pCurView )
IMPL_LINK( ImpEditEngine, OnlineSpellHdl, Timer *, EMPTYARG )
{
-if ( !Application::AnyInput( INPUT_KEYBOARD ) GetUpdateMode()
IsFormatted() )
+if ( !Application::AnyInput( VCL_INPUT_KEYBOARD ) GetUpdateMode()
IsFormatted() )
DoOnlineSpelling();
else
aOnlineSpellTimer.Start();
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 97ef663..3b7c2ec 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -592,7 +592,7 @@ sal_Bool FormulaDlg_Impl::CalcValue( const String rStrExp,
String rStrResult )
{
// Only calculate the value when there isn't any more keyboard input:
-if ( !Application::AnyInput( INPUT_KEYBOARD ) )
+if ( !Application::AnyInput( VCL_INPUT_KEYBOARD ) )
{
bResult = m_pHelper-calculateValue(rStrExp,rStrResult);
}
@@ -630,7 +630,7 @@ sal_Bool FormulaDlg_Impl::CalcStruct( const String rStrExp)
{
// Only calculate the value when there isn't any more keyboard input:
-if ( !Application::AnyInput( INPUT_KEYBOARD ) )
+if ( !Application::AnyInput( VCL_INPUT_KEYBOARD ) )
{
pStructPage-ClearStruct();
diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx
index 8c52fe4..6f9129d 100644
--- a/sc/source/core/tool/chartlis.cxx
+++ b/sc/source/core/tool/chartlis.cxx
@@ -567,7 +567,7 @@ void ScChartListenerCollection::StartTimer()
IMPL_LINK( ScChartListenerCollection, TimerHdl, Timer*, EMPTYARG )
{
-if ( Application::AnyInput( INPUT_KEYBOARD ) )
+if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) )
{
aTimer.Start();
return 0;
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 7932fca..b4284e7 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1877,7 +1877,7 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG )
IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG )
{
-if ( Application::AnyInput( INPUT_KEYBOARD ) )
+if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) )
{
aSpellTimer.Start();
return 0; // dann spaeter wieder...
diff --git a/sd/source/ui/tools/IdleDetection.cxx
b/sd/source/ui/tools/IdleDetection.cxx
index 4ba6163..e0fba1a 100644
--- a/sd/source/ui/tools/IdleDetection.cxx
+++ b/sd/source/ui/tools/IdleDetection.cxx
@@ -59,7 +59,7 @@ sal_Int32 IdleDetection::GetIdleState (const ::Window*
pWindow)
sal_Int32 IdleDetection::CheckInputPending (void)
{
-if (GetpApp()-AnyInput(INPUT_MOUSE | INPUT_KEYBOARD | INPUT_PAINT))
+if (GetpApp()-AnyInput(VCL_INPUT_MOUSE | VCL_INPUT_KEYBOARD |
INPUT_PAINT))
return IDET_SYSTEM_EVENT_PENDING;
else
return IDET_IDLE;
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 50739d8..097a8ad 100644
--- a/svtools/source/control/inettbc.cxx
+++
[Libreoffice-commits] .: editeng/source
editeng/source/uno/unotext.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 0a56437e9ce6a228643e2831fe4877e8597cfa6b
Author: Tor Lillqvist t...@iki.fi
Date: Wed Sep 28 23:23:33 2011 +0300
WaE: base class should be explicitly initialized in the copy constructor
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 627f94b..ac241d2 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -214,6 +214,7 @@ SvxUnoTextRangeBase::SvxUnoTextRangeBase( const
SvxEditSource* pSource, const Sv
SvxUnoTextRangeBase::SvxUnoTextRangeBase( const SvxUnoTextRangeBase rRange )
throw()
: SvxUnoTextRangeBase_Base()
+, osl::DebugBaseSvxUnoTextRangeBase()
, mpPropSet(rRange.getPropertySet())
{
SolarMutexGuard aGuard;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
