rpms/openoffice.org/devel openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch, NONE, 1.1 openoffice.org-2.1.0.ooo72350.svx.showsizes.patch, NONE, 1.1 openoffice.org.spec, 1.971, 1.972
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Dec 7 10:14:44 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6459
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch
openoffice.org-2.1.0.ooo72350.svx.showsizes.patch
Log Message:
Resolves: rhbz#216094
openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch:
impedit2.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch ---
Index: source/editeng/impedit2.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/editeng/impedit2.cxx,v
retrieving revision 1.114
diff -u -r1.114 impedit2.cxx
--- source/editeng/impedit2.cxx 12 Oct 2006 12:39:14 -0000 1.114
+++ source/editeng/impedit2.cxx 6 Dec 2006 13:46:00 -0000
@@ -1764,9 +1767,10 @@
USHORT nS = ( nPara == nStartPara ) ? aSel.Min().GetIndex() : 0;
USHORT nE = ( nPara == nEndPara ) ? aSel.Max().GetIndex() : pParaPortion->GetNode()->Len();
+
for ( USHORT n = 0; n < rTypes.Count(); n++ )
{
- if ( ( rTypes[n].nStartPos <= nE ) && ( rTypes[n].nEndPos >= nS ) )
+ if ( ( rTypes[n].nStartPos < nE ) && ( rTypes[n].nEndPos > nS ) )
{
if ( rTypes[n].nScriptType != i18n::ScriptType::WEAK )
{
openoffice.org-2.1.0.ooo72350.svx.showsizes.patch:
inc/ctrlbox.hxx | 0
source/control/ctrlbox.cxx | 0
source/tbxctrls/tbcontrl.cxx | 0
svtools/inc/ctrlbox.hxx | 2 +-
svtools/source/control/ctrlbox.cxx | 14 ++++++++++----
svx/source/tbxctrls/tbcontrl.cxx | 20 +++++++++++---------
6 files changed, 22 insertions(+), 14 deletions(-)
--- NEW FILE openoffice.org-2.1.0.ooo72350.svx.showsizes.patch ---
Index: source/tbxctrls/tbcontrl.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/tbxctrls/tbcontrl.cxx,v
retrieving revision 1.73.20.1
diff -u -r1.73.20.1 tbcontrl.cxx
--- openoffice.org.orig/svx/source/tbxctrls/tbcontrl.cxx 31 Oct 2006 10:42:41 -0000 1.73.20.1
+++ openoffice.org/svx/source/tbxctrls/tbcontrl.cxx 7 Dec 2006 09:48:24 -0000
@@ -168,6 +168,7 @@
#include "dialmgr.hxx"
#include "colorwindow.hxx"
+
// ------------------------------------------------------------------------
#define IMAGE_COL_TRANSPARENT COL_LIGHTMAGENTA
@@ -323,7 +324,7 @@
SvxFontHeightToolBoxControl& rCtrl );
void statusChanged_Impl( long nHeight, SfxItemState eState );
- void Update( const SvxFontItem& rFontItem );
+ void Update( const SvxFontItem *pFontItem );
virtual long Notify( NotifyEvent& rNEvt );
};
@@ -1015,7 +1016,7 @@
// -----------------------------------------------------------------------
-void SvxFontSizeBox_Impl::Update( const SvxFontItem& rFontItem )
+void SvxFontSizeBox_Impl::Update( const SvxFontItem *pFontItem )
{
// Fontliste vom Document abholen
const SfxObjectShell* pDocSh = SfxObjectShell::Current();
@@ -1024,13 +1025,16 @@
// Sizes-Liste auff"ullen
long nOldVal = GetValue(); // alten Wert merken
- FontInfo _aFontInfo;
const FontList* _pFontList = pFontListItem ? pFontListItem->GetFontList() : NULL;
- if ( _pFontList )
+ if ( _pFontList && pFontItem)
{
- _aFontInfo = FontInfo( _pFontList->Get( rFontItem.GetFamilyName(), rFontItem.GetStyleName() ) );
- Fill( _aFontInfo, _pFontList );
+ FontInfo _aFontInfo( _pFontList->Get( pFontItem->GetFamilyName(), pFontItem->GetStyleName() ) );
+ Fill( &_aFontInfo, _pFontList );
}
+ else
+ {
+ Fill( NULL, _pFontList );
+ }
SetValue( nOldVal ); // alten Wert wiederherstellen
aCurText = GetText(); // zum R"ucksetzen bei ESC merken
}
@@ -2820,9 +2824,7 @@
// FontItem (Name) nur zur sp"aterne Verwendung merken
delete pFontItem;
pFontItem = (eState == SFX_ITEM_AVAILABLE) ? (SvxFontItem*)pState->Clone() : NULL;
-
- if ( pFontItem )
- pBox->Update( *pFontItem );
+ pBox->Update( pFontItem );
}
}
Index: source/control/ctrlbox.cxx
===================================================================
RCS file: /cvs/util/svtools/source/control/ctrlbox.cxx,v
retrieving revision 1.21
diff -u -r1.21 ctrlbox.cxx
--- openoffice.org.orig/svtools/source/control/ctrlbox.cxx 12 Oct 2006 15:11:29 -0000 1.21
+++ openoffice.org/svtools/source/control/ctrlbox.cxx 7 Dec 2006 09:54:53 -0000
@@ -1233,10 +1236,9 @@
// -----------------------------------------------------------------------
-void FontSizeBox::Fill( const FontInfo& rInfo, const FontList* pList )
+void FontSizeBox::Fill( const FontInfo* pInfo, const FontList* pList )
{
// remember for relative mode
- aFontInfo = rInfo;
pFontList = pList;
// no font sizes need to be set for relative mode
@@ -1245,7 +1247,14 @@
// query font sizes
const long* pTempAry;
- const long* pAry = pList->GetSizeAry( rInfo );
+ const long* pAry = 0;
+ if (pInfo)
+ {
+ aFontInfo = *pInfo;
+ pAry = pList->GetSizeAry( *pInfo );
+ }
+ else
+ pAry = pList->GetStdSizeAry();
if ( pAry == pList->GetStdSizeAry() )
{
@@ -1391,7 +1400,7 @@
SetMax( 9999 );
SetUnit( FUNIT_POINT );
if ( pFontList )
- Fill( aFontInfo, pFontList );
+ Fill( &aFontInfo, pFontList );
}
SetText( aStr );
Index: inc/ctrlbox.hxx
===================================================================
RCS file: /cvs/util/svtools/inc/ctrlbox.hxx,v
retrieving revision 1.12
diff -u -r1.12 ctrlbox.hxx
--- openoffice.org.orig/svtools/inc/ctrlbox.hxx 19 Jun 2006 20:14:01 -0000 1.12
+++ openoffice.org/svtools/inc/ctrlbox.hxx 7 Dec 2006 09:55:51 -0000
@@ -484,7 +484,7 @@
void Reformat();
void Modify();
- void Fill( const FontInfo& rInfo, const FontList* pList );
+ void Fill( const FontInfo *pInfo, const FontList* pList );
void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150,
USHORT nStep = 5 );
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.971
retrieving revision 1.972
diff -u -r1.971 -r1.972
--- openoffice.org.spec 5 Dec 2006 10:31:51 -0000 1.971
+++ openoffice.org.spec 7 Dec 2006 10:14:41 -0000 1.972
@@ -1,6 +1,6 @@
%define oootag OOE680
%define ooomilestone 6
-%define rh_rpm_release 3
+%define rh_rpm_release 4
# gcc#19664#
%define stlvisibilityfcked 1
@@ -2626,6 +2626,10 @@
%{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
%changelog
+* Tue Dec 07 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.4
+- Resolves: rhbz#216094 openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch
+- Resolves: rhbz#216094 openoffice.org-2.1.0.ooo72350.svx.showsizes.patch
+
* Tue Dec 05 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.3
- Resolves: rhbz#218412 crash on cancel from search view of file chooser
More information about the fedora-cvs-commits
mailing list