[Libreoffice-commits] core.git: 3 commits - svx/source
Caolán McNamara
caolanm at redhat.com
Mon Nov 21 13:12:41 UTC 2016
svx/source/sdr/properties/textproperties.cxx | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
New commits:
commit 796ace6f14a1d2676b11609b624fea43675486fe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 21 13:03:12 2016 +0000
use same post-decrement symbol throughout
rather than have half and half
Change-Id: I388b2abdcaceec1bf770d581dd5a8174158871ac
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index d2ba014..e87d525 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -82,13 +82,13 @@ namespace sdr
void TextProperties::ItemSetChanged(const SfxItemSet& rSet)
{
SdrTextObj& rObj = static_cast<SdrTextObj&>(GetSdrObject());
- const svx::ITextProvider& rTextProvider(getTextProvider());
- sal_Int32 nText = rTextProvider.getTextCount();
// #i101556# ItemSet has changed -> new version
maVersion++;
- while( --nText >= 0 )
+ const svx::ITextProvider& rTextProvider(getTextProvider());
+ sal_Int32 nText = rTextProvider.getTextCount();
+ while (nText--)
{
SdrText* pText = rTextProvider.getText( nText );
@@ -173,7 +173,7 @@ namespace sdr
const svx::ITextProvider& rTextProvider(getTextProvider());
sal_Int32 nCount = rTextProvider.getTextCount();
- while( nCount-- )
+ while (nCount--)
{
SdrText* pText = rTextProvider.getText( nCount );
OutlinerParaObject* pParaObj = pText->GetOutlinerParaObject();
@@ -246,8 +246,7 @@ namespace sdr
const svx::ITextProvider& rTextProvider(getTextProvider());
sal_Int32 nText = rTextProvider.getTextCount();
-
- while( --nText >= 0 )
+ while (nText--)
{
SdrText* pText = rTextProvider.getText( nText );
@@ -408,8 +407,7 @@ namespace sdr
Outliner* pOutliner = SdrMakeOutliner(OutlinerMode::OutlineObject, *rObj.GetModel());
const svx::ITextProvider& rTextProvider(getTextProvider());
sal_Int32 nText = rTextProvider.getTextCount();
-
- while( --nText >= 0 )
+ while (nText--)
{
SdrText* pText = rTextProvider.getText( nText );
@@ -563,7 +561,7 @@ namespace sdr
rObj.SetPortionInfoChecked(false);
sal_Int32 nText = rTextProvider.getTextCount();
- while( --nText >= 0 )
+ while (nText--)
{
OutlinerParaObject* pParaObj = rTextProvider.getText( nText )->GetOutlinerParaObject();
if( pParaObj )
@@ -586,7 +584,7 @@ namespace sdr
{
rObj.SetPortionInfoChecked(false);
sal_Int32 nText = rTextProvider.getTextCount();
- while( --nText >= 0 )
+ while (nText--)
{
OutlinerParaObject* pParaObj = rTextProvider.getText( nText )->GetOutlinerParaObject();
if( pParaObj )
@@ -608,7 +606,7 @@ namespace sdr
if(aOldName != aNewName)
{
sal_Int32 nText = rTextProvider.getTextCount();
- while( --nText >= 0 )
+ while (nText--)
{
OutlinerParaObject* pParaObj = rTextProvider.getText( nText )->GetOutlinerParaObject();
if( pParaObj )
commit 8e89a8af9246da45d78f8d03468cd8eba2369076
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 21 13:00:38 2016 +0000
these are surely wrong as well
Change-Id: Ib223781621985c3bcf8144a6e0b9d2df8c083f42
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index fa8762a..d2ba014 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -563,7 +563,7 @@ namespace sdr
rObj.SetPortionInfoChecked(false);
sal_Int32 nText = rTextProvider.getTextCount();
- while( --nText > 0 )
+ while( --nText >= 0 )
{
OutlinerParaObject* pParaObj = rTextProvider.getText( nText )->GetOutlinerParaObject();
if( pParaObj )
@@ -586,7 +586,7 @@ namespace sdr
{
rObj.SetPortionInfoChecked(false);
sal_Int32 nText = rTextProvider.getTextCount();
- while( --nText > 0 )
+ while( --nText >= 0 )
{
OutlinerParaObject* pParaObj = rTextProvider.getText( nText )->GetOutlinerParaObject();
if( pParaObj )
commit 69c4340fcea77ac5b74cbde13f44b4f7034398aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 21 12:42:09 2016 +0000
drawing shapes aren't tracking style name changes correctly
in draw, create a box, enter some text, exit and select box
F11 for style navigator, new style, set font to e.g. 88
apply this style to the box. All ok.
If you modify the style and changes its font to e.g. bold
the text in the box tracks it as expected. All ok.
If you modify the style and change its name, the box resets
to something different and there's loads of warnings about
unknown styles. Not ok.
The style modification fires, but the style name gets overwritten
by the style stuck in a OutlinerParaObject that gets overlaid
over the editengine.
All the rTextProvider.getTextCount uses that don't iterate over all entries
look dubious to me, but I'll initially fix this one that I have hard evidence
for as broken.
All this is probably broken since...
commit 838c0fa8228f4ca656a264f6a5610c337ebf4fef
Author: Rüdiger Timm <rt at openoffice.org>
Date: Wed Mar 12 08:47:30 2008 +0000
INTEGRATION: CWS impresstables2 (1.14.72); FILE MERGED
Change-Id: Ib0dd2857ed26c49dcfa00aae923e36429a7f7862
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx
index a511436..fa8762a 100644
--- a/svx/source/sdr/properties/textproperties.cxx
+++ b/svx/source/sdr/properties/textproperties.cxx
@@ -608,7 +608,7 @@ namespace sdr
if(aOldName != aNewName)
{
sal_Int32 nText = rTextProvider.getTextCount();
- while( --nText > 0 )
+ while( --nText >= 0 )
{
OutlinerParaObject* pParaObj = rTextProvider.getText( nText )->GetOutlinerParaObject();
if( pParaObj )
More information about the Libreoffice-commits
mailing list