[Libreoffice-commits] .: sdext/source svx/inc svx/source unusedcode.easy
sdext/source/presenter/PresenterWindowManager.cxx | 117 -- sdext/source/presenter/PresenterWindowManager.hxx | 10 - svx/inc/svx/sdr/contact/viewcontactofe3d.hxx |3 svx/source/sdr/contact/viewcontactofe3d.cxx | 14 -- unusedcode.easy |6 - 5 files changed, 150 deletions(-) New commits: commit 9895d3169fb1a20b8e7fb0215acff71beabecdaa Author: Julien Nabet Date: Sun Oct 16 01:06:33 2011 +0200 Some callcatcher cleaning diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx index 466e3fe..1414e6e 100644 --- a/sdext/source/presenter/PresenterWindowManager.cxx +++ b/sdext/source/presenter/PresenterWindowManager.cxx @@ -242,45 +242,6 @@ void PresenterWindowManager::SetTheme (const ::boost::shared_ptr } } - - - -void PresenterWindowManager::NotifyPaneCreation ( -const PresenterPaneContainer::SharedPaneDescriptor& rpDescriptor) -{ -if (rpDescriptor.get()==NULL) -{ -OSL_ASSERT(rpDescriptor.get()!=NULL); -return; -} -if ( ! rpDescriptor->mxContentWindow.is()) -{ -OSL_ASSERT(rpDescriptor->mxContentWindow.is()); -return; -} - -mbIsLayoutPending = true; - -Reference xBorderWindow (rpDescriptor->mxBorderWindow); -OSL_ASSERT(xBorderWindow.is()); -if (xBorderWindow.is() && ! rpDescriptor->mbIsSprite) -{ -Invalidate(); - -xBorderWindow->addWindowListener(this); -xBorderWindow->addFocusListener(this); -#ifndef ENABLE_PANE_RESIZING -xBorderWindow->addMouseListener(this); -#endif -} - -UpdateWindowList(); -Layout(); -} - - - - void PresenterWindowManager::NotifyViewCreation (const Reference& rxView) { PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( @@ -297,32 +258,6 @@ void PresenterWindowManager::NotifyViewCreation (const Reference& rxView) } } - - - -void PresenterWindowManager::SetPanePosSizeRelative ( -const Reference& rxPaneId, -const double nRelativeX, -const double nRelativeY, -const double nRelativeWidth, -const double nRelativeHeight) -{ -PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( -mpPaneContainer->FindPaneId(rxPaneId)); -if (pDescriptor.get() != NULL) -{ -pDescriptor->mnLeft = nRelativeX; -pDescriptor->mnTop = nRelativeY; -pDescriptor->mnRight = nRelativeX + nRelativeWidth; -pDescriptor->mnBottom = nRelativeY + nRelativeHeight; - -mpPaneContainer->ToTop(pDescriptor); -} -} - - - - void PresenterWindowManager::SetPanePosSizeAbsolute ( const OUString& rsPaneURL, const double nX, @@ -661,17 +596,6 @@ void PresenterWindowManager::SetSlideSorterState (bool bIsActive) } } - - - -bool PresenterWindowManager::IsSlideSorterActive (void) const -{ -return mbIsSlideSorterActive; -} - - - - void PresenterWindowManager::SetHelpViewState (bool bIsActive) { if (mbIsHelpViewActive != bIsActive) @@ -690,17 +614,6 @@ void PresenterWindowManager::SetHelpViewState (bool bIsActive) } } - - - -bool PresenterWindowManager::IsHelpViewActive (void) const -{ -return mbIsHelpViewActive; -} - - - - void PresenterWindowManager::SetViewMode (const ViewMode eMode) { switch (eMode) @@ -1186,36 +1099,6 @@ void PresenterWindowManager::NotifyDisposing (void) } } - - - -void PresenterWindowManager::LayoutUnknownMode (void) -{ -awt::Rectangle aBox = mxParentWindow->getPosSize(); - -PresenterPaneContainer::PaneList::const_iterator iPane; -PresenterPaneContainer::PaneList::const_iterator iEnd (mpPaneContainer->maPanes.end()); -for (iPane=mpPaneContainer->maPanes.begin(); iPane!=iEnd; ++iPane) -{ -const PresenterPaneContainer::SharedPaneDescriptor& pDescriptor (*iPane); -if ( ! pDescriptor->mxBorderWindow.is()) -continue; - -// Layout the border window. -const sal_Int32 nX = (sal_Int32)(pDescriptor->mnLeft * aBox.Width); -const sal_Int32 nY = (sal_Int32)(pDescriptor->mnTop * aBox.Height); -const sal_Int32 nWidth = (sal_Int32)(pDescriptor->mnRight * aBox.Width) - nX; -const sal_Int32 nHeight = (sal_Int32)(pDescriptor->mnBottom * aBox.Height) - nY; - -pDescriptor->mxBorderWindow->setPosSize( -nX,nY,nWidth,nHeight, -awt::PosSize::POSSIZE); -} -} - - - - void PresenterWindowManager::UpdateWindowSize (const Reference& rxBorderWindow) { PresenterPaneContainer::SharedPaneDescriptor pDescriptor ( diff --git a/sdext/source/presenter/PresenterWindowManager.hxx b/sdext/source/presenter/PresenterWindowManager.hxx index 997565b..d4e919d 100644 --- a/sdext/source/presenter/PresenterWindowManager.hxx +++ b/sdext/source/presenter/PresenterWindowManager.hxx @@ -90,14 +90,7 @@ public: void SetParentPane (const css::uno::Reference& rxPane); void SetTheme (const ::bo
[Libreoffice-commits] .: solenv/bin
solenv/bin/mkdocs.sh |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 761b7e39ebbcd8398c2f67fcead5199285b1cbdc Author: Miklos Vajna Date: Sat Oct 15 12:29:47 2011 +0200 mkdocs: sort module list diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 1e358e6..5cc3d42 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -64,7 +64,7 @@ umask 022 # generate docs DOXYGEN_REF_TAGFILES="" -for PROJECT in $INPUT_PROJECTS; +for PROJECT in `echo $INPUT_PROJECTS|tr ' ' '\n'|sort|tr '\n' ' '`; do # avoid processing of full project subdirs, only add source and inc DOXYGEN_INPUT=`printf "%s" "$PROJECT/source $PROJECT/inc "` ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerperfect/source
writerperfect/source/filter/OdgGenerator.cxx | 20 1 file changed, 20 insertions(+) New commits: commit 33a43d55e6ec5db047dee076589b147fc5126d9d Author: Fridrich Å trba Date: Sat Oct 15 12:16:38 2011 +0200 Try to handle more text-box properties diff --git a/writerperfect/source/filter/OdgGenerator.cxx b/writerperfect/source/filter/OdgGenerator.cxx index 65c72f8..56a9c6b 100644 --- a/writerperfect/source/filter/OdgGenerator.cxx +++ b/writerperfect/source/filter/OdgGenerator.cxx @@ -1329,6 +1329,26 @@ void OdgGenerator::startTextObject(WPXPropertyList const &propList, WPXPropertyL pDrawFrameOpenElement->addAttribute("fo:padding-right", propList["fo:padding-right"]->getStr()); pStyleGraphicPropertiesOpenElement->addAttribute("fo:padding-right", propList["fo:padding-right"]->getStr()); } +if (propList["draw:textarea-vertical-align"]) +{ +pDrawFrameOpenElement->addAttribute("draw:textarea-vertical-align", propList["draw:textarea-vertical-align"]->getStr()); + pStyleGraphicPropertiesOpenElement->addAttribute("draw:textarea-vertical-align", propList["draw:textarea-vertical-align"]->getStr()); +} +if (propList["draw:fill"]) +{ +pDrawFrameOpenElement->addAttribute("draw:fill", propList["draw:fill"]->getStr()); +pStyleGraphicPropertiesOpenElement->addAttribute("draw:fill", propList["draw:fill"]->getStr()); +} +if (propList["draw:fill-color"]) +{ +pDrawFrameOpenElement->addAttribute("draw:fill-color", propList["draw:fill-color"]->getStr()); +pStyleGraphicPropertiesOpenElement->addAttribute("draw:fill-color", propList["draw:fill-color"]->getStr()); +} +if (propList["draw:opacity"]) +{ +pDrawFrameOpenElement->addAttribute("draw:opacity", propList["draw:opacity"]->getStr()); +pStyleGraphicPropertiesOpenElement->addAttribute("draw:opacity", propList["draw:opacity"]->getStr()); +} mpImpl->mBodyElements.push_back(pDrawFrameOpenElement); mpImpl->mBodyElements.push_back(new TagOpenElement("draw:text-box")); mpImpl->mGraphicsAutomaticStyles.push_back(pStyleGraphicPropertiesOpenElement); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bin/lo-xlate-lang
bin/lo-xlate-lang | 210 ++ 1 file changed, 210 insertions(+) New commits: commit 8d153dc965379672321b7c351db4b9c41473f6cf Author: Rene Engelhard Date: Thu Oct 13 14:58:48 2011 +0200 add lo-xlate-lang (formerly openoffice-xlate-lang in libreoffice-build) diff --git a/bin/lo-xlate-lang b/bin/lo-xlate-lang new file mode 100755 index 000..7549f85 --- /dev/null +++ b/bin/lo-xlate-lang @@ -0,0 +1,210 @@ +#!/usr/bin/env perl + +use strict; + +my $progname=$0; $progname = $& if $progname =~ m,[^/]+$,; + +my %PREFIX; # used to search for prefix numbers +my %ISOCODE; # used to search for iso codes +my %LANGUAGE; # used to search for language names + +#=== +# initialisation code - stuff the DATA into the CODES hash +#=== +sub init { + +my $prefix; +my $code; +my $name; + + +while () +{ +next unless /\S/; +chop; +($prefix, $code, $name ) = split(/:/, $_, 3); +$PREFIX{$prefix} = $prefix; +$PREFIX{$code} = $prefix; +$PREFIX{$name} = $prefix; + +$ISOCODE{$prefix} = $code; +$ISOCODE{$code} = $code; +$ISOCODE{$name} = $code; + +$LANGUAGE{$prefix} = $name; +$LANGUAGE{$code} = $name; +$LANGUAGE{$name} = $name; +} +} + + +#=== +# usage - error message +#=== +sub usage { +my $errmsg = shift; +my $errcode = shift; +print STDERR "$progname: $errmsg\n" if $errmsg; +print STDERR "$progname: Converts between prefix codes, iso codes and langnames\n"; +print STDERR " Usage: $progname (-i|-l|-p|-h) |all\n"; +print STDERR " -i : convert prefix to iso code (ex: 03 -> pt)\n"; +print STDERR " -l : convert iso code to language name (ex: pt -> portuguese)\n"; +print STDERR " -p : convert iso code to prefix (ex: pt -> 03)\n"; +print STDERR " the code can either be an iso code, a prefix or even a language name\n"; +print STDERR " The special code \"all\" asks for all possible values.\n\n"; +print STDERR " -h : print this help\n"; +exit $errcode; +} + +#=== +# main - +#=== +init(); + +my ($LanguageCode, $LanguageMap); + +while ($ARGV[0] =~ /^-/) { +$_ = shift; +if (m/^-i/) { + $LanguageMap = \%ISOCODE; +} +elsif (m/^-l/) { + $LanguageMap = \%LANGUAGE; +} +elsif (m/^-p/) { + $LanguageMap = \%PREFIX; +} +elsif (m/^-h/) { + usage("",0); +} +else { + usage ("unknown option $_",1); +} +} + +usage ("no operation specified on command line",1) +if (!$LanguageMap); + +usage ("no language code specified on command line",1) +if (!($LanguageCode = shift)); + +if ($LanguageCode =~ (m/^all$/)) { +# Asked for all codes +my $old=""; +foreach my $key (sort values %$LanguageMap) { + if ($key ne $old) { + print "$key "; + $old=$key; + } +} +print "\n"; +exit 0; +} + +usage ("no mapping found for $LanguageCode\n",1) + if (!(%$LanguageMap->{$LanguageCode})); + +print $LanguageMap->{$LanguageCode}, "\n"; + +1; + +# keep third column names here with openoffice-dir/share/*// + +__DATA__ +:be:belarussian +:bg:bulgarian +:bn:bengali +:bs:bosnian +:en-GB:english_british +:gu:gujarati +:hr:croatian +:km:khmer +:ku:kurdish +:pa-IN:punjabi +:rw:kinarwanda +:xh:xhosa +:lt:lithuanian +:ne:nepali +:vi:vietnamese +:nso:northern_sotho +:ss:swazi +:sr:serbian +:ve:venda +:ts:tsonga +:st:southern_sotho +:tn:tswana +:br:breton +:ga:gaelic +:gd:scottish_gaelic +:th:thai +:hi:hindi +:bs-BA:bosnian +:en-ZA:english_southafrican +:mk:macedonian +:as:assamese +:ml:malayalam +:mr:marathi +:or:oriya +:ur:urdu +:fa:farsi +:lv:latvian +:nr:ndebele +:ne:nepalese +:sh:serbian +:te:telugu +:ta:tamil +:tg:tajik +:ka:georgian +:eo:esperanto +:uk:ukrainian +:kk:kazahk +:dz:dzongkha +:kn:kannada +:gl:galician +:uz:uzbek +:oc:occitan +:ro:romanian +:eu:basque +:mn:mongolian +:om:oromo +:bo:tibetan +:ast:asturian +:is:icelandic +:ug:uighur +:si:sinhala +:id:indonesian +:my:burmese +01:en-US:english_american +03:pt:portuguese +07:ru:russian +26:ns:northernsotho +27:af:afrikaans +28:zu:zulu +30:el:greek +31:nl:dutch +33:fr:french +34:es:spanish +35:fi:finnish +36:hu:hungarian +37:ca:catalan +39:it:italian +42:cs:czech +43:sk:slovak +45:da:danish +46:sv:swedish +47:nb:norwegian +48:pl:polish +49:de:german +50:sl:slovenian +53:cy:welsh +55:pt-BR:portuguese_brazilian +77:et:estonian +79:nn:norwegian_nynorsk +81:ja:japanese +82:ko:korean +86:zh-CN:chinese_simplified +88:zh-TW:chinese_traditional +90:tr:turkish
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/bf_svx binfilter/inc
binfilter/bf_svtools/source/items1/svt_poolio.cxx |7 +++ binfilter/bf_svx/source/form/svx_fmobj.cxx|2 +- binfilter/bf_svx/source/svdraw/svx_svdobj.cxx |2 +- binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx|6 ++ binfilter/bf_svx/source/svdraw/svx_svdouno.cxx|2 +- binfilter/bf_svx/source/svdraw/svx_svdpntv.cxx|2 +- binfilter/bf_svx/source/xoutdev/svx__ximp.cxx |6 +++--- binfilter/bf_svx/source/xoutdev/svx_xattr.cxx |1 + binfilter/inc/bf_svx/svdouno.hxx |2 +- binfilter/inc/bf_svx/svdpntv.hxx |2 +- binfilter/inc/bf_svx/xoutx.hxx|2 +- 11 files changed, 20 insertions(+), 14 deletions(-) New commits: commit 61a94140d55feca593ba6a85984d40678f9de2ac Author: Stephan Bergmann Date: Sat Oct 15 11:23:34 2011 +0200 Some more warning cleanup. diff --git a/binfilter/bf_svtools/source/items1/svt_poolio.cxx b/binfilter/bf_svtools/source/items1/svt_poolio.cxx index 0d453dc..98c5cce 100644 --- a/binfilter/bf_svtools/source/items1/svt_poolio.cxx +++ b/binfilter/bf_svtools/source/items1/svt_poolio.cxx @@ -114,6 +114,7 @@ void SfxItemPool::readTheItems ( SvStream & rStream, USHORT nItemCount, USHORT nVersion, SfxPoolItem * pDefItem, SfxPoolItemArray_Impl ** ppArr) { +/*SB*/fprintf(stderr,"SfxItemPool::readTheItems %d %d\n",(int)nItemCount,(int)nVersion); SfxMultiRecordReader aItemsRec( &rStream, SFX_ITEMPOOL_REC_ITEMS ); SfxPoolItemArray_Impl *pNewArr = new SfxPoolItemArray_Impl( nItemCount ); @@ -136,6 +137,7 @@ void SfxItemPool::readTheItems ( USHORT nRef(0); rStream >> nRef; +/*SB*/fprintf(stderr,"... X\n"); pItem = pDefItem->Create(rStream, nVersion); pNewArr->C40_INSERT(SfxPoolItem, pItem, nSurrogate); @@ -369,8 +371,10 @@ SvStream &SfxItemPool::Load(SvStream &rStream) nWhich = GetNewWhich( nWhich ); // unbekanntes Item aus neuerer Version +/*SB*/fprintf(stderr,"nWhich = %d\n",(int)nWhich); if ( !IsInRange(nWhich) ) continue; +/*SB*/fprintf(stderr," ,,,\n"); rStream >> nVersion; rStream >> nCount; @@ -1159,6 +1163,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, { USHORT nWhich=0, nSlot=0; // nSurrogate; rStream >> nWhich >> nSlot; +/*SB*/fprintf(stderr,"A nWhich = %d\n",(int)nWhich); BOOL bDontPut = (SfxItemPool*)-1 == pRefPool; if ( bDontPut || !pRefPool ) @@ -1188,6 +1193,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, if ( !bCurVersion ) // Which-Id auf neue Version mappen nWhich = pRefPool->GetNewWhich( nWhich ); +/*SB*/fprintf(stderr,"B nWhich = %d\n",(int)nWhich); DBG_ASSERT( !nWhich || !pImp->bInSetItem || !pRefPool->ppStaticDefaults[pRefPool->GetIndex_Impl(nWhich)]->ISA(SfxSetItem), @@ -1221,6 +1227,7 @@ const SfxPoolItem* SfxItemPool::LoadItem( SvStream &rStream, bool bDirect, // Item direkt laden SfxPoolItem *pNewItem = pRefPool->GetDefaultItem(nWhich).Create(rStream, nVersion); +/*SB*/fprintf(stderr,"C nWhich = %d, pNewItem = %p\n",(int)nWhich,pNewItem); if ( bDontPut ) pItem = pNewItem; else diff --git a/binfilter/bf_svx/source/form/svx_fmobj.cxx b/binfilter/bf_svx/source/form/svx_fmobj.cxx index 76f2b23..4033a9a 100644 --- a/binfilter/bf_svx/source/form/svx_fmobj.cxx +++ b/binfilter/bf_svx/source/form/svx_fmobj.cxx @@ -56,7 +56,7 @@ using namespace ::binfilter::svxform; //-- /*N*/ FmFormObj::FmFormObj(sal_Int32 _nType) -/*N*/ :SdrUnoObj(String(), sal_False) +/*N*/ :SdrUnoObj(sal_False) /*N*/ ,pTempView(0) /*N*/ ,nEvent(0) /*N*/ ,nPos(-1) diff --git a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx index ce31226..48bf941 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdobj.cxx @@ -2966,7 +2966,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP /*?*/ case USHORT(OBJ_FRAME ): pObj=new SdrOle2Obj(TRUE); break; /*N*/ case USHORT(OBJ_CAPTION): pObj=new SdrCaptionObj; break; /*N*/ case USHORT(OBJ_PAGE ): pObj=new SdrPageObj; break; -/*?*/ case USHORT(OBJ_UNO): pObj=new SdrUnoObj(String()); break; +/*?*/ case USHORT(OBJ_UNO): pObj=new SdrUnoObj;break; /*N*/ } /*N*/ } diff --git a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx index d48b9a1..36ed782 100644 --- a/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx +++ b/binfilter/bf_svx/source/svdraw/svx_svdogrp.cxx @@ -352,12 +352,10 @@ namespace binf