[Libreoffice-commits] core.git: Branch 'feature/vlc' - avmedia/source
avmedia/source/vlc/vlcframegrabber.cxx | 92 +
avmedia/source/vlc/vlcplayer.cxx |8 +-
avmedia/source/vlc/vlcplayer.hxx |1
3 files changed, 8 insertions(+), 93 deletions(-)
New commits:
commit 0cb786310fa20a7eaf25dde9f73da81440eacf2a
Author: Minh Ngo
Date: Mon Jul 29 08:11:31 2013 +0300
Removing bad code. Fixing VLC starting arguments.
Change-Id: I095638260d08d5d2fd67c93a42dbdbfe19581b75
diff --git a/avmedia/source/vlc/vlcframegrabber.cxx
b/avmedia/source/vlc/vlcframegrabber.cxx
index ec5b959..a189190 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -5,6 +5,7 @@
#include "vlcframegrabber.hxx"
#include "vlcplayer.hxx"
#include
+#include
using namespace ::com::sun::star;
@@ -22,100 +23,15 @@ SAL_CALL VLCFrameGrabber::VLCFrameGrabber(
boost::shared_ptr buffer;
-
-libvlc_media_player_t *mpPlayer;
-
-FrameData( libvlc_media_player_t *pPlayer )
-: mpPlayer( pPlayer )
-{
-}
-
-void updateSize()
-{
-unsigned int w, h;
-libvlc_video_get_size( mpPlayer, 0, &w, &h );
-
-buffer.resize(w * h * 3);
-}
-
-~FrameData()
-{
-}
-};
-
-void *FrameLock( void *data, void **pPixels )
-{
-FrameData *frameData = static_cast( data );
-
-frameData->updateSize();
-
-*pPixels = frameData->buffer.data();
-
-return *pPixels;
-}
-
-void FrameUnlock( void *data, void */* id */, void *const * /* pPixels */ )
-{
-FrameData *frameData = static_cast( data );
-
-frameData->mCondition.set();
-}
-
-void FrameDisplay( void */* data */, void */* id */ )
-{
-}
-}
-
::uno::Reference< css::graphic::XGraphic > SAL_CALL
VLCFrameGrabber::grabFrame( double fMediaTime )
{
if ( mUrl.isEmpty() )
return ::uno::Reference< css::graphic::XGraphic >();
-libvlc_media_player_t *pPlayer = mPlayer.get();
-FrameData frameData( pPlayer );
-libvlc_video_set_callbacks( pPlayer, FrameLock, FrameUnlock, FrameDisplay,
&frameData );
-
-const unsigned int w = 480, h = 360;
-
-libvlc_video_set_format( pPlayer, "RV24", w, h, w * 3 );
-
-libvlc_media_player_set_time( pPlayer, fMediaTime * MSEC_IN_SEC );
-libvlc_media_player_play( pPlayer );
-
-const TimeValue t = {2, 0};
-frameData.mCondition.wait( &t );
-
-if ( !frameData.mCondition.check() )
-return ::uno::Reference< css::graphic::XGraphic >();
-
-Bitmap aBmp( Size( w, h ), 24 );
-
-sal_uInt8 *pData = frameData.buffer.data();
-BitmapWriteAccess *pWrite = aBmp.AcquireWriteAccess();
-if ( pWrite )
-{
-for ( std::size_t y = 0; y < h; ++y )
-{
-for ( std::size_t x = 0; x < w; ++x )
-{
-sal_uInt8 *p = pData + ( y * w + x ) * 3;
-BitmapColor col( p[0], p[1], p[2] );
-pWrite->SetPixel( y, x, col );
-}
-}
-}
-aBmp.ReleaseAccess( pWrite );
-
-libvlc_media_player_stop( pPlayer );
+// libvlc_video_take_snapshot must be used, but it doesn't work for PNG
files
+//
-return Graphic( aBmp ).GetXGraphic();
+return ::uno::Reference< css::graphic::XGraphic >();
}
::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName()
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 92e0614..34ebb00 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -15,7 +15,7 @@ const ::rtl::OUString AVMEDIA_VLC_PLAYER_SERVICENAME =
"com.sun.star.media.Playe
const char * const VLC_ARGS[] = {
"-I",
-"dummy",
+"-Vdummy",
"--ignore-config",
"--verbose=-1",
"--quiet"
@@ -37,11 +37,10 @@ namespace
VLCPlayer::VLCPlayer( const rtl::OUString& url )
: VLC_Base(m_aMutex)
, mInstance( libvlc_new( sizeof( VLC_ARGS ) / sizeof( VLC_ARGS[0] ),
VLC_ARGS ), libvlc_release )
-, mPlayer( libvlc_media_player_new( mInstance.get() ),
libvlc_media_player_release )
+, mMedia( InitMedia( url, mInstance ), libvlc_media_release )
+, mPlayer( libvlc_media_player_new_from_media( mMedia.get() ),
libvlc_media_player_release )
, mUrl( url )
{
-boost::shared_ptr media( InitMedia( url, mInstance ),
libvlc_media_release );
-mPlayer.reset( libvlc_media_player_new_from_media( media.get() ),
libvlc_media_player_release );
}
void SAL_CALL VLCPlayer::start()
@@ -180,7 +179,6 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL
VLCPlayer::createPlayerWind
uno::Reference< css::media::XFrameGrabber > SAL_CALL
VLCPlayer::createFrameGrabber()
{
::osl::MutexGuard aGuard(m_aMutex);
-
VLCFrameGrabber *frameGrabber = new VLCFrameGrabber( mPlayer, mUrl );
return uno::Reference< css::media::XFrameGrabber >( frameGrabber );
}
diff --git a/avmedia/source/vlc/vlcplayer.hx
[Libreoffice-commits] buildbot.git: tb/tb_internals.sh
tb/tb_internals.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit eac15724b8c1b6a4311707e7743f310d8a96cd8d
Author: Thorsten Behrens
Date: Mon Jul 29 02:51:57 2013 +0200
Actually output the branch name.
Those vars seem to have changed names ...
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index ccbd43f..7c4d92a 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -608,7 +608,7 @@ ${tinder1}
Tinderbox info:
${tinder2}
- Branch: $TINDER_BRANCH
+ Branch: $TB_BRANCH
"starttime": $(epoch_from_utc "$rough_time")
Machine: `uname -a`
Configured with: `cat autogen.lastrun`
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/aboutconfig' - 2 commits - cui/source
cui/source/options/optaboutconfig.cxx | 36 +++---
cui/source/options/optaboutconfig.hxx |3 +-
2 files changed, 35 insertions(+), 4 deletions(-)
New commits:
commit c5a5a09044ee794e6494d6a59e98b1380ae62fae
Author: Efe Gürkan YALAMAN
Date: Mon Jul 29 03:48:41 2013 +0300
initial editBtn click handler added
Change-Id: I31ea8ab94331a8f6edc9e3c3f8f35105da5d7041
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 8434aa0..688b48b 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -46,6 +46,8 @@ CuiAboutConfigTabPage::CuiAboutConfigTabPage( Window*
pParent, const SfxItemSet&
WinBits nBits = WB_SCROLL | WB_SORT | WB_HSCROLL | WB_VSCROLL;
pPrefBox = new svx::OptHeaderTabListBox( *m_pPrefCtrl, nBits );
+m_pEditBtn->SetClickHdl( LINK( this, CuiAboutConfigTabPage,
StandardHdl_Impl ) );
+
HeaderBar &rBar = pPrefBox->GetTheHeaderBar();
rBar.InsertItem( ITEMID_PREF, get("preference")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW);
rBar.InsertItem( ITEMID_TYPE, get("status")->GetText(), 0,
HIB_LEFT | HIB_VCENTER | HIB_CLICKABLE | HIB_UPARROW );
@@ -273,6 +275,20 @@ IMPL_LINK( CuiAboutConfigTabPage, HeaderSelect_Impl,
HeaderBar*, pBar )
IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl )
{
SvTreeListEntry* pEntry = pPrefBox->FirstSelected();
+
+OUString sType = pPrefBox->GetEntryText( pEntry, 2 );
+
+if( sType == OUString("boolean") )
+{
+//TODO: this is just cosmetic, take all needed value and handle them
properly
+OUString sValue = pPrefBox->GetEntryText( pEntry, 1 );
+if (sValue == OUString("true"))
+pPrefBox->SetEntryText( OUString("false"), pEntry, 1 );
+else if(sValue == OUString("false"))
+pPrefBox->SetEntryText( OUString("true"), pEntry, 1 );
+}
+//TODO: add other types
+
return 0;
}
commit bbe546ac8d31a0e66e0593d346833281b18c9d24
Author: Efe Gürkan YALAMAN
Date: Mon Jul 29 02:21:50 2013 +0300
getConfigAccess Re-arranged for getting update access
getConfigAccess now has a second argument which allows getting update
access when needed. If second argument is sal_False gets ReadOnly
access, otherwise takes update access.
Change-Id: I53731e6cb8c586f59aec81abc1f12bcb60fd5481
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index c36a195..8434aa0 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -90,7 +90,7 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet& )
OUString sRootNodePath = "/";
pPrefBox->Clear();
- Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath );
+ Reference< XNameAccess > xConfigAccess = getConfigAccess( sRootNodePath,
sal_False );
FillItems( xConfigAccess, sRootNodePath );
}
@@ -214,7 +214,7 @@ void CuiAboutConfigTabPage::FillItems( Reference<
XNameAccess >xNameAccess, OUSt
}
}
-Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( OUString
sNodePath )
+Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess( OUString
sNodePath, sal_Bool bUpdate )
{
uno::Reference< uno::XComponentContext > xContext(
::comphelper::getProcessComponentContext() );
@@ -228,9 +228,16 @@ Reference< XNameAccess >
CuiAboutConfigTabPage::getConfigAccess( OUString sNodeP
uno::Sequence< uno::Any > aArgumentList( 1 );
aArgumentList[0] = uno::makeAny( aProperty );
+OUString sAccessString;
+
+if( bUpdate )
+sAccessString = "com.sun.star.configuration.ConfigurationUpdateAccess";
+else
+sAccessString = "com.sun.star.configuration.ConfigurationAccess";
+
uno::Reference< container::XNameAccess > xNameAccess(
xConfigProvider->createInstanceWithArguments(
-"com.sun.star.configuration.ConfigurationAccess",
aArgumentList ),
+sAccessString, aArgumentList ),
uno::UNO_QUERY_THROW );
return xNameAccess;
@@ -263,4 +270,11 @@ IMPL_LINK( CuiAboutConfigTabPage, HeaderSelect_Impl,
HeaderBar*, pBar )
return 1;
}
+IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl )
+{
+SvTreeListEntry* pEntry = pPrefBox->FirstSelected();
+return 0;
+
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optaboutconfig.hxx
b/cui/source/options/optaboutconfig.hxx
index 22661d7..3ba4355 100644
--- a/cui/source/options/optaboutconfig.hxx
+++ b/cui/source/options/optaboutconfig.hxx
@@ -33,13 +33,14 @@ private:
~CuiAboutConfigTabPage();
DECL_LINK( HeaderSelect_Impl, HeaderBar * );
+DECL_LINK( StandardHdl_Impl, void * );
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rItemset );
void InsertEntry(OUString& rProp
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - svtools/inc
svtools/inc/pch/precompiled_svt.hxx |1 - 1 file changed, 1 deletion(-) New commits: commit a3ba357d09ee7ae47f55d2f7eba364c4237037e8 Author: Thorsten Behrens Date: Mon Jul 29 01:45:43 2013 +0200 update pch Change-Id: I2509f22be4f853bdf0ba78804a0052864ec7ee94 diff --git a/svtools/inc/pch/precompiled_svt.hxx b/svtools/inc/pch/precompiled_svt.hxx index ac4215d..5719dfc 100644 --- a/svtools/inc/pch/precompiled_svt.hxx +++ b/svtools/inc/pch/precompiled_svt.hxx @@ -96,7 +96,6 @@ #include #include #include -#include #include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - framework/source vcl/inc vcl/win
framework/source/helper/titlebarupdate.cxx | 20 -
vcl/inc/win/saldata.hxx|1
vcl/win/source/app/salinst.cxx | 64 -
vcl/win/source/window/salframe.cxx |3 -
4 files changed, 75 insertions(+), 13 deletions(-)
New commits:
commit d798d26bc4b7572ed10d6baf5aef7382269d7da5
Author: Fridrich Å trba
Date: Mon Jul 29 01:35:35 2013 +0200
Remove some occurrences of RTL_CONSTASCII_STRINGPARAM and equalsAsciiL
Change-Id: I7acc31f819be6552344073fa032085d01622fca3
diff --git a/framework/source/helper/titlebarupdate.cxx
b/framework/source/helper/titlebarupdate.cxx
index c62d48b..c85c4b6 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -155,10 +155,10 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference< css::fr
OUString aModuleId = xModuleManager->identify(xFrame);
OUString sDesktopName;
#if !defined(MACOSX)
-if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.TextDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.GlobalDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.xforms.XMLFormDocument"))
)
+if ( aModuleId == "com.sun.star.text.TextDocument" ||
+ aModuleId == "com.sun.star.text.GlobalDocument" ||
+ aModuleId == "com.sun.star.text.WebDocument" ||
+ aModuleId == "com.sun.star.xforms.XMLFormDocument" )
sDesktopName = OUString("Writer");
else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
sDesktopName = OUString("Calc");
@@ -168,12 +168,12 @@ void TitleBarUpdate::impl_updateApplicationID(const
css::uno::Reference< css::fr
sDesktopName = OUString("Draw");
else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
sDesktopName = OUString("Math");
-else if (
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DatabaseDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.OfficeDatabaseDocument"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.RelationDesign"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.QueryDesign"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.TableDesign"))
||
-
aModuleId.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sdb.DataSourceBrowser"))
)
+else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" ||
+ aModuleId == "com.sun.star.sdb.OfficeDatabaseDocument" ||
+ aModuleId == "com.sun.star.sdb.RelationDesign" ||
+ aModuleId == "com.sun.star.sdb.QueryDesign" ||
+ aModuleId == "com.sun.star.sdb.TableDesign" ||
+ aModuleId == "com.sun.star.sdb.DataSourceBrowser" )
sDesktopName = OUString("Base");
else
sDesktopName = OUString("Startcenter");
commit e62fec4075e55fd62a3f0d25b230498e5705dd26
Author: Jesús Corrius
Date: Mon Jul 29 01:26:24 2013 +0200
Use the Win7 semantics of SHAddToRecentDocs when possible
Change-Id: I7cf0dfaec408800f3c682b3ef56799818b805881
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index fdf2faf..ea60b69 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -136,6 +136,7 @@ struct SalShlData
UINTmnWheelScrollChars; // WheelScrollChars
UINTmnWheelMsgId; // Wheel-Message-Id fuer
W95
BOOLmbWXP; // Windows XP
+BOOLmbW7; // Windows 7
OSVERSIONINFO maVersionInfo;
};
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index da0ad46..4401bb7 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -493,6 +493,7 @@ SalInstance* CreateSalInstance()
// determine the windows version
aSalShlData.mbWXP= 0;
+aSalShlData.mbW7 = 0;
memset( &aSalShlData.maVersionInfo, 0, sizeof(aSalShlData.maVersionInfo) );
aSalShlData.maVersionInfo.dwOSVersionInfoSize = sizeof(
aSalShlData.maVersionInfo );
if ( GetVersionEx( &aSalShlData.maVersionInfo ) )
@@ -501,6 +502,10 @@ SalInstance* CreateSalInstance()
if ( aSalShlData.maVersionInfo.dwMajorVersion > 5 ||
( aSalShlData.maVersionInfo.dwMajorVersion == 5 &&
aSalShlData.maVersionInfo.dwMinorVersion >= 1 ) )
aSalShlData.mbWXP = 1;
+// Windows 7 ?
+if ( aSalShlData.maVersionInfo.dwMajo
[PUSHED] Converting to OUString in sd in sdundo.hxx and related files...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5135 Approvals: LibreOffice gerrit bot: Verified Norbert Thiebaud: Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5135 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e9c1122ccfe9dfadfb36c4ab419c429c2bda6d0 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergely Máté Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sd/inc sd/source
sd/inc/sdundo.hxx |6 +++---
sd/source/ui/animations/SlideTransitionPane.cxx |2 +-
sd/source/ui/dlg/headerfooterdlg.cxx|2 +-
sd/source/ui/func/fuoaprms.cxx |2 +-
sd/source/ui/func/fupage.cxx|2 +-
sd/source/ui/func/undoback.cxx |2 +-
sd/source/ui/func/undolayer.cxx |2 +-
sd/source/ui/view/ViewShellImplementation.cxx |6 +++---
sd/source/ui/view/drviews3.cxx |2 +-
sd/source/ui/view/sdview2.cxx |2 +-
sd/source/ui/view/viewshe2.cxx |2 +-
11 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit af079c886f9643d539a16065dc4e96d70fac422b
Author: MÃTÃ Gergely
Date: Sat Jul 27 00:53:45 2013 +0200
Converting to OUString in sd in sdundo.hxx and related files.
Change-Id: I5e9c1122ccfe9dfadfb36c4ab419c429c2bda6d0
Reviewed-on: https://gerrit.libreoffice.org/5135
Tested-by: LibreOffice gerrit bot
Reviewed-by: Norbert Thiebaud
diff --git a/sd/inc/sdundo.hxx b/sd/inc/sdundo.hxx
index 2035fa6..3167c41 100644
--- a/sd/inc/sdundo.hxx
+++ b/sd/inc/sdundo.hxx
@@ -33,13 +33,13 @@ public:
: mpDoc(pSdDrawDocument) {}
virtual ~SdUndoAction() {}
-voidSetComment(String& rStr) { maComment = rStr; }
-virtual OUString GetComment() const { return maComment; }
+voidSetComment(OUString& rStr) { maComment = rStr; }
+virtual OUStringGetComment() const { return maComment; }
virtual SdUndoAction* Clone() const { return NULL; }
protected:
SdDrawDocument* mpDoc;
-String maComment;
+OUString maComment;
};
#endif // _SD_SDUNDO_HXX
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx
b/sd/source/ui/animations/SlideTransitionPane.cxx
index eb638b7..0f8e7de 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -264,7 +264,7 @@ void lcl_CreateUndoForPages(
SdDrawDocument* pDoc= pDocSh->GetDoc();
if( pManager && pDocSh && pDoc )
{
-String aComment( SdResId(STR_UNDO_SLIDE_PARAMS) );
+OUString aComment( SdResId(STR_UNDO_SLIDE_PARAMS) );
pManager->EnterListAction(aComment, aComment);
SdUndoGroup* pUndoGroup = new SdUndoGroup( pDoc );
pUndoGroup->SetComment( aComment );
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx
b/sd/source/ui/dlg/headerfooterdlg.cxx
index 6e5b5af..518dd26 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -325,7 +325,7 @@ void HeaderFooterDialog::Cancel( TabPage* )
void HeaderFooterDialog::apply( bool bToAll, bool bForceSlides )
{
SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
-String aComment( GetText() );
+OUString aComment( GetText() );
pUndoGroup->SetComment( aComment );
HeaderFooterSettings aNewSettings;
diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx
index 3efc8ae..ae0f6c5 100644
--- a/sd/source/ui/func/fuoaprms.cxx
+++ b/sd/source/ui/func/fuoaprms.cxx
@@ -619,7 +619,7 @@ void FuObjectAnimationParameters::DoExecute( SfxRequest&
rReq )
nSecondPlayFullSet == ATTR_SET)
{
// String for undo-group and list-action
-String aComment(SdResId(STR_UNDO_ANIMATION));
+OUString aComment(SdResId(STR_UNDO_ANIMATION));
// with 'following curves', we have an additional UndoAction
// therefore cling? here
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx
index ae49182..abae128 100644
--- a/sd/source/ui/func/fupage.cxx
+++ b/sd/source/ui/func/fupage.cxx
@@ -390,7 +390,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent )
}
else if( bSetToAllPages )
{
-String aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
+OUString aComment(SdResId(STR_UNDO_CHANGE_PAGEFORMAT));
::svl::IUndoManager* pUndoMgr = mpDocSh->GetUndoManager();
pUndoMgr->EnterListAction(aComment, aComment);
SdUndoGroup* pUndoGroup = new SdUndoGroup(mpDoc);
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index 255ec11..8b821cb 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -36,7 +36,7 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction(
mrPage(rPage),
mpItemSet(new SfxItemSet(rItenSet))
{
-String aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) );
+OUString aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) );
SetComment( aString );
}
diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx
index 11bae9c..52868cc 100644
--- a/sd/source/ui/func/undolayer.cxx
+++ b/sd/source/ui/func/undolayer.cxx
@@ -47,7 +47,7
[PUSHED] Add NSAXSpy to help debugging OS X accessibility
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/5160 Approvals: Boris Dušek: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/5160 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia7f4dbed4924b8f5330726d378eda3601991f404 Gerrit-PatchSet: 2 Gerrit-Project: dev-tools Gerrit-Branch: master Gerrit-Owner: Boris Dušek Gerrit-Reviewer: Boris Dušek ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] dev-tools.git: .gitignore NSAXSpy/NSAXSpy NSAXSpy/NSAXSpy.xcodeproj
.gitignore |4
NSAXSpy/NSAXSpy.xcodeproj/project.pbxproj | 240
++
NSAXSpy/NSAXSpy.xcodeproj/project.xcworkspace/contents.xcworkspacedata |7
NSAXSpy/NSAXSpy/main.m | 205
4 files changed, 455 insertions(+), 1 deletion(-)
New commits:
commit 6af7845fc1bc0d0ac265a029b03218813ce631cf
Author: Boris Dušek
Date: Sun Jul 28 22:37:37 2013 +0200
Add NSAXSpy to help debugging OS X accessibility
This tool currently logs the AXAttributedString of the first AXTextArea
found in LibreOffice (suited for Writer), and logs all AXValueChanged
and AXSelectedTextChanged notifications of that AXTextArea and also all
AXFocusedUIElementChange notifications. It can be adjusted to do
the same thing for TextEdit so that one can learn from it
how stuff should be implemented (TextEdit is basically
*the* reference implementation of AXTextArea).
Any adjustments (e.g. to observe TextEdit instead of LibreOffice)
need to be done in the source code of this tool.
Change-Id: Ia7f4dbed4924b8f5330726d378eda3601991f404
Reviewed-on: https://gerrit.libreoffice.org/5160
Reviewed-by: Boris Dušek
Tested-by: Boris Dušek
diff --git a/.gitignore b/.gitignore
index 9745f02..765cd01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
*~
-*.orig
\ No newline at end of file
+*.orig
+NSAXSpy/NSAXSpy.xcodeproj/project.xcworkspace/xcuserdata/
+NSAXSpy/NSAXSpy.xcodeproj/xcuserdata/
diff --git a/NSAXSpy/NSAXSpy.xcodeproj/project.pbxproj
b/NSAXSpy/NSAXSpy.xcodeproj/project.pbxproj
new file mode 100644
index 000..392335a
--- /dev/null
+++ b/NSAXSpy/NSAXSpy.xcodeproj/project.pbxproj
@@ -0,0 +1,240 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 6B6A880F17A5B49B00182C47 /* CoreFoundation.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 6B6A880E17A5B49B00182C47 /*
CoreFoundation.framework */; };
+ 6B6A881217A5B49B00182C47 /* main.m in Sources */ = {isa =
PBXBuildFile; fileRef = 6B6A881117A5B49B00182C47 /* main.m */; };
+ 6B6A881B17A5B4ED00182C47 /* ApplicationServices.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 6B6A881A17A5B4ED00182C47 /*
ApplicationServices.framework */; };
+ 6B6A881D17A5B4F600182C47 /* Cocoa.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 6B6A881C17A5B4F600182C47 /* Cocoa.framework */;
};
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+ 6B6A880917A5B49B00182C47 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = /usr/share/man/man1/;
+ dstSubfolderSpec = 0;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+ 6B6A880B17A5B49B00182C47 /* NSAXSpy */ = {isa =
PBXFileReference; explicitFileType = "compiled.mach-o.executable";
includeInIndex = 0; path = NSAXSpy; sourceTree = BUILT_PRODUCTS_DIR; };
+ 6B6A880E17A5B49B00182C47 /* CoreFoundation.framework */ = {isa
= PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreFoundation.framework; path =
System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+ 6B6A881117A5B49B00182C47 /* main.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m;
sourceTree = ""; };
+ 6B6A881A17A5B4ED00182C47 /* ApplicationServices.framework */ =
{isa = PBXFileReference; lastKnownFileType = wrapper.framework; name =
ApplicationServices.framework; path =
System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT;
};
+ 6B6A881C17A5B4F600182C47 /* Cocoa.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree =
SDKROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 6B6A880817A5B49B00182C47 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 6B6A881D17A5B4F600182C47 /* Cocoa.framework in
Frameworks */,
+ 6B6A881B17A5B4ED00182C47 /*
ApplicationServices.framework in Frameworks */,
+ 6B6A880F17A5B49B00182C47 /*
CoreFoundation.framework in Frameworks */,
+ );
+
[PATCH] Add NSAXSpy to help debugging OS X accessibility
Hi,
I would like you to review the following patch:
https://gerrit.libreoffice.org/5160
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/dev-tools refs/changes/60/5160/1
Add NSAXSpy to help debugging OS X accessibility
This tool currently logs the AXAttributedString of the first AXTextArea
found in LibreOffice (suited for Writer), and logs all AXValueChanged
and AXSelectedTextChanged notifications of that AXTextArea and also all
AXFocusedUIElementChange notifications. It can be adjusted to do
the same thing for TextEdit so that one can learn from it
how stuff should be implemented (TextEdit is basically
*the* reference implementation of AXTextArea).
Any adjustments (e.g. to observe TextEdit instead of LibreOffice)
need to be done in the source code of this tool.
Change-Id: Ia7f4dbed4924b8f5330726d378eda3601991f404
---
M .gitignore
A NSAXSpy/NSAXSpy.xcodeproj/project.pbxproj
A NSAXSpy/NSAXSpy.xcodeproj/project.xcworkspace/contents.xcworkspacedata
A NSAXSpy/NSAXSpy/main.m
4 files changed, 455 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 9745f02..765cd01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
*~
-*.orig
\ No newline at end of file
+*.orig
+NSAXSpy/NSAXSpy.xcodeproj/project.xcworkspace/xcuserdata/
+NSAXSpy/NSAXSpy.xcodeproj/xcuserdata/
diff --git a/NSAXSpy/NSAXSpy.xcodeproj/project.pbxproj
b/NSAXSpy/NSAXSpy.xcodeproj/project.pbxproj
new file mode 100644
index 000..392335a
--- /dev/null
+++ b/NSAXSpy/NSAXSpy.xcodeproj/project.pbxproj
@@ -0,0 +1,240 @@
+// !$*UTF8*$!
+{
+ archiveVersion = 1;
+ classes = {
+ };
+ objectVersion = 46;
+ objects = {
+
+/* Begin PBXBuildFile section */
+ 6B6A880F17A5B49B00182C47 /* CoreFoundation.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 6B6A880E17A5B49B00182C47 /*
CoreFoundation.framework */; };
+ 6B6A881217A5B49B00182C47 /* main.m in Sources */ = {isa =
PBXBuildFile; fileRef = 6B6A881117A5B49B00182C47 /* main.m */; };
+ 6B6A881B17A5B4ED00182C47 /* ApplicationServices.framework in
Frameworks */ = {isa = PBXBuildFile; fileRef = 6B6A881A17A5B4ED00182C47 /*
ApplicationServices.framework */; };
+ 6B6A881D17A5B4F600182C47 /* Cocoa.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 6B6A881C17A5B4F600182C47 /* Cocoa.framework */;
};
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+ 6B6A880917A5B49B00182C47 /* CopyFiles */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = /usr/share/man/man1/;
+ dstSubfolderSpec = 0;
+ files = (
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ };
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+ 6B6A880B17A5B49B00182C47 /* NSAXSpy */ = {isa =
PBXFileReference; explicitFileType = "compiled.mach-o.executable";
includeInIndex = 0; path = NSAXSpy; sourceTree = BUILT_PRODUCTS_DIR; };
+ 6B6A880E17A5B49B00182C47 /* CoreFoundation.framework */ = {isa
= PBXFileReference; lastKnownFileType = wrapper.framework; name =
CoreFoundation.framework; path =
System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+ 6B6A881117A5B49B00182C47 /* main.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m;
sourceTree = ""; };
+ 6B6A881A17A5B4ED00182C47 /* ApplicationServices.framework */ =
{isa = PBXFileReference; lastKnownFileType = wrapper.framework; name =
ApplicationServices.framework; path =
System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT;
};
+ 6B6A881C17A5B4F600182C47 /* Cocoa.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree =
SDKROOT; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+ 6B6A880817A5B49B00182C47 /* Frameworks */ = {
+ isa = PBXFrameworksBuildPhase;
+ buildActionMask = 2147483647;
+ files = (
+ 6B6A881D17A5B4F600182C47 /* Cocoa.framework in
Frameworks */,
+ 6B6A881B17A5B4ED00182C47 /*
ApplicationServices.framework in Frameworks */,
+ 6B6A880F17A5B49B00182C47 /*
CoreFoundation.framework in Frameworks */,
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ };
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+ 6B6A880217A5B49B00182C47 = {
+ isa = PBXGroup;
+ children =
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig
cui/uiconfig/ui/optviewpage.ui |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 4d2e614b8bed3600de1b48babed6b01a31c12b01 Author: Stefan Knorr Date: Sat Jul 27 22:38:14 2013 +0200 Fix problem in German UI with cutoff label in options page Change-Id: I8943aa1576f859db7e7f98fa0fa7d751116f0a8e (cherry picked from commit 5eeef5cb0814db643d31e3c5f0f4c4332e36f822) Reviewed-on: https://gerrit.libreoffice.org/5156 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui index 2cc72b1..2cd0f15 100644 --- a/cui/uiconfig/ui/optviewpage.ui +++ b/cui/uiconfig/ui/optviewpage.ui @@ -80,7 +80,7 @@ 0 1 -1 +2 1 @@ -129,9 +129,6 @@ 1 - - - 0 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: connectivity/source
connectivity/source/sdbcx/VCatalog.cxx |8 1 file changed, 4 insertions(+), 4 deletions(-) New commits: commit ad94820ed7bdfb9353d02345e70e02cf2c518893 Author: Lionel Elie Mamane Date: Thu Jul 25 14:32:14 2013 +0200 remove unnecessary const_cast Change-Id: I49348d953614f997d26cb9ad44e39aa0f4b937d2 diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index a51e17a..cf5ffb2 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -110,7 +110,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException // allowed } -return const_cast(this)->m_pTables; +return m_pTables; } // - // XViewsSupplier @@ -134,7 +134,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getViews( ) throw(RuntimeException) // allowed } -return const_cast(this)->m_pViews; +return m_pViews; } // - // XUsersSupplier @@ -158,7 +158,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getUsers( ) throw(RuntimeException) // allowed } -return const_cast(this)->m_pUsers; +return m_pUsers; } // - // XGroupsSupplier @@ -182,7 +182,7 @@ Reference< XNameAccess > SAL_CALL OCatalog::getGroups( ) throw(RuntimeException // allowed } -return const_cast(this)->m_pGroups; +return m_pGroups; } // - OUString OCatalog::buildName(const Reference< XRow >& _xRow) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/vcl vcl/source
include/vcl/image.hxx|1 -
vcl/source/gdi/image.cxx | 15 ---
2 files changed, 16 deletions(-)
New commits:
commit 5132017d86809c99a1af8ac0c0e0a72d00de3674
Author: Jan Holesovsky
Date: Sun Jul 28 15:56:36 2013 +0200
ImageList::AddImage(sal_uInt16, ...) is unused again, kill.
Change-Id: I58be12e7cbf1b97b4d52f398853074ad135780a0
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index 0d28bc0..dc027f4 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -103,7 +103,6 @@ public:
SizeGetImageSize() const;
voidAddImage( const OUString& rImageName, const Image& rImage
);
-voidAddImage( sal_uInt16 nNewId, const Image& rImage );
voidReplaceImage( const OUString& rImageName, const Image&
rImage );
diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index 0e33a63..32bd324 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.cxx
@@ -504,21 +504,6 @@ sal_uInt16 ImageList::ImplGetImageId( const OUString&
rImageName ) const
return 0;
}
-void ImageList::AddImage( sal_uInt16 nId, const Image& rImage )
-{
-DBG_CHKTHIS( ImageList, NULL );
-DBG_CHKOBJ( &rImage, Image, NULL );
-DBG_ASSERT( nId, "ImageList::AddImage(): ImageId == 0" );
-DBG_ASSERT( GetImagePos( nId ) == IMAGELIST_IMAGE_NOTFOUND,
"ImageList::AddImage() - ImageId already exists" );
-DBG_ASSERT( rImage.mpImplData, "ImageList::AddImage(): Wrong Size" );
-DBG_ASSERT( !mpImplData || (rImage.GetSizePixel() ==
mpImplData->maImageSize), "ImageList::AddImage(): Wrong Size" );
-
-if( !mpImplData )
-ImplInit( 0, rImage.GetSizePixel() );
-
-mpImplData->AddImage( rtl::OUString(), nId, rImage.GetBitmapEx());
-}
-
void ImageList::AddImage( const OUString& rImageName, const Image& rImage )
{
DBG_ASSERT( GetImagePos( rImageName ) == IMAGELIST_IMAGE_NOTFOUND,
"ImageList::AddImage() - ImageName already exists" );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Björn Michaelsen changed: What|Removed |Added Depends on||67099 --- Comment #59 from Björn Michaelsen --- suggesting bug 67099 as MAB, ~700% performance regression vs. 4.0.x in loading ods files -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Converting to OUString in sd in sdundo.hxx and related files...
Hello LibreOffice gerrit bot, I'd like you to reexamine a rebased change. Please visit https://gerrit.libreoffice.org/5135 to look at the new rebased patch set (#2). Change subject: Converting to OUString in sd in sdundo.hxx and related files. .. Converting to OUString in sd in sdundo.hxx and related files. Change-Id: I5e9c1122ccfe9dfadfb36c4ab419c429c2bda6d0 --- M sd/inc/sdundo.hxx M sd/source/ui/animations/SlideTransitionPane.cxx M sd/source/ui/dlg/headerfooterdlg.cxx M sd/source/ui/func/fuoaprms.cxx M sd/source/ui/func/fupage.cxx M sd/source/ui/func/undoback.cxx M sd/source/ui/func/undolayer.cxx M sd/source/ui/view/ViewShellImplementation.cxx M sd/source/ui/view/drviews3.cxx M sd/source/ui/view/sdview2.cxx M sd/source/ui/view/viewshe2.cxx 11 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/5135/2 -- To view, visit https://gerrit.libreoffice.org/5135 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5e9c1122ccfe9dfadfb36c4ab419c429c2bda6d0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Gergely Máté Gerrit-Reviewer: LibreOffice gerrit bot Gerrit-Reviewer: Norbert Thiebaud ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/aqua
vcl/aqua/source/a11y/aqua11yfocuslistener.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b9b452a570bea90f27082e5b70aedf9b8f9d421e
Author: Boris Dušek
Date: Sun Jul 21 22:05:59 2013 +0200
fdo#54320: VoiceOver does not follow keyboard focus
The AXFocusedUIElementChanged notification must have the application object
as its parameter, as it is the application object whose AXFocusedUIElement
attribute value is changing (and because the docs say so).
Change-Id: Ife63a1e59d8a24256ace38fb98b69fd1544f9c96
Reviewed-on: https://gerrit.libreoffice.org/5158
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 5a0c339..ace2616 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -83,7 +83,7 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference<
XAccessible >& xAcc
if( xContext.is() )
{
m_focusedObject = [ AquaA11yFactory
wrapperForAccessibleContext: xContext ];
-NSAccessibilityPostNotification(m_focusedObject,
NSAccessibilityFocusedUIElementChangedNotification);
+NSAccessibilityPostNotification(NSApp,
NSAccessibilityFocusedUIElementChangedNotification);
}
}
} catch(const RuntimeException &) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua
vcl/aqua/source/a11y/aqua11yfocuslistener.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 37eb789055b3b079fc8f6784832822f85dab2d0e
Author: Boris Dušek
Date: Sun Jul 21 22:05:59 2013 +0200
fdo#54320: VoiceOver does not follow keyboard focus
The AXFocusedUIElementChanged notification must have the application object
as its parameter, as it is the application object whose AXFocusedUIElement
attribute value is changing (and because the docs say so).
Change-Id: Ife63a1e59d8a24256ace38fb98b69fd1544f9c96
Reviewed-on: https://gerrit.libreoffice.org/5157
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 5a0c339..ace2616 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -83,7 +83,7 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference<
XAccessible >& xAcc
if( xContext.is() )
{
m_focusedObject = [ AquaA11yFactory
wrapperForAccessibleContext: xContext ];
-NSAccessibilityPostNotification(m_focusedObject,
NSAccessibilityFocusedUIElementChangedNotification);
+NSAccessibilityPostNotification(NSApp,
NSAccessibilityFocusedUIElementChangedNotification);
}
}
} catch(const RuntimeException &) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/aqua
vcl/aqua/source/a11y/aqua11yfocuslistener.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e9257fa0e642de2f1c79f2c80387334010812dab
Author: Boris Dušek
Date: Sun Jul 21 22:05:59 2013 +0200
fdo#54320: VoiceOver does not follow keyboard focus
The AXFocusedUIElementChanged notification must have the application object
as its parameter, as it is the application object whose AXFocusedUIElement
attribute value is changing (and because the docs say so).
Change-Id: Ife63a1e59d8a24256ace38fb98b69fd1544f9c96
Reviewed-on: https://gerrit.libreoffice.org/5155
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 5a0c339..ace2616 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
@@ -83,7 +83,7 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference<
XAccessible >& xAcc
if( xContext.is() )
{
m_focusedObject = [ AquaA11yFactory
wrapperForAccessibleContext: xContext ];
-NSAccessibilityPostNotification(m_focusedObject,
NSAccessibilityFocusedUIElementChangedNotification);
+NSAccessibilityPostNotification(NSApp,
NSAccessibilityFocusedUIElementChangedNotification);
}
}
} catch(const RuntimeException &) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/globstr.hrc|3 +++
sc/source/ui/inc/miscdlgs.hrc |3 ---
sc/source/ui/miscdlgs/filldlg.cxx |1 +
sc/source/ui/src/globstr.src |5 +
sc/source/ui/src/miscdlgs.src |5 -
5 files changed, 9 insertions(+), 8 deletions(-)
New commits:
commit 0ec4caed104e409f623f078aafdbc218ea3da347
Author: Lionel Elie Mamane
Date: Sun Jul 28 19:55:33 2013 +0200
move global string to globstr file
Solves warning: global resources should have number >= 256
Change-Id: Ic1066b6c190c151550e2fc4c4b932ff397d453a5
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 2f8e562..9c064fb 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -725,6 +725,9 @@
#define STR_CORRELATION_UNDO_NAME 589
#define STR_COVARIANCE_UNDO_NAME590
+// Row fillers
+#define STR_VALERR 591
+
#endif
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index ff0b8ad..67e5d5e 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -75,9 +75,6 @@
#define FL_ENTRYLIST10
#define LB_ENTRYLIST11
-// Row fillers
-#define STR_VALERR 50
-
// Auto format
#define LB_FORMAT 1
#define FL_FORMAT 9
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx
b/sc/source/ui/miscdlgs/filldlg.cxx
index 1e275fe..cfca8e8 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -30,6 +30,7 @@
#include "scresid.hxx"
#include "document.hxx"
+#include "globstr.hrc"
#include "miscdlgs.hrc"
#define _FILLDLG_CXX
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index bd9579c..acab6b0 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2089,6 +2089,11 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "click to open hyperlink:";
};
+String STR_VALERR
+{
+Text [ en-US ] = "Invalid value" ;
+};
+
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index fc1bdc0..ad18772 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -585,11 +585,6 @@ ModalDialog RID_SCDLG_SHOW_TAB
};
-String STR_VALERR
-{
-Text [ en-US ] = "Invalid value" ;
-};
-
#define TXT_COLS \
Text [ en-US ] = "~Columns" ; \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - sd/source
sd/source/core/sdpage.cxx | 19 +--
1 file changed, 9 insertions(+), 10 deletions(-)
New commits:
commit ee38d2ef7903454ac1968e9b14171b882010c933
Author: Vishv Brahmbhatt
Date: Sun Jul 28 23:11:21 2013 +0530
Refactoring changes in the "sdpage.cxx"
Converted some 'long' to 'int' and 'double' to 'sal_Int32'.So removed the
long from the file.
Also one of the changes for "readLayoutPropFromFile" will be removed soon.
Change-Id: I4e88807908520439fa64f07808af9138c6556890
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index a7d4b51..4ac9ed9 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1238,7 +1238,7 @@ Reference getRootElement()
}
//read the information from XML file(traversing from layout node)
-void readLayoutPropFromFile(const Reference& root, const
rtl::OUString& sLayoutType, const rtl::OUString& sPresObjKind, double
propvalue[])
+void readLayoutPropFromFile(const Reference& root, const
rtl::OUString& sLayoutType, const rtl::OUString& sPresObjKind, sal_Int32
propvalue[])
{
long presobjsize;
long layoutlistsize;
@@ -1353,7 +1353,7 @@ void parseXml()
const Reference root= getRootElement();//get the root element of
my xml file
const Reference layoutlist =
root->getElementsByTagName("layout");
layoutlistsize=layoutlist->getLength();
-for( long index=0; index layoutnode = layoutlist->item(index); //get i'th
layout element
layoutinfo.push_back(layoutnode);
@@ -1364,11 +1364,10 @@ static void CalcAutoLayoutRectangles( SdPage& rPage,
int nLayout, Rectangle* rRe
{
Rectangle aTitleRect;
Rectangle aLayoutRect;
-long presobjsize;
-long layoutlistsize;
+int presobjsize;
rtl::OUString sLayoutAttName;
rtl::OUString sPresObjKindAttName;
-double propvalue[4];
+sal_Int32 propvalue[4];
if( rPage.GetPageKind() != PK_HANDOUT )
{
@@ -1424,7 +1423,7 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int
nLayout, Rectangle* rRe
int count=0;
Reference layoutchildrens = layoutnode->getChildNodes();
presobjsize = layoutchildrens->getLength(); //get the
length of that of the layout(number of pres objects)
-for( long j=0; j< presobjsize ; j++)
+for( int j=0; j< presobjsize ; j++)
{
rtl::OUString nodename;
Reference presobj = layoutchildrens->item(j);//get
the j'th presobj for that layout
@@ -1435,19 +1434,19 @@ static void CalcAutoLayoutRectangles( SdPage& rPage,
int nLayout, Rectangle* rRe
Reference presObjPosX =
presObjAttributes->getNamedItem("layout-pos-x");
rtl::OUString sValue = presObjPosX->getNodeValue();
-propvalue[0] = sValue.toDouble();
+propvalue[0] = sValue.toInt32();
Reference presObjPosY =
presObjAttributes->getNamedItem("layout-pos-y");
sValue = presObjPosY->getNodeValue();
-propvalue[1] = sValue.toDouble();
+propvalue[1] = sValue.toInt32();
Reference presObjSizeHeight =
presObjAttributes->getNamedItem("layout-size-height");
sValue = presObjSizeHeight->getNodeValue();
-propvalue[2] = sValue.toDouble();
+propvalue[2] = sValue.toInt32();
Reference presObjSizeWidth =
presObjAttributes->getNamedItem("layout-size-width");
sValue = presObjSizeWidth->getNodeValue();
-propvalue[3] = sValue.toDouble();
+propvalue[3] = sValue.toInt32();
aLayoutPos.X() = propvalue[0];
aLayoutPos.Y() = propvalue[1];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source
vcl/source/gdi/bitmapex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c30fad2fcee46d98a9a2da4cf0c0470f5cc7f34e
Author: Ivan Timofeev
Date: Sun Jul 28 20:41:27 2013 +0400
fdo#67397: don't bother to create BlendFrame for width == 1 or height == 1
... because:
1) frame painted as a line doesn't make sense to me anyway;
2) it leads to x = 1 or y = 1 in createBlendFrame, while the max value for
that
variable is "width (or height) - 1", i.e. 0.
Change-Id: I7437bce6681e42cb57458c012927cf5d6bfc154f
(cherry picked from commit dd6518d42fce1416fa00f80a7b7dead113c37752)
Reviewed-on: https://gerrit.libreoffice.org/5154
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 094b7c7..f60c583 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -982,7 +982,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame(
const long nW(rSize.Width());
const long nH(rSize.Height());
-if(nW && nH)
+if(nW > 1 && nH > 1)
{
sal_uInt8 aEraseTrans(0xff);
Bitmap aContent(rSize, 24);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: clone/dictionaries clone/help
clone/dictionaries |1 - clone/help |1 - 2 files changed, 2 deletions(-) New commits: commit beddcf25381523e7b52e07c3c35c61917f005218 Author: Caolán McNamara Date: Sun Jul 28 18:37:32 2013 +0100 Revert accidental addition of clone foo This reverts parts of commit e437dab84256bfabf2c5f5164d6ec55476281701. Change-Id: If5d0b2b59c887a390c0805af8c5605f984900dbe diff --git a/clone/dictionaries b/clone/dictionaries deleted file mode 16 index 53e9940..000 --- a/clone/dictionaries +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 53e9940d33caa1e8a00ddaadfb57e5d668d35378 diff --git a/clone/help b/clone/help deleted file mode 16 index a43f72a..000 --- a/clone/help +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a43f72ace3d84b3ba0df35ec589a21a1d5de2299 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/gtk/app/gtkinst.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 0354b4335b5c4fcf65d954e03116c44aabe7fa1d Author: Caolán McNamara Date: Sun Jul 28 18:31:13 2013 +0100 WaE: unused rDocumentService in one ifdef branch Change-Id: I542cf23c8077d9f867a2d890dc326465fce8c3a3 diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 63737d2..caca819 100644 --- a/vcl/unx/gtk/app/gtkinst.cxx +++ b/vcl/unx/gtk/app/gtkinst.cxx @@ -241,6 +241,7 @@ void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUStri GtkRecentManager *manager = gtk_recent_manager_get_default (); gtk_recent_manager_add_item (manager, sGtkURL.getStr()); (void)rMimeType; +(void)rDocumentService; #else static getDefaultFnc sym_gtk_recent_manager_get_default = (getDefaultFnc)osl_getAsciiFunctionSymbol( GetSalData()->m_pPlugin, "gtk_recent_manager_get_default" ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/ui/uiview/viewtab.cxx | 130 ++--
1 file changed, 59 insertions(+), 71 deletions(-)
New commits:
commit 5eedfe71e2ecbec85f7426430e146c2c59d673c6
Author: Matthias Freund
Date: Sun Jul 14 11:58:40 2013 +0200
fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (last)
Change-Id: Id54b3f9a6972db1c82fdc80897329dd71e48ae2d
Reviewed-on: https://gerrit.libreoffice.org/4902
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx
index 92a39d7..b24afdf 100644
--- a/sw/source/ui/uiview/viewtab.cxx
+++ b/sw/source/ui/uiview/viewtab.cxx
@@ -46,8 +46,8 @@
#include "cmdid.h"
#include "viewopt.hxx"
#include "tabcol.hxx"
-#include "frmfmt.hxx" // FrameFormat
-#include "pagedesc.hxx" // Aktuelles Seitenformat
+#include "frmfmt.hxx" // Current format
+#include "pagedesc.hxx" // Current page format
#include "wview.hxx"
#include "fmtcol.hxx"
#include "section.hxx"
@@ -59,14 +59,10 @@
using namespace ::com::sun::star;
+// Debug Method
-/*
-Beschreibung: Debug-Methode
- */
+// Pack columns
-/*
-Beschreibung: Columns eintueten
- */
static void lcl_FillSvxColumn(const SwFmtCol& rCol,
sal_uInt16 nTotalWidth,
SvxColumnItem& rColItem,
@@ -105,9 +101,8 @@ static void lcl_FillSvxColumn(const SwFmtCol& rCol,
}
}
-/*
-Beschreibung: ColumnItem in ColumnInfo ueberfuehren
- */
+// Transfer ColumnItem in ColumnInfo
+
static void lcl_ConvertToCols(const SvxColumnItem& rColItem,
sal_uInt16 nTotalWidth,
SwFmtCol& rCols)
@@ -119,11 +114,11 @@ static void lcl_ConvertToCols(const SvxColumnItem&
rColItem,
return;
sal_uInt16 nLeft= 0;
-SwTwips nSumAll= 0; // Summiere alle Spalten und Raender auf
+SwTwips nSumAll= 0; // Sum up all columns and margins
SwColumns& rArr = rCols.GetColumns();
-// Tabcols der Reihe nach
+// Tabcols sequentially
for( sal_uInt16 i=0; i < rColItem.Count()-1; ++i )
{
OSL_ENSURE(rColItem[i+1].nStart >= rColItem[i].nEnd,"overlapping
columns" );
@@ -148,22 +143,21 @@ static void lcl_ConvertToCols(const SvxColumnItem&
rColItem,
}
rArr[rColItem.Count()-1].SetLeft( nLeft );
-//Die Differenz aus der Gesamtwunschbreite und der Summe der bisher
berechneten
-// Spalten und Raender sollte die Breite der letzten Spalte ergeben.
+// The difference between the total sum of the desired width and the so far
+// calculated columns and margins should result in the width of the last
column.
rArr[rColItem.Count()-1].SetWishWidth( rCols.GetWishWidth() -
(sal_uInt16)nSumAll );
rCols.SetOrtho(sal_False, 0, 0 );
}
-/*
-Beschreibung: Tabs loeschen
- */
+// Delete tabs
+
static void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
{
-// Def Tabs loeschen
+// Delete DefTabs
for ( sal_uInt16 i = 0; i < rTabStops.Count(); )
{
-// Hier auch den DefTab auf Null rausschmeissen
+// Here also throw out the DefTab to zero
if ( SVX_TAB_ADJUST_DEFAULT == rTabStops[i].GetAdjustment() ||
rTabStops[i].GetTabPos() == 0 )
{
@@ -174,9 +168,8 @@ static void lcl_EraseDefTabs(SvxTabStopItem& rTabStops)
}
}
-/*
-Beschreibung: Seitenrand umdrehen
- */
+// Flip page margin
+
void SwView::SwapPageMargin(const SwPageDesc& rDesc, SvxLRSpaceItem& rLRSpace)
{
sal_uInt16 nPhyPage, nVirPage;
@@ -190,10 +183,9 @@ void SwView::SwapPageMargin(const SwPageDesc& rDesc,
SvxLRSpaceItem& rLRSpace)
}
}
-/*
-Beschreibung: Wenn der Rahmenrand verschoben wird, sollen die
-Spaltentrenner an der gleichen absoluten Position bleiben
- */
+// If the frame border is moved, the column separator
+// should stay in the same absolute position.
+
static void lcl_Scale(long& nVal, long nScale)
{
nVal *= nScale;
@@ -211,7 +203,7 @@ void ResizeFrameCols(SwFmtCol& rCol,
long nNewWishWidth = nWishSum + nWishDiff;
if(nNewWis
[Libreoffice-commits] core.git: sw/source
sw/source/ui/uiview/viewprt.cxx | 30 ++---
sw/source/ui/uiview/viewsrch.cxx | 68 +++
sw/source/ui/uiview/viewstat.cxx |5 +-
3 files changed, 41 insertions(+), 62 deletions(-)
New commits:
commit b4f480ce9bb093835c093f72bf02e22686f95997
Author: Matthias Freund
Date: Fri Jul 12 21:58:55 2013 +0200
fdo#39468 Comment translation GER-ENG in sw/source/ui/uiview (Part 5)
Change-Id: Ib4dcbce29ef5772a9405db838d904c405c0249e0
Reviewed-on: https://gerrit.libreoffice.org/4874
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/sw/source/ui/uiview/viewprt.cxx b/sw/source/ui/uiview/viewprt.cxx
index ad8c608..a1712a7 100644
--- a/sw/source/ui/uiview/viewprt.cxx
+++ b/sw/source/ui/uiview/viewprt.cxx
@@ -66,9 +66,8 @@
using namespace ::com::sun::star;
-/*
-Beschreibung: Drucker an Sfx uebergeben
- */
+// Hand over the printer to Sfx
+
SfxPrinter* SwView::GetPrinter( sal_Bool bCreate )
{
const IDocumentDeviceAccess* pIDDA =
GetWrtShell().getIDocumentDeviceAccess();
@@ -82,16 +81,15 @@ SfxPrinter* SwView::GetPrinter( sal_Bool bCreate )
return pPrt;
}
-/*
-Beschreibung: Druckerwechsel weitermelden
- */
+// Propagate printer change
+
void SetPrinter( IDocumentDeviceAccess* pIDDA, SfxPrinter* pNew, sal_Bool bWeb
)
{
SwPrintOptions* pOpt = SW_MOD()->GetPrtOptions(bWeb);
if( !pOpt)
return;
-// Applikationseigene Druckoptionen aus SfxPrinter auslesen
+// Reading Application own printing options from SfxPrinter
const SfxItemSet& rSet = pNew->GetOptions();
const SwAddPrinterItem* pAddPrinterAttr;
@@ -146,18 +144,16 @@ bool SwView::HasPrintOptionsPage() const
return true;
}
-/*
-Beschreibung: TabPage fuer applikationsspezifische Druckoptionen
- */
+// TabPage for application-specific print options
+
SfxTabPage* SwView::CreatePrintOptionsPage(Window* pParent,
const SfxItemSet& rSet)
{
return ::CreatePrintOptionsPage( pParent, rSet, sal_False );
}
-/*
-Beschreibung: Print-Dispatcher
- */
+// Print dispatcher
+
void SwView::ExecutePrint(SfxRequest& rReq)
{
sal_Bool bWeb = 0 != PTR_CAST(SwWebView, this);
@@ -247,10 +243,8 @@ void SwView::ExecutePrint(SfxRequest& rReq)
}
}
-/*
-Beschreibung: Page Drucker/Zusaetze erzeugen fuer SwView und
-SwPagePreview
- */
+// Create page printer/additions for SwView and SwPagePreview
+
SfxTabPage* CreatePrintOptionsPage( Window *pParent,
const SfxItemSet &rOptions, sal_Bool bPreview )
{
@@ -283,7 +277,7 @@ void SetAppPrintOptions( ViewShell* pSh, sal_Bool bWeb )
if( pIDDA->getPrinter( false ) )
{
-// Applikationseigene Druckoptionen in SfxPrinter schiessen
+// Close application own printing options in SfxPrinter.
SwAddPrinterItem aAddPrinterItem (FN_PARAM_ADDPRINTER, aPrtData);
SfxItemSet aSet( pSh->GetAttrPool(),
FN_PARAM_ADDPRINTER,FN_PARAM_ADDPRINTER,
diff --git a/sw/source/ui/uiview/viewsrch.cxx b/sw/source/ui/uiview/viewsrch.cxx
index 4b67059..e89b7ea 100644
--- a/sw/source/ui/uiview/viewsrch.cxx
+++ b/sw/source/ui/uiview/viewsrch.cxx
@@ -47,7 +47,7 @@
#include
#include
#include
-#include// fuer Undo-Ids
+#include// for Undo-Ids
#include
#include
#include
@@ -65,9 +65,7 @@ using namespace ::com::sun::star::i18n;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-/*
-Beschreibung: Search Parameter
- */
+//Search Parameter
struct SwSearchOptions
{
@@ -77,7 +75,6 @@ struct SwSearchOptions
SwSearchOptions( SwWrtShell* pSh, sal_Bool bBackward );
};
-
inline Window* GetParentWindow( SvxSearchDialog* m_pSrchDlg )
{
Window* pWin;
@@ -128,7 +125,7 @@ void SwView::ExecSearch(SfxRequest& rReq, sal_Bool
bNoMessage)
m_pWrtShell->LeaveBlockMode();
switch (nSlot)
{
-// erstmal Nichts tun
+// for now do nothing
case SID_SEARCH_ITEM:
{
delete m
[Libreoffice-commits] core.git: vcl/source
vcl/source/gdi/bitmapex.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dd6518d42fce1416fa00f80a7b7dead113c37752
Author: Ivan Timofeev
Date: Sun Jul 28 20:41:27 2013 +0400
fdo#67397: don't bother to create BlendFrame for width == 1 or height == 1
... because:
1) frame painted as a line doesn't make sense to me anyway;
2) it leads to x = 1 or y = 1 in createBlendFrame, while the max value for
that
variable is "width (or height) - 1", i.e. 0.
Change-Id: I7437bce6681e42cb57458c012927cf5d6bfc154f
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index e123ac2..b7dbf75 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -1251,7 +1251,7 @@ BitmapEx VCL_DLLPUBLIC createBlendFrame(
const long nW(rSize.Width());
const long nH(rSize.Height());
-if(nW && nH)
+if(nW > 1 && nH > 1)
{
sal_uInt8 aEraseTrans(0xff);
Bitmap aContent(rSize, 24);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - test/Package_unittest.mk
test/Package_unittest.mk |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a6ee4d2cc2443f61e8400a4fb11d15d2e73fec49 Author: Vishv Brahmbhatt Date: Sun Jul 28 22:16:24 2013 +0530 Made changes in the unit-test of other configuration files Unit-test path is changed for the "effects.xml" and "transitions.xml" to avoid "unit-test" error. Change-Id: Ia871b16b9b9c1bec96fa3d208dc9171c287b020a diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk index 83b2dba..6df47f7 100644 --- a/test/Package_unittest.mk +++ b/test/Package_unittest.mk @@ -22,9 +22,9 @@ $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/tem $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/standard.bau,user/autotext/en-US/standard.bau)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/crdbus50.bau,user/autotext/en-US/crdbus50.bau)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetup.xpm,user/config/psetup.xpm)) -$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml)) +$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml)) -$(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml)) +$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/layoutlist.xml,user/config/soffice.cfg/simpress/layoutlist.xml)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/modules/empty_directory,user/config/soffice.cfg/modules/empty_directory)) $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetupl.xpm,user/config/psetupl.xpm)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - sd/source sd/xml
sd/source/core/sdpage.cxx | 18 sd/xml/layoutlist.xml | 49 +- 2 files changed, 58 insertions(+), 9 deletions(-) New commits: commit e187f3a747033f8efc71699434ab46a5a07b4077 Author: Vishv Brahmbhatt Date: Sun Jul 28 21:50:34 2013 +0530 Added few more new samples to "layoutlist.xml" New samples are added to "layoutlist.xml" and corresponding changes are made in the "sdpage.cxx". Few changes are still left to be made in the values,which will be done in the next commit. Change-Id: Ia388f416906f4416ec596ae4631a51940e6ccf93 diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index c244da6..a7d4b51 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -1321,6 +1321,24 @@ rtl::OUString enumtoString(AutoLayout aut) case AUTOLAYOUT_TITLE_4CONTENT: retstr="AUTOLAYOUT_TITLE_4CONTENT"; break; +case AUTOLAYOUT_ONLY_TEXT: +retstr="AUTOLAYOUT_ONLY_TEXT"; +break; +case AUTOLAYOUT_TITLE_ONLY: +retstr="AUTOLAYOUT_TITLE_ONLY"; +break; +case AUTOLAYOUT_TITLE_6CONTENT: +retstr="AUTOLAYOUT_TITLE_6CONTENT"; +break; +case AUTOLAYOUT__START: +retstr="AUTOLAYOUT__START"; +break; +case AUTOLAYOUT_TITLE_2CONTENT_CONTENT: +retstr="AUTOLAYOUT_TITLE_2CONTENT_CONTENT"; +break; +case AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT: +retstr="AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT"; +break; default: retstr="unknown"; break; diff --git a/sd/xml/layoutlist.xml b/sd/xml/layoutlist.xml index 88ec811..82424b0 100644 --- a/sd/xml/layoutlist.xml +++ b/sd/xml/layoutlist.xml @@ -3,30 +3,61 @@ --> - - + + - + - + - - - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - xmloff/source
xmloff/source/forms/elementimport.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 5038dba4783e69c94acbf61858b39ad7055cbc56 Author: Lionel Elie Mamane Date: Sun Jul 28 16:10:17 2013 +0200 surely this is a typo Change-Id: Ic7a6b330094c597aaed09377cde55c2e7be1b08f Reviewed-on: https://gerrit.libreoffice.org/5152 Reviewed-by: Norbert Thiebaud Tested-by: Norbert Thiebaud diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx index 9d180b0..ae66105 100644 --- a/xmloff/source/forms/elementimport.cxx +++ b/xmloff/source/forms/elementimport.cxx @@ -717,8 +717,8 @@ namespace xmloff case OControlElement::IMAGE_FRAME: pServiceName = "com.sun.star.form.component.DatabaseImageControl"; break; case OControlElement::HIDDEN:pServiceName = "com.sun.star.form.component.HiddenControl"; break; case OControlElement::GRID: pServiceName = "com.sun.star.form.component.GridControl"; break; -case OControlElement::TIME: pServiceName = "com.sun.star.form.component.DateField"; break; -case OControlElement::DATE: pServiceName = "com.sun.star.form.component.TimeField"; break; +case OControlElement::TIME: pServiceName = "com.sun.star.form.component.TimeField"; break; +case OControlElement::DATE: pServiceName = "com.sun.star.form.component.DateField"; break; default: break; } if ( pServiceName != NULL ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - extensions/source forms/source solenv/gdb svx/source toolkit/source vcl/source xmloff/source
extensions/source/propctrlr/formcomponenthandler.cxx |9 +
forms/source/component/FormComponent.cxx | 33 ---
solenv/gdb/libreoffice/tl.py | 20 +--
svx/source/fmcomp/gridcell.cxx |4 ++
svx/source/form/fmobjfac.cxx |2 +
toolkit/source/controls/unocontrols.cxx |1
vcl/source/control/field2.cxx| 10 +++--
xmloff/source/core/xmlimp.cxx|9 -
xmloff/source/forms/elementexport.cxx|4 ++
xmloff/source/forms/elementimport.cxx| 16 ++---
10 files changed, 76 insertions(+), 32 deletions(-)
New commits:
commit e39a959429234aef5348a8b5800b27c29de02a6f
Author: Lionel Elie Mamane
Date: Sun Jul 28 16:10:17 2013 +0200
surely this is a typo
Change-Id: Ic7a6b330094c597aaed09377cde55c2e7be1b08f
diff --git a/xmloff/source/forms/elementimport.cxx
b/xmloff/source/forms/elementimport.cxx
index a75a8a0..9f451b7 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -720,8 +720,8 @@ namespace xmloff
case OControlElement::IMAGE_FRAME: pServiceName =
"com.sun.star.form.component.DatabaseImageControl"; break;
case OControlElement::HIDDEN:pServiceName =
"com.sun.star.form.component.HiddenControl"; break;
case OControlElement::GRID: pServiceName =
"com.sun.star.form.component.GridControl"; break;
-case OControlElement::TIME: pServiceName =
"com.sun.star.form.component.DateField"; break;
-case OControlElement::DATE: pServiceName =
"com.sun.star.form.component.TimeField"; break;
+case OControlElement::TIME: pServiceName =
"com.sun.star.form.component.TimeField"; break;
+case OControlElement::DATE: pServiceName =
"com.sun.star.form.component.DateField"; break;
default: break;
}
if ( pServiceName != NULL )
commit b7f90b8f1e3324417e3618dd90811295466676d4
Author: Lionel Elie Mamane
Date: Sun Jul 28 15:56:25 2013 +0200
protect against past-the-end access of empty string
Change-Id: I4518d1a2795f4775aec7f3eb495e39afe30ec7be
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index a6b8782..be0f9e1 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -2290,13 +2290,13 @@ static bool ImplTimeGetValue( const OUString& rStr,
Time& rTime,
return false;
nSepPos = aStr.indexOf( rLocaleDataWrapper.getTimeSep() );
-if ( aStr[0] == '-' )
+if ( !aStr.isEmpty() && aStr[0] == '-' )
bNegative = true;
if ( nSepPos >= 0 )
{
if ( !ImplCutTimePortion( aStr, nSepPos,
_bSkipInvalidCharacters, &nSecond ) )
return false;
-if ( aStr[0] == '-' )
+if ( !aStr.isEmpty() && aStr[0] == '-' )
bNegative = true;
n100Sec = (short)aStr.toString().toInt32();
}
@@ -2320,7 +2320,7 @@ static bool ImplTimeGetValue( const OUString& rStr, Time&
rTime,
aStr.remove( 0, nSepPos+1 );
nSepPos = aStr.indexOf( rLocaleDataWrapper.getTimeSep() );
-if ( aStr[0] == '-' )
+if ( !aStr.isEmpty() && aStr[0] == '-' )
bNegative = true;
if ( nSepPos >= 0 )
{
@@ -2329,7 +2329,7 @@ static bool ImplTimeGetValue( const OUString& rStr, Time&
rTime,
aStr.remove( 0, nSepPos+1 );
nSepPos = aStr.indexOf( rLocaleDataWrapper.getTimeSep() );
-if ( aStr[0] == '-' )
+if ( !aStr.isEmpty() && aStr[0] == '-' )
bNegative = true;
if ( nSepPos >= 0 )
{
commit a6f3beadde3ed3636fbcce1592a30af7ed146009
Author: Lionel Elie Mamane
Date: Sun Jul 28 15:53:00 2013 +0200
Adapt gdb python pretty-printer to time nano-second precision API change
Change-Id: I416d98a298f00ae445a480c738a47758544d317c
diff --git a/solenv/gdb/libreoffice/tl.py b/solenv/gdb/libreoffice/tl.py
index 71ff822..7c18a95 100644
--- a/solenv/gdb/libreoffice/tl.py
+++ b/solenv/gdb/libreoffice/tl.py
@@ -149,27 +149,27 @@ class DatePrinter(object):
class TimeImpl(DateTimeImpl):
-def __init__(self, hour, minute, second, hundreth_of_second = 0):
+def __init__(self, hour, minute, second, nanosecond = 0):
super(TimeImpl, self).__init__(None, self)
self.hour = hour
self.minute = minute
self.second = second
-self.hundreth_of_second = hundreth_of_second
+self.nanosecond = nanosecond
def __str__(self):
decimal = ''
-if self.hundreth_of_second != 0:
-decimal = '.%d' % self.hundreth_of_second
-ret
[Libreoffice-commits] core.git: vcl/source
vcl/source/filter/GraphicNativeTransform.cxx | 65 ++-
1 file changed, 35 insertions(+), 30 deletions(-)
New commits:
commit 698315531414b223b35d8507fdf2f56dbcf6bc4c
Author: Tomaž Vajngerl
Date: Sun Jul 28 15:52:14 2013 +0200
fdo#66006 Convert to PNG for JPEG that can't be losslessly rotated
If a JPEG image has a width or height which is not a multiple of 16
(width/heigh % 16 != 0) then it can't be completelly lossleessly
rotated (the last uncomplete MCUs can't be rotated) and the image
is cropped on the lower size. To prevent this such JPEG images
must be rotated to PNG to prevent loss. Afterwards image can still
be compressed with "Compress Graphic Dialog".
Change-Id: Ie2803512a93bba55573bf66c547f132f37cba711
diff --git a/vcl/source/filter/GraphicNativeTransform.cxx
b/vcl/source/filter/GraphicNativeTransform.cxx
index 261ad90..69a10bd 100644
--- a/vcl/source/filter/GraphicNativeTransform.cxx
+++ b/vcl/source/filter/GraphicNativeTransform.cxx
@@ -141,45 +141,50 @@ bool GraphicNativeTransform::rotateGeneric(sal_uInt16
aRotation, OUString aType)
bool GraphicNativeTransform::rotateJPEG(sal_uInt16 aRotation)
{
-GfxLink aLink = mrGraphic.GetLink();
-
-SvMemoryStream aSourceStream;
-aSourceStream.Write(aLink.GetData(), aLink.GetDataSize());
-aSourceStream.Seek( STREAM_SEEK_TO_BEGIN );
-
-Orientation aOrientation = TOP_LEFT;
+BitmapEx aBitmap = mrGraphic.GetBitmapEx();
-Exif exif;
-if ( exif.read(aSourceStream) )
+if (aBitmap.GetSizePixel().Width() % 16 != 0 ||
+aBitmap.GetSizePixel().Height() % 16 != 0 )
{
-aOrientation = exif.getOrientation();
+rotateGeneric(aRotation, OUString("png"));
}
+else
+{
+GfxLink aLink = mrGraphic.GetLink();
-SvMemoryStream aTargetStream;
-JpegTransform tranform(aSourceStream, aTargetStream);
-tranform.setRotate(aRotation);
-tranform.perform();
+SvMemoryStream aSourceStream;
+aSourceStream.Write(aLink.GetData(), aLink.GetDataSize());
+aSourceStream.Seek( STREAM_SEEK_TO_BEGIN );
-aTargetStream.Seek( STREAM_SEEK_TO_BEGIN );
+Orientation aOrientation = TOP_LEFT;
-// Reset orientation in exif if needed
-if ( exif.hasExif() && aOrientation != TOP_LEFT)
-{
-exif.setOrientation(TOP_LEFT);
-exif.write(aTargetStream);
-}
+Exif exif;
+if ( exif.read(aSourceStream) )
+{
+aOrientation = exif.getOrientation();
+}
-aTargetStream.Seek( STREAM_SEEK_TO_END );
-sal_uInt32 aBufferSize = aTargetStream.Tell();
-sal_uInt8* pBuffer = new sal_uInt8[ aBufferSize ];
+SvMemoryStream aTargetStream;
+JpegTransform tranform(aSourceStream, aTargetStream);
+tranform.setRotate(aRotation);
+tranform.perform();
-aTargetStream.Seek( STREAM_SEEK_TO_BEGIN );
-aTargetStream.Read( pBuffer, aBufferSize );
+aTargetStream.Seek( STREAM_SEEK_TO_BEGIN );
-BitmapEx aBitmap = mrGraphic.GetBitmapEx();
-aBitmap.Rotate(aRotation, COL_BLACK);
-mrGraphic = aBitmap;
-mrGraphic.SetLink( GfxLink( pBuffer, aBufferSize, aLink.GetType(),
sal_True ) );
+// Reset orientation in exif if needed
+if ( exif.hasExif() && aOrientation != TOP_LEFT)
+{
+exif.setOrientation(TOP_LEFT);
+exif.write(aTargetStream);
+}
+
+aTargetStream.Seek( STREAM_SEEK_TO_BEGIN );
+
+Graphic aGraphic;
+GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
+rFilter.ImportGraphic( aGraphic, OUString("import"), aTargetStream );
+mrGraphic = aGraphic;
+}
return true;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/AllLangResTarget_sw.mk sw/source sw/uiconfig sw/UIConfig_swriter.mk
sw/AllLangResTarget_sw.mk |1
sw/UIConfig_swriter.mk |1
sw/source/ui/sidebar/WrapPropertyPanel.cxx | 74 ++---
sw/source/ui/sidebar/WrapPropertyPanel.hrc | 38 --
sw/source/ui/sidebar/WrapPropertyPanel.hxx | 16 +-
sw/source/ui/sidebar/WrapPropertyPanel.src | 86 ---
sw/uiconfig/swriter/ui/sidebarwrap.ui | 158 +
7 files changed, 205 insertions(+), 169 deletions(-)
New commits:
commit b5e3929a35965f32638a80c3627b98f4fa306875
Author: Jan Holesovsky
Date: Sun Jul 28 15:53:47 2013 +0200
sidebar: Make WrapPropertyPanel .ui resizable.
Change-Id: I75b7a9e42f937528897114b1d056716ebdce697d
diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui
b/sw/uiconfig/swriter/ui/sidebarwrap.ui
index 1f04ff3..d964341 100644
--- a/sw/uiconfig/swriter/ui/sidebarwrap.ui
+++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui
@@ -17,16 +17,18 @@
True
False
+6
+True
-30
-30
+False
True
True
False
None
None
.uno:WrapOff
+False
0
True
True
@@ -34,20 +36,19 @@
False
True
-10
0
-30
-30
+False
True
True
False
Before
Before
.uno:WrapLeft
+False
0
True
True
@@ -55,20 +56,19 @@
False
True
-10
1
-30
-30
+False
True
True
False
After
After
.uno:WrapRight
+False
0
True
True
@@ -76,20 +76,19 @@
False
True
-10
2
-30
-30
+False
True
True
False
Parallel
Parallel
.uno:WrapOn
+False
0
True
True
@@ -97,20 +96,19 @@
False
True
-10
3
-30
-30
+False
True
True
False
Through
Through
.uno:WrapThrough
+False
0
True
True
@@ -118,20 +116,19 @@
False
True
-10
4
-30
-30
+False
True
True
False
Optimal
Optimal
.uno:WrapIdeal
+False
0
True
True
@@ -139,7 +136,6 @@
False
True
-10
5
commit 9c3191bf0ecf42f4ce96a10aa2e3be4faa851557
Author: Jan Holesovsky
Date: Sun Jul 28 15:43:00 2013 +0200
sidebar: Small cleanup in WrapPropertyPanel.
Change-Id: Ie751dfef7ce48942a51577979e16b88a52919f56
diff --git a/sw/source/ui/sidebar/WrapPropertyPanel.cxx
b/sw/source/ui/sidebar/WrapPropertyPanel.cxx
index a07be42..ada6e72 100644
--- a/sw/source/ui/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/ui/sidebar/WrapPropertyPanel.cxx
@@ -38,9 +38,6 @@ const char UNO_WRAPON[] = ".uno:WrapOn";
const char UNO_WRAPTHROUGH[] = ".uno:WrapThrough";
const char UNO_WRAPIDEAL[] = ".uno:WrapIdeal";
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
-
namespace sw { namespace sidebar {
WrapPropertyPanel* WrapPropertyPanel::Create (
@@ -49,11 +46,11 @@ WrapPropertyPanel* WrapPropertyPanel::Create (
SfxBindings* pBindings)
{
if (pParent == NULL)
-throw ::com::sun::star::lang::IllegalArgumentException(A2S("no parent
Window given to WrapPropertyPanel::Create"), NULL, 0);
+throw ::com::sun::star::lang::IllegalArgumentException("
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svl/inc sw/inc sw/source
svl/inc/svl/style.hxx |4 ++--
sw/inc/docstyle.hxx |4
sw/source/ui/app/docstyle.cxx | 19 ++-
3 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit c83026ede5a9ae57683b92d1919e874696024944
Author: Michael Stahl
Date: Fri Jul 26 17:05:24 2013 +0200
fdo#67303: sw: speed up setting IsHidden property on styles
Importing an ODF document with 4089 styles is ridiculously slow,
spending most of the time in SwStyleSheetIterator::First() to reset
an existing iterator.
Since the SwStyleSheetIterator can handle the case when First() has not
been called anyway, just add a new method that resets the bFirstCalled
flag, which takes next to no time.
(regression from a0dcf961879ab644a52f801f65466756cb144b72)
(cherry picked from commit 8fb210a2ddc0b09288316cf459bebfe196ea94fb)
Conflicts:
svl/inc/svl/style.hxx
Change-Id: I8741b4c0cd51f8c244462ce28a754abc427d0df3
Reviewed-on: https://gerrit.libreoffice.org/5138
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 48557c5..cfe1a9b 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -202,9 +202,9 @@ friend class SfxStyleSheetBase;
SfxStyleSheetBasePool_Impl *pImp;
-private:
-SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl();
protected:
+SfxStyleSheetIterator& GetIterator_Impl();
+
String aAppName;
SfxItemPool&rPool;
SfxStyles aStyles;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 42d1b92..b4245b5 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -175,6 +175,8 @@ public:
virtual SfxStyleSheetBase* Find(const rtl::OUString& rStr);
virtual void Notify( SfxBroadcaster&, const SfxHint& );
+
+void InvalidateIterator();
};
@@ -218,6 +220,8 @@ public:
virtual void SAL_CALL acquire( ) throw ();
virtual void SAL_CALL release( ) throw ();
+void InvalidateIterator();
+
protected:
virtual ~SwDocStyleSheetPool();
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 4a8458a..3c9da90 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -511,7 +511,8 @@ void SwDocStyleSheet::SetHidden( sal_Bool bValue )
if( bChg )
{
-pPool->First(); // internal list has to be updated
+// calling pPool->First() here would be quite slow...
+dynamic_cast(pPool)->InvalidateIterator(); //
internal list has to be updated
pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this )
);
SwEditShell* pSh = rDoc.GetEditShell();
if( pSh )
@@ -2853,6 +2854,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
SfxStyleSheetBase* SwStyleSheetIterator::Next()
{
+assert(bFirstCalled);
++nLastPos;
if(!aLst.empty() && nLastPos < aLst.size())
{
@@ -2947,6 +2949,21 @@ void SwStyleSheetIterator::AppendStyleList(const
boost::ptr_vector& rLis
}
}
+void SwDocStyleSheetPool::InvalidateIterator()
+{
+
dynamic_cast(GetIterator_Impl()).InvalidateIterator();
+}
+
+void SwStyleSheetIterator::InvalidateIterator()
+{
+// potentially we could send an SfxHint to Notify but currently it's
+// iterating over the vector anyway so would still be slow - why does
+// this iterator not use a map?
+bFirstCalled = false;
+nLastPos = 0;
+aLst.Erase();
+}
+
void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// search and remove from View-List!!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source
sc/source/core/tool/interpr1.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit c8fb4f13309ffecbaa72e0108315bb917ea33064 Author: Kohei Yoshida Date: Sat Jul 27 16:33:00 2013 -0400 fdo#61201: Don't forget to calculate row offset for external single ref. Change-Id: Ie3dbf2eeba98a60aa2426b1db35ac885102d3821 (cherry picked from commit 8b96cfd6caedbad7b3b79e57421a834f18c5c511) Reviewed-on: https://gerrit.libreoffice.org/5143 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 5ee90fa..c4d8389 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -7958,6 +7958,7 @@ void ScInterpreter::ScOffset() nCol1 = (SCCOL)((long)nCol1+nColPlus); nRow1 = (SCROW)((long)nRow1+nRowPlus); nCol2 = (SCCOL)((long)nCol1+nColNew-1); +nRow2 = (SCROW)((long)nRow1+nRowNew-1); nTab2 = nTab1; if (!ValidCol(nCol1) || !ValidRow(nRow1) || !ValidCol(nCol2) || !ValidRow(nRow2)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - basegfx/source
basegfx/source/vector/b2dvector.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3ccdc5aa26cdde6e7780005d010c263c73aa638f
Author: Armin Le Grand
Date: Mon Jun 10 12:45:36 2013 +
fdo#60282 fdo#66745 i#122509 Corrected typo in basegfx
(cherry picked from commit cdf48cfdbdb5348b259f4632790ffd178fcad1f7)
(cherry picked from commit 744244997da79ca95278249eeadf716730fffd82)
Signed-off-by: Michael Stahl
Change-Id: Iaa62acc4901c3edd31d0af7c642327dddf07f562
Reviewed-on: https://gerrit.libreoffice.org/5144
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/basegfx/source/vector/b2dvector.cxx
b/basegfx/source/vector/b2dvector.cxx
index 5628bbe..e5ac9bf 100644
--- a/basegfx/source/vector/b2dvector.cxx
+++ b/basegfx/source/vector/b2dvector.cxx
@@ -112,7 +112,7 @@ namespace basegfx
if(!fTools::equalZero(fLenNow))
{
-const double fOne(10.0);
+const double fOne(1.0);
if(!fTools::equal(fOne, fLenNow))
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/svl sw/inc sw/source
include/svl/style.hxx |4 ++--
sw/inc/docstyle.hxx |4
sw/source/ui/app/docstyle.cxx | 19 ++-
3 files changed, 24 insertions(+), 3 deletions(-)
New commits:
commit a82d8e86dd372f624b8c3b075582084ba237227c
Author: Michael Stahl
Date: Fri Jul 26 17:05:24 2013 +0200
fdo#67303: sw: speed up setting IsHidden property on styles
Importing an ODF document with 4089 styles is ridiculously slow,
spending most of the time in SwStyleSheetIterator::First() to reset
an existing iterator.
Since the SwStyleSheetIterator can handle the case when First() has not
been called anyway, just add a new method that resets the bFirstCalled
flag, which takes next to no time.
(regression from a0dcf961879ab644a52f801f65466756cb144b72)
(cherry picked from commit 8fb210a2ddc0b09288316cf459bebfe196ea94fb)
Conflicts:
include/svl/style.hxx
Change-Id: I8741b4c0cd51f8c244462ce28a754abc427d0df3
Reviewed-on: https://gerrit.libreoffice.org/5136
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/include/svl/style.hxx b/include/svl/style.hxx
index af58cbc..9708231 100644
--- a/include/svl/style.hxx
+++ b/include/svl/style.hxx
@@ -204,9 +204,9 @@ friend class SfxStyleSheetBase;
SfxStyleSheetBasePool_Impl *pImp;
-private:
-SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl();
protected:
+SfxStyleSheetIterator& GetIterator_Impl();
+
String aAppName;
SfxItemPool&rPool;
SfxStyles aStyles;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 90a049e..6057a10 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -175,6 +175,8 @@ public:
virtual SfxStyleSheetBase* Find(const OUString& rStr);
virtual void Notify( SfxBroadcaster&, const SfxHint& );
+
+void InvalidateIterator();
};
@@ -217,6 +219,8 @@ public:
virtual void SAL_CALL acquire( ) throw ();
virtual void SAL_CALL release( ) throw ();
+void InvalidateIterator();
+
protected:
virtual ~SwDocStyleSheetPool();
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index 934f717..b0f1701 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -476,7 +476,8 @@ void SwDocStyleSheet::SetHidden( sal_Bool bValue )
if( bChg )
{
-pPool->First(); // internal list has to be updated
+// calling pPool->First() here would be quite slow...
+dynamic_cast(pPool)->InvalidateIterator(); //
internal list has to be updated
pPool->Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_MODIFIED, *this )
);
SwEditShell* pSh = rDoc.GetEditShell();
if( pSh )
@@ -2772,6 +2773,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
SfxStyleSheetBase* SwStyleSheetIterator::Next()
{
+assert(bFirstCalled);
++nLastPos;
if(!aLst.empty() && nLastPos < aLst.size())
{
@@ -2866,6 +2868,21 @@ void SwStyleSheetIterator::AppendStyleList(const
boost::ptr_vector& rLis
}
}
+void SwDocStyleSheetPool::InvalidateIterator()
+{
+
dynamic_cast(GetIterator_Impl()).InvalidateIterator();
+}
+
+void SwStyleSheetIterator::InvalidateIterator()
+{
+// potentially we could send an SfxHint to Notify but currently it's
+// iterating over the vector anyway so would still be slow - why does
+// this iterator not use a map?
+bFirstCalled = false;
+nLastPos = 0;
+aLst.Erase();
+}
+
void SwStyleSheetIterator::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
// search and remove from View-List!!
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Bug 60270 depends on bug 67246, which changed state. Bug 67246 Summary: FILEOPEN General input/output error for particular xls file https://bugs.freedesktop.org/show_bug.cgi?id=67246 What|Removed |Added Status|ASSIGNED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/qa writerfilter/source
sw/qa/extras/rtfimport/data/fdo67365.rtf | 35 +
sw/qa/extras/rtfimport/rtfimport.cxx | 17
writerfilter/source/rtftok/rtfdocumentimpl.cxx |8 -
3 files changed, 58 insertions(+), 2 deletions(-)
New commits:
commit 336efde38d46fcf57ae7937c2ce4ffd35f052a10
Author: Miklos Vajna
Date: Sat Jul 27 00:06:51 2013 +0200
fdo#67365 fix RTF import of inherited row props wrt unusual group stack
Inheriting row properties (in particular, the number of cells) should be
independent from the RTF parser stack, but they were not.
Also fix two more problems once the lost rows reappeared:
- unequal cell widths were equal
- some cells were aligned to center instead of to left
(cherry picked from commits 494937776956370eda868f91922c4cff34656050,
986ebb668d45a42bc1e8b744980619857e891ef5,
165cd8332a0844314e698cf59936799676257ea1 and
83e0489217fd4b0fcf3ab62d002257b47e7a6459)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: I273d89a0708601a38dd8bda734a72b4c92da2cc4
Reviewed-on: https://gerrit.libreoffice.org/5137
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sw/qa/extras/rtfimport/data/fdo67365.rtf
b/sw/qa/extras/rtfimport/data/fdo67365.rtf
new file mode 100755
index 000..07755cc
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo67365.rtf
@@ -0,0 +1,35 @@
+{\rtf1
+\paperw11906\paperh16838\margl1134\margr567\margt851\margb567
\widowctrl\ftnbj\aenddoc\hyphcaps0\formshade\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot
\fet0
+\sectd \linex0\headery397\footery397\colsx709\endnhere\sectdefaultcl
+\trowd \trgaph28\trleft-28\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr \brdrs\brdrw10 \cltxlrtb
\cellx5387\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx10206
+\pard \li57\widctlpar\intbl\adjustright
+{\fs22 A1\cell }
+\pard \qc\widctlpar\intbl\adjustright
+{\fs22
+\cell }
+\pard \widctlpar\intbl\adjustright
+{\fs22 \row }
+\trowd \trgaph28\trleft-28\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10
\trbrdrv\brdrs\brdrw10 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb
\cellx5387\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx10206
+\pard \li57\widctlpar\intbl\adjustright
+{
+\fs22 A2\cell }
+\pard \qc\widctlpar\intbl\adjustright
+{\fs22 \cell }
+\pard \widctlpar\intbl\adjustright
+{\fs22 \row }
+\pard \li57\widctlpar\intbl\adjustright
+{\fs22 A3\cell }
+\pard
+\qc\widctlpar\intbl\adjustright
+{\fs22 \cell }
+\pard \widctlpar\intbl\adjustright
+{\fs22 \row }
+\trowd \trgaph28\trleft-28\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10
\trbrdrb\brdrs\brdrw10 \trbrdrr\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv
\brdrs\brdrw10 \clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb
\cellx5387\clvertalt\clbrdrt\brdrs\brdrw10 \clbrdrl\brdrs\brdrw10
\clbrdrb\brdrs\brdrw10 \clbrdrr\brdrs\brdrw10 \cltxlrtb \cellx10206
+\pard \li57\widctlpar\intbl\adjustright
+{\fs22 A4\cell \cell }
+\pard \widctlpar\intbl\adjustright
+{\fs22 \row }
+\pard \qj\sb120\widctlpar\adjustright
+foo
+\par
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 9a6974f..455c3a2 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -147,6 +147,7 @@ public:
void testFdo66565();
void testFdo54900();
void testFdo64637();
+void testFdo67365();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -281,6 +282,7 @@ void Test::run()
{"fdo66565.rtf", &Test::testFdo66565},
{"fdo54900.rtf", &Test::testFdo54900},
{"fdo64637.rtf", &Test::testFdo64637},
+{"fdo67365.rtf", &Test::testFdo67365},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1353,6 +1355,21 @@ void Test::testFdo64637()
CPPUNIT_ASSERT_EQUAL(OUString("bbb"), getProperty(xPropertySet,
"Company"));
}
+void Test::testFdo67365()
+{
+uno::Reference xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+uno::Reference
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
+uno::Reference xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
+uno::Reference xRows = xTable->getRows();
+// The table only had 3 rows.
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), xRows->getCount());
+// This was 4999, i.e. the two cells of the row had equal widths instead
of a larger and a smaller cell.
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/core/tool/interpr1.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 9f2d5c46e372c4337ba04f627c32bac007431eb5 Author: Kohei Yoshida Date: Sat Jul 27 16:33:00 2013 -0400 fdo#61201: Don't forget to calculate row offset for external single ref. Change-Id: Ie3dbf2eeba98a60aa2426b1db35ac885102d3821 (cherry picked from commit 8b96cfd6caedbad7b3b79e57421a834f18c5c511) Reviewed-on: https://gerrit.libreoffice.org/5142 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index c673d23..29050bb 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -8082,6 +8082,7 @@ void ScInterpreter::ScOffset() nCol1 = (SCCOL)((long)nCol1+nColPlus); nRow1 = (SCROW)((long)nRow1+nRowPlus); nCol2 = (SCCOL)((long)nCol1+nColNew-1); +nRow2 = (SCROW)((long)nRow1+nRowNew-1); nTab2 = nTab1; if (!ValidCol(nCol1) || !ValidRow(nRow1) || !ValidCol(nCol2) || !ValidRow(nRow2)) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source
sc/source/ui/unoobj/exceldetect.cxx | 18 ++
1 file changed, 14 insertions(+), 4 deletions(-)
New commits:
commit 8c1e1d99f10894718975300a052358de7e3fef2c
Author: Kohei Yoshida
Date: Sat Jul 27 20:00:51 2013 -0400
fdo#67246: Detect BIFF 2 (and 3) file format like we should.
(cherry picked from commit b46688a663b8709e0e0795f25ef8961db1f46cba)
Change-Id: I1421cca4b0ef8e9410aab5725cc5a8d9cffef7a9
Reviewed-on: https://gerrit.libreoffice.org/5145
Reviewed-by: Fridrich Strba
Tested-by: Fridrich Strba
diff --git a/sc/source/ui/unoobj/exceldetect.cxx
b/sc/source/ui/unoobj/exceldetect.cxx
index db040e3..fb15a3c 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -74,6 +74,10 @@ bool hasStream(const uno::Reference&
xInStream, const OUString
return xStorage->IsStream(rName);
}
+/**
+ * We detect BIFF 2, 3 and 4 file types together since the only thing that
+ * set them apart is the BOF ID.
+ */
bool isExcel40(const uno::Reference& xInStream)
{
SfxMedium aMedium;
@@ -93,12 +97,18 @@ bool isExcel40(const uno::Reference&
xInStream)
sal_uInt16 nBofId, nBofSize;
*pStream >> nBofId >> nBofSize;
-if (nBofId != 0x0409)
-// This ID signifies Excel 4.0 format. It must be 0x0409.
-return false;
+switch (nBofId)
+{
+case 0x0009: // Excel 2.1 worksheet (BIFF 2)
+case 0x0209: // Excel 3.0 worksheet (BIFF 3)
+case 0x0409: // Excel 4.0 worksheet (BIFF 4)
+break;
+default:
+return false;
+}
if (nBofSize < 4 || 16 < nBofSize)
-// BOF record must be sized between 4 and 16 for Excel 4.0 stream.
+// BOF record must be sized between 4 and 16 for BIFF 2, 3 and 4.
return false;
sal_Size nPos = pStream->Tell();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit a04ae4adb001d69711c42637da725e1f28b5aa23 Author: Fridrich Å trba Date: Sun Jul 28 14:43:29 2013 +0200 Revert helpcontent2 changes of a9ae9aefe8384a81dd79827cb76daa9ed8b58dbc Change-Id: If4940b17bcee0d06fa8dc9bf9faa708cf6d0db1c diff --git a/helpcontent2 b/helpcontent2 index bbc9b57..9d98445 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit bbc9b572ea5b709b0df30428bbaeb45936263dc2 +Subproject commit 9d984456abaefb364a6b5f77928dfc14e2c571c1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/source
sc/source/filter/excel/xestyle.cxx | 20 ++--
sc/source/filter/inc/xestyle.hxx |1 +
2 files changed, 15 insertions(+), 6 deletions(-)
New commits:
commit 244821c0df2baca727d0e770ed9906be713b0be1
Author: Akash Shetye
Date: Sun Jul 28 17:53:04 2013 +0530
Patch adds check for ensuring atleast one table style exists
Earlier code just added a new style and did not perform any checks to
ensure atleast one style was present, this stops excel from creating empty
table style tags.
Change-Id: Ib83e8001410b65aa129fb22b032956c9bd7e1ddd
diff --git a/sc/source/filter/excel/xestyle.cxx
b/sc/source/filter/excel/xestyle.cxx
index 11c3faf..2e0a74e 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3212,6 +3212,9 @@ void XclExpTableStyle::SaveXml( XclExpXmlStream& rStrm )
XclExpTableStyles::XclExpTableStyles( const XclExpRoot& rRoot, XclExpDxfs&
rDxfs )
:XclExpRoot( rRoot )
{
+//Set the has table styles member to false, for conditions when there is
not
+//table style defined.
+mbHasTableStyles = false;
//Search through the collection of ScDBData (Database Ranges)
//checking for any table styles associated with them
miCount = 0;
@@ -3232,10 +3235,12 @@ XclExpTableStyles::XclExpTableStyles( const XclExpRoot&
rRoot, XclExpDxfs& rDxfs
*/
ScDBDataFormatting aDBFormatting;
(*itr).GetTableFormatting( aDBFormatting );
-if( &(aDBFormatting) )//Probably non-standard?
+if( &(aDBFormatting)!=NULL )//Probably non-standard?
{
miCount++;
maStyleContainer.push_back( new XclExpTableStyle( rRoot,
aDBFormatting, rDxfs ) );
+//We have atleast one style so mbHasTableStyles needs to be set
+mbHasTableStyles = true;
}
}
}
@@ -3247,13 +3252,16 @@ XclExpTableStyles::~XclExpTableStyles()
void XclExpTableStyles::SaveXml( XclExpXmlStream& rStrm )
{
-sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
-rStyleSheet->startElement( XML_tableStyles, XML_count,
OString::number(miCount).getStr(), FSEND );
-for ( StyleContainer::iterator itr = maStyleContainer.begin(); itr !=
maStyleContainer.end(); ++itr )
+if( mbHasTableStyles ) //If it has table styles only then start the element
{
-itr->SaveXml( rStrm );
+sax_fastparser::FSHelperPtr& rStyleSheet = rStrm.GetCurrentStream();
+rStyleSheet->startElement( XML_tableStyles, XML_count,
OString::number(miCount).getStr(), FSEND );
+for ( StyleContainer::iterator itr = maStyleContainer.begin(); itr !=
maStyleContainer.end(); ++itr )
+{
+itr->SaveXml( rStrm );
+}
+rStyleSheet->endElement( XML_tableStyles );
}
-rStyleSheet->endElement( XML_tableStyles );
}
//
diff --git a/sc/source/filter/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx
index a4e6017..d8d3031 100644
--- a/sc/source/filter/inc/xestyle.hxx
+++ b/sc/source/filter/inc/xestyle.hxx
@@ -804,6 +804,7 @@ private:
typedef boost::ptr_vector< XclExpTableStyle > StyleContainer;
StyleContainer maStyleContainer;
int miCount;
+bool mbHasTableStyles;
};
//
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2 include/vcl sfx2/source vcl/aqua vcl/headless vcl/inc vcl/source vcl/unx vcl/win
helpcontent2 |2 +-
include/vcl/svapp.hxx|2 +-
sfx2/source/appl/sfxpicklist.cxx |4 +++-
sfx2/source/doc/objstor.cxx |3 ++-
vcl/aqua/source/app/salinst.cxx |2 +-
vcl/headless/svpinst.cxx |2 +-
vcl/inc/aqua/salinst.h |2 +-
vcl/inc/headless/svpinst.hxx |2 +-
vcl/inc/salinst.hxx |2 +-
vcl/inc/unx/gtk/gtkinst.hxx |2 +-
vcl/inc/unx/salinst.h|2 +-
vcl/inc/win/salinst.h|2 +-
vcl/source/app/svapp.cxx |4 ++--
vcl/unx/generic/app/salinst.cxx |6 +++---
vcl/unx/gtk/app/gtkinst.cxx |4 ++--
vcl/win/source/app/salinst.cxx |2 +-
16 files changed, 23 insertions(+), 20 deletions(-)
New commits:
commit a9ae9aefe8384a81dd79827cb76daa9ed8b58dbc
Author: Fridrich Å trba
Date: Sun Jul 28 13:53:02 2013 +0200
Make AddToRecentDocumentList aware of the DocumentService
This information helps to map a document with an application ID
needed for Windows 7 shell integration.
Change-Id: I1224f566037ab7597a29b16f310f93d9f5441cce
diff --git a/helpcontent2 b/helpcontent2
index 9d98445..bbc9b57 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9d984456abaefb364a6b5f77928dfc14e2c571c1
+Subproject commit bbc9b572ea5b709b0df30428bbaeb45936263dc2
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 2ceb713..fa91031 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -383,7 +383,7 @@ public:
If an empty string will be provided "application/octet-stream"
will be used.
*/
-static void AddToRecentDocumentList(const OUString& rFileUrl, const
OUString& rMimeType);
+static void AddToRecentDocumentList(const OUString& rFileUrl, const
OUString& rMimeType, const OUString& rDocumentService);
/** Do we have a native / system file selector available ?
*/
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index a32cfee..32b3ea5 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -197,7 +197,9 @@ void SfxPickList::AddDocumentToPickList( SfxObjectShell*
pDocSh )
OUString() );
if ( aURL.GetProtocol() == INET_PROT_FILE )
-Application::AddToRecentDocumentList( aURL.GetURLNoPass(
INetURLObject::NO_DECODE ), (pFilter) ? pFilter->GetMimeType() : OUString() );
+Application::AddToRecentDocumentList( aURL.GetURLNoPass(
INetURLObject::NO_DECODE ),
+ (pFilter) ?
pFilter->GetMimeType() : OUString(),
+ (pFilter) ?
pFilter->GetServiceName() : OUString() );
}
SfxPickList& SfxPickList::Get()
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index aadb1a9..e8c7eef 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -2101,7 +2101,8 @@ void SfxObjectShell::AddToRecentlyUsedList()
{
const SfxFilter* pOrgFilter = pMedium->GetOrigFilter();
Application::AddToRecentDocumentList( aUrl.GetURLNoPass(
INetURLObject::NO_DECODE ),
- (pOrgFilter) ?
pOrgFilter->GetMimeType() : OUString() );
+ (pOrgFilter) ?
pOrgFilter->GetMimeType() : OUString(),
+ (pOrgFilter) ?
pOrgFilter->GetServiceName() : OUString() );
}
}
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 9dfc4e4..0f14d00 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -1037,7 +1037,7 @@ static bool isDangerousUrl( const OUString& rUrl )
return false;
}
-void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const
OUString& /*rMimeType*/)
+void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const
OUString& /*rMimeType*/, const OUString& /*rDocumentService*/)
{
// Convert file URL for external use (see above)
OUString externalUrl = translateToExternalUrl(rFileUrl);
diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx
index f74d37d..340f4f4 100644
--- a/vcl/headless/svpinst.cxx
+++ b/vcl/headless/svpinst.cxx
@@ -382,7 +382,7 @@ void SvpSalInstance::StartTimer( sal_uLong nMS )
}
}
-void SvpSalInstance::AddToRecentDocumentList(const OUString&, const OUString&)
+void SvpSalInstance::AddToRecentDocumentList(const OUString&, const OUString&,
const OUString&)
{
}
diff --git a/vcl/inc/aqua/salinst.h b/vcl/inc/aqua/salinst.h
index 441cbef..72c 100644
--- a/vcl/inc/aqua/salinst.h
+++ b/vcl/inc/aqua/salinst.h
@@ -119,7 +119,7 @@ public:
virtual voidDestroyMenuItem( SalMenuItem* );
virtual SalSession* CreateSalSession();
virtual void* GetConnectionIdentifier(
ConnectionI
[Libreoffice-commits] core.git: 6 commits - clone/dictionaries clone/help cui/uiconfig sw/uiconfig vcl/win
clone/dictionaries |1 clone/help |1 cui/uiconfig/ui/insertplugin.ui |6 - cui/uiconfig/ui/optviewpage.ui |5 - sw/uiconfig/swriter/ui/insertfootnote.ui| 96 +--- sw/uiconfig/swriter/ui/previewzoomdialog.ui |7 +- sw/uiconfig/swriter/ui/wordcount.ui | 16 ++-- vcl/win/source/app/saltimer.cxx |4 - vcl/win/source/gdi/salbmp.cxx |4 - vcl/win/source/gdi/salgdi.cxx | 52 --- vcl/win/source/gdi/salgdi2.cxx |4 - vcl/win/source/gdi/salprn.cxx |2 vcl/win/source/window/salframe.cxx |6 - 13 files changed, 76 insertions(+), 128 deletions(-) New commits: commit 0f3af36ba158d01408cd2dc024030a861512ad90 Author: Stefan Knorr Date: Sun Jul 28 00:21:09 2013 +0200 Change Page Preview Zoom dialog's button layout to be horizontal Change-Id: I7f1bd32ebf4c9e6df794404d4177043e1b5cb790 diff --git a/sw/uiconfig/swriter/ui/previewzoomdialog.ui b/sw/uiconfig/swriter/ui/previewzoomdialog.ui index 8c06a51..f0a4b1b 100644 --- a/sw/uiconfig/swriter/ui/previewzoomdialog.ui +++ b/sw/uiconfig/swriter/ui/previewzoomdialog.ui @@ -23,12 +23,12 @@ False +vertical 12 False -vertical -start +end gtk-ok @@ -71,6 +71,7 @@ False True 2 +True @@ -86,6 +87,8 @@ True False center +6 +6 True True 6 commit e437dab84256bfabf2c5f5164d6ec55476281701 Author: Stefan Knorr Date: Sun Jul 28 00:04:29 2013 +0200 Try to improve visual appearance of Word Count dialog Change-Id: Ie51aeb7de1ac0efd2ae90bccd5121e9f34fbe88b diff --git a/clone/dictionaries b/clone/dictionaries new file mode 16 index 000..53e9940 --- /dev/null +++ b/clone/dictionaries @@ -0,0 +1 @@ +Subproject commit 53e9940d33caa1e8a00ddaadfb57e5d668d35378 diff --git a/clone/help b/clone/help new file mode 16 index 000..a43f72a --- /dev/null +++ b/clone/help @@ -0,0 +1 @@ +Subproject commit a43f72ace3d84b3ba0df35ec589a21a1d5de2299 diff --git a/sw/uiconfig/swriter/ui/wordcount.ui b/sw/uiconfig/swriter/ui/wordcount.ui index 0aff653..3570476 100644 --- a/sw/uiconfig/swriter/ui/wordcount.ui +++ b/sw/uiconfig/swriter/ui/wordcount.ui @@ -28,6 +28,7 @@ False True 0 +True @@ -57,6 +58,8 @@ True False +6 +6 True 6 12 @@ -64,8 +67,8 @@ True False -0 -10 +6 +1 Words @@ -79,8 +82,7 @@ True False -0 -10 +1 Characters including spaces @@ -94,8 +96,7 @@ True False -0 -10 +1 Characters excluding spaces @@ -245,8 +246,7 @@ False True -0 -10 +1 Asian characters and Korean syllables commit 9e033148e043d03786619fd576f8d26f37dc6558 Author: Stefan Knorr Date: Sun Jul 28 00:03:25 2013 +0200 Change Insert Footnote's button layout to be horizontal Change-Id: I04ae00e5cb81abfe12d7b08bc4f31927988dc09d diff --git a/sw/uiconfig/swriter/ui/insertfootnote.ui b/sw/uiconfig/swriter/ui/insertfootnote.ui index 5a836a9..ef1a037 100644 --- a/sw/uiconfig/swriter/ui/insertfootnote.ui +++ b/sw/uiconfig/swriter/ui/insertfootnote.ui @@ -9,21 +9,44 @@ False +vertical 12 False -vertical -start +end - -gtk-ok + True -True -True -True -True -True +False +True + + +True +True +image1 +right + + +0 +0 +1 +1 + +
[Libreoffice-commits] core.git: 2 commits - officecfg/registry sc/AllLangResTarget_sc.mk sc/inc sc/Library_sc.mk sc/sdi sc/source sc/uiconfig svx/source
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 16 + sc/AllLangResTarget_sc.mk |3 sc/Library_sc.mk |2 sc/inc/globstr.hrc|5 sc/inc/sc.hrc |2 sc/sdi/cellsh.sdi |2 sc/sdi/scalc.sdi | 48 +++ sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx |9 sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.src | 19 + sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx | 160 ++ sc/source/ui/StatisticsDialogs/CorrelationDialog.src | 19 + sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx | 159 + sc/source/ui/StatisticsDialogs/CovarianceDialog.src | 19 + sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx| 28 + sc/source/ui/app/scdll.cxx|2 sc/source/ui/inc/CorrelationDialog.hxx| 43 ++ sc/source/ui/inc/CovarianceDialog.hxx | 43 ++ sc/source/ui/inc/StatisticsInputOutputDialog.hxx |4 sc/source/ui/inc/reffact.hxx | 13 sc/source/ui/view/cellsh.cxx |2 sc/source/ui/view/cellsh1.cxx | 18 + sc/source/ui/view/tabvwsh.cxx |3 sc/source/ui/view/tabvwshc.cxx| 15 sc/uiconfig/scalc/menubar/menubar.xml |2 svx/source/dialog/svxruler.cxx|9 25 files changed, 638 insertions(+), 7 deletions(-) New commits: commit 8e4f4fb541277e35aca7d8f210307635f7a81443 Author: Tomaž Vajngerl Date: Sun Jul 28 11:45:56 2013 +0200 fdo#66477 Add correlation and covariance to Calc. Change-Id: I877199aa9c0bb275fa678488548c7e6797c0eefc diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index e602c13..1bea73a 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -661,6 +661,22 @@ 1 + + + ~Correlation... + + + 1 + + + + + ~Covariance... + + + 1 + + ~Headers & Footers... diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk index 88f60ad..5f43eb3 100644 --- a/sc/AllLangResTarget_sc.mk +++ b/sc/AllLangResTarget_sc.mk @@ -83,6 +83,9 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\ sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.src \ sc/source/ui/StatisticsDialogs/SamplingDialog.src \ sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.src \ +sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.src \ +sc/source/ui/StatisticsDialogs/CorrelationDialog.src \ +sc/source/ui/StatisticsDialogs/CovarianceDialog.src \ sc/source/core/src/compiler.src \ )) diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index 72a83a5..6f559f5 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -478,6 +478,8 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/StatisticsDialogs/SamplingDialog \ sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog \ sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog \ + sc/source/ui/StatisticsDialogs/CorrelationDialog \ + sc/source/ui/StatisticsDialogs/CovarianceDialog \ sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog \ sc/source/ui/undo/areasave \ sc/source/ui/undo/refundo \ diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc index 7a7cf0a..2f8e562 100644 --- a/sc/inc/globstr.hrc +++ b/sc/inc/globstr.hrc @@ -720,7 +720,10 @@ #define SID_CALC_SUM585 #define SID_CALC_COUNT 586 -#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME 587 +#define STR_DESCRIPTIVE_STATISTICS_UNDO_NAME587 +#define STR_ANALYSIS_OF_VARIANCE_UNDO_NAME 588 +#define STR_CORRELATION_UNDO_NAME 589 +#define STR_COVARIANCE_UNDO_NAME590 #endif diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 7ee45d0..8611337 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -256,6 +256,8 @@ #define SID_SAMPLING_DIALOG (SC_MESSAGE_START + 71) #define SID_DESCRIPTIVE_STATISTICS_DIALOG (SC_MESSAGE_START + 72) #define SID_ANALYSIS_OF_VARIANCE_DIALOG (SC_MESSAGE_START + 73) +#define SID_CORRELATION_DIALOG
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Toni Ballesta changed: What|Removed |Added Depends on||67361 --- Comment #58 from Toni Ballesta --- Adding the bug 67361 - Segmentation fault for Base, on 4.1.0.4, Gentoo, Kernel 3.10.1. I listed the compilation options. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/gsoc-impresslayout' - sd/source sd/xml
sd/source/core/sdpage.cxx | 108 +-
sd/xml/layoutlist.xml |2
2 files changed, 60 insertions(+), 50 deletions(-)
New commits:
commit 57866f97931e789b33e650d1c2bf81afe1a6ed11
Author: Vishv Brahmbhatt
Date: Sun Jul 28 12:33:45 2013 +0530
Changed the logic of parsing
Have added a vector list of XNode to store the parse XML and referring it
instead of XML eveytime.
Need to make scope level changes for vector and parseXml() in the next
commit.
Change-Id: I2f270fc18058772fbf30a2a44e564c8290c316c4
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 0aace256..c244da6 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1117,6 +1117,7 @@ Rectangle SdPage::GetLayoutRect() const
const int MAX_PRESOBJS = 7; // maximum number of presentation objects per
layout
const int VERTICAL = 0x8000;
const int PRESOBJPROP = 4;
+std::vector> layoutinfo; //temporarily at global scope
struct LayoutDescriptor
{
@@ -1317,6 +1318,9 @@ rtl::OUString enumtoString(AutoLayout aut)
case AUTOLAYOUT_TITLE_CONTENT_2CONTENT:
retstr="AUTOLAYOUT_TITLE_CONTENT_2CONTENT";
break;
+case AUTOLAYOUT_TITLE_4CONTENT:
+retstr="AUTOLAYOUT_TITLE_4CONTENT";
+break;
default:
retstr="unknown";
break;
@@ -1325,6 +1329,19 @@ rtl::OUString enumtoString(AutoLayout aut)
return retstr;
}
+void parseXml()
+{
+int layoutlistsize;
+const Reference root= getRootElement();//get the root element of
my xml file
+const Reference layoutlist =
root->getElementsByTagName("layout");
+layoutlistsize=layoutlist->getLength();
+for( long index=0; index layoutnode = layoutlist->item(index); //get i'th
layout element
+layoutinfo.push_back(layoutnode);
+}
+}
+
static void CalcAutoLayoutRectangles( SdPage& rPage, int nLayout, Rectangle*
rRectangle ,const rtl::OUString& autolayout)
{
Rectangle aTitleRect;
@@ -1333,7 +1350,6 @@ static void CalcAutoLayoutRectangles( SdPage& rPage, int
nLayout, Rectangle* rRe
long layoutlistsize;
rtl::OUString sLayoutAttName;
rtl::OUString sPresObjKindAttName;
-bool bnoprop=true; //use it to skip the remaining loop
,once propvalue is obtained
double propvalue[4];
if( rPage.GetPageKind() != PK_HANDOUT )
@@ -1376,61 +1392,55 @@ static void CalcAutoLayoutRectangles( SdPage& rPage,
int nLayout, Rectangle* rRe
sal_BoolbRightToLeft = ( rPage.GetModel() && static_cast<
SdDrawDocument* >( rPage.GetModel() )->GetDefaultWritingMode() ==
::com::sun::star::text::WritingMode_RL_TB );
-const Reference layoutlist =
root->getElementsByTagName("layout");
-layoutlistsize=layoutlist->getLength();
-rtl::OUString sLayoutType = autolayout;
-for( long index=0; index layoutnode = layoutlist->item(index); //get
i'th layout element
-Reference layoutattrlist
=layoutnode->getAttributes();
-Reference layoutattr = layoutattrlist->getNamedItem("type");
-sLayoutAttName=layoutattr->getNodeValue(); //get the
attribute value of layout(i.e it's type)
+Reference layoutnode = layoutinfo[y]; //get i'th layout
element
+Reference layoutattrlist =layoutnode->getAttributes();
+Reference layoutattr = layoutattrlist->getNamedItem("type");
+sLayoutAttName=layoutattr->getNodeValue(); //get the
attribute value of layout(i.e it's type)
+rtl::OUString sLayoutType = autolayout;
-if(sLayoutAttName==sLayoutType)
+if(sLayoutAttName==sLayoutType)
+{
+int count=0;
+Reference layoutchildrens = layoutnode->getChildNodes();
+presobjsize = layoutchildrens->getLength(); //get the
length of that of the layout(number of pres objects)
+for( long j=0; j< presobjsize ; j++)
{
-Reference layoutchildrens =
layoutnode->getChildNodes();
-presobjsize = layoutchildrens->getLength(); //get the
length of that of the layout(number of pres objects)
-for( long j=1; j< presobjsize ; j++)
+rtl::OUString nodename;
+Reference presobj = layoutchildrens->item(j);//get
the j'th presobj for that layout
+nodename=presobj->getNodeName();
+if(nodename=="presobj")//check whether children is blank
'text-node' or 'presobj' node
{
-rtl::OUString nodename;
-Reference presobj = layoutchildrens->item(j);
//get the j'th presobj for that layout
-nodename=presobj->getNodeName();
-if(nodename=="presobj")//check whether children is blank
'text-node' or 'presobj' node
-{
-Reference presObjAttributes =
presobj->getAttribute
