cui/source/tabpages/swpossizetabpage.cxx | 4
+++-
cui/source/tabpages/textattr.cxx | 4
+++-
cui/source/tabpages/transfrm.cxx | 6
+++++-
instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary
instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp |binary
setup_native/source/win32/nsis/ooobitmap.bmp |binary
setup_native/source/win32/nsis/ooosdkbanner.bmp |binary
setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary
9 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit cf9b9953dd2e3a8a141dc1a6608a23c71029bdb7
Author: Jürgen Schmidt <j...@apache.org>
Date: Thu Jul 11 10:03:55 2013 +0000
merge change from aoo400 branch, problem with bmp's
diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp
b/setup_native/source/win32/nsis/ooobitmap.bmp
old mode 100755
new mode 100644
index b4a9ba7..da145cb
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and
b/setup_native/source/win32/nsis/ooobitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
old mode 100755
new mode 100644
index b2b462b..51f8892
Binary files a/setup_native/source/win32/nsis/ooosdkbitmap.bmp and
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp differ
commit cac2b0f26530cd1572f72ef6056d101830c63825
Author: Jürgen Schmidt <j...@apache.org>
Date: Thu Jul 11 10:02:30 2013 +0000
merge change from aoo400 branch, problem with bmp's
diff --git
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp
old mode 100755
new mode 100644
index 97097ec..da145cb
Binary files
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Binary/Image.bmp differ
diff --git
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
old mode 100755
new mode 100644
index b4a9ba7..da145cb
Binary files
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
old mode 100755
new mode 100644
index b2b462b..51f8892
Binary files
a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp and
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbanner.bmp
b/setup_native/source/win32/nsis/ooosdkbanner.bmp
old mode 100755
new mode 100644
index 24b76f5..f697d5d
Binary files a/setup_native/source/win32/nsis/ooosdkbanner.bmp and
b/setup_native/source/win32/nsis/ooosdkbanner.bmp differ
commit 005cd2d436221519f74e54fb2373c7cbece6aed0
Author: Armin Le Grand <a...@apache.org>
Date: Thu Jul 11 09:19:43 2013 +0000
i121917 secure SdrTextObj casts in cui
diff --git a/cui/source/tabpages/swpossizetabpage.cxx
b/cui/source/tabpages/swpossizetabpage.cxx
index 328f88c..8573ddc 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1932,7 +1932,9 @@ void SvxSwPosSizeTabPage::SetView( const SdrView*
pSdrView )
SdrObjKind eKind = (SdrObjKind) pObj->GetObjIdentifier();
if( ( pObj->GetObjInventor() == SdrInventor ) &&
( eKind==OBJ_TEXT || eKind==OBJ_TITLETEXT ||
eKind==OBJ_OUTLINETEXT) &&
- ( (SdrTextObj*) pObj )->HasText() )
+ // #121917# The original ((SdrTextObj*)pObj)->HasText() will fail
badly with SdrVirtObjs from Writer
+ 0 != dynamic_cast< const SdrTextObj* >(pObj) &&
+ static_cast< const SdrTextObj* >(pObj)->HasText() )
{
DBG_ERROR("AutoWidth/AutoHeight should be enabled");
}
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 606585d..3135c2e 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -547,7 +547,9 @@ void SvxTextAttrPage::Construct()
case OBJ_OUTLINETEXT :
case OBJ_CAPTION :
{
- if ( ((SdrTextObj*)pObj)->HasText() )
+ if( // #121917# The original
((SdrTextObj*)pObj)->HasText() will fail badly with SdrVirtObjs from Writer
+ 0 != dynamic_cast< const SdrTextObj* >(pObj) &&
+ static_cast< const SdrTextObj* >(pObj)->HasText() )
{
// Konturfluss ist NICHT bei reinen Textobjekten
m�glich
bContourEnabled = sal_False;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 3639ecd..fa67e05 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -840,7 +840,11 @@ void SvxPositionSizeTabPage::Construct()
const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
const SdrObjKind eKind((SdrObjKind)pObj->GetObjIdentifier());
- if((pObj->GetObjInventor() == SdrInventor) && (OBJ_TEXT == eKind ||
OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT == eKind) &&
((SdrTextObj*)pObj)->HasText())
+ if((pObj->GetObjInventor() == SdrInventor) &&
+ (OBJ_TEXT == eKind || OBJ_TITLETEXT == eKind || OBJ_OUTLINETEXT ==
eKind) &&
+ // #121917# The original ((SdrTextObj*)pObj)->HasText() will fail
badly with SdrVirtObjs from Writer
+ 0 != dynamic_cast< const SdrTextObj* >(pObj) &&
+ static_cast< const SdrTextObj* >(pObj)->HasText())
{
mbAdjustDisabled = false;
maFlAdjust.Enable();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
