[Libreoffice-commits] .: 2 commits - sd/source
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx|3 -
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 16 --
sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx | 24 +--
sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx |9 +
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx |8 +
sd/source/ui/slidesorter/controller/SlsListener.cxx | 16 +++---
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx | 13 +++-
sd/source/ui/slidesorter/model/SlideSorterModel.cxx |2 -
sd/source/ui/slidesorter/shell/SlideSorterService.cxx| 12 ++-
sd/source/ui/slidesorter/view/SlsButtonBar.cxx |2 -
sd/source/ui/slidesorter/view/SlsFontProvider.cxx|3 -
sd/source/ui/table/TableDesignPane.cxx | 21 ++---
sd/source/ui/table/tablefunction.cxx |4 +-
13 files changed, 52 insertions(+), 81 deletions(-)
New commits:
commit 674ed53bc00fbbbfec5661cbafcaa79669927cb8
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Thu Apr 12 10:04:33 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM removals
module sd/../ui
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx
b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index fdd01a4..8c51857 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -488,10 +488,8 @@ void SAL_CALL Listener::propertyChange (
{
ThrowIfDisposed();
-static const ::rtl::OUString sCurrentPagePropertyName (
-RTL_CONSTASCII_USTRINGPARAM(CurrentPage));
-static const ::rtl::OUString sEditModePropertyName (
-RTL_CONSTASCII_USTRINGPARAM(IsMasterPageMode));
+static const ::rtl::OUString sCurrentPagePropertyName (CurrentPage);
+static const ::rtl::OUString sEditModePropertyName (IsMasterPageMode);
if (rEvent.PropertyName.equals(sCurrentPagePropertyName))
{
@@ -501,8 +499,7 @@ void SAL_CALL Listener::propertyChange (
{
try
{
-Any aPageNumber = xPageSet-getPropertyValue (
-String(RTL_CONSTASCII_USTRINGPARAM(Number)));
+Any aPageNumber = xPageSet-getPropertyValue (Number);
sal_Int32 nCurrentPage = 0;
aPageNumber = nCurrentPage;
// The selection is already set but we call SelectPage()
@@ -592,8 +589,7 @@ void Listener::UpdateEditMode (void)
{
try
{
-Any aValue (xSet-getPropertyValue(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(IsMasterPageMode;
+Any aValue (xSet-getPropertyValue( IsMasterPageMode ));
aValue = bIsMasterPageMode;
}
catch (beans::UnknownPropertyException)
@@ -693,9 +689,7 @@ void Listener::ThrowIfDisposed (void)
{
if (rBHelper.bDisposed || rBHelper.bInDispose)
{
-throw lang::DisposedException (
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-SlideSorterController object has already been disposed)),
+throw lang::DisposedException (SlideSorterController object has
already been disposed,
static_castuno::XWeak*(this));
}
}
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index fc5eec6..dcdad2b 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -828,11 +828,11 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet)
SdPage* pFirstPage = NULL;
sal_uInt16 nFirstPage;
sal_uInt16 nSelectedPages =
(sal_uInt16)mrSlideSorter.GetController().GetPageSelector().GetSelectedPageCount();
-String aPageStr;
+rtl::OUString aPageStr;
String aLayoutStr;
if (nSelectedPages 0)
-aPageStr = String(SdResId(STR_SD_PAGE));
+aPageStr = rtl::OUString(ResId::toString(SdResId(STR_SD_PAGE)));
if (nSelectedPages == 1)
{
@@ -846,11 +846,10 @@ void SlotManager::GetStatusBarState (SfxItemSet rSet)
nFirstPage = pPage-GetPageNum()/2;
pFirstPage = pPage;
-aPageStr += sal_Unicode(' ');
-aPageStr += String::CreateFromInt32( nFirstPage + 1 );
-aPageStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( / ));
-aPageStr += String::CreateFromInt32(
-mrSlideSorter.GetModel().GetPageCount());
+aPageStr += ;
+aPageStr += rtl::OUString::valueOf( nFirstPage + 1 );
+aPageStr += / ;
+aPageStr +=
rtl::OUString::valueOf(mrSlideSorter.GetModel().GetPageCount());
aLayoutStr = pFirstPage-GetLayoutName();
aLayoutStr.Erase( aLayoutStr.SearchAscii( SD_LT_SEPARATOR ) );
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
[Libreoffice-commits] .: 2 commits - sd/source svtools/source
sd/source/ui/view/drviews2.cxx | 13 ++---
svtools/source/contnr/imivctl1.cxx | 16 ++--
2 files changed, 8 insertions(+), 21 deletions(-)
New commits:
commit 3b887c8d3fef676e0037a4f3381f6a491ec0da4f
Author: Rafael Dominguez venccsra...@gmail.com
Date: Sat Mar 31 21:12:50 2012 -0430
Replace deprecated List for std::vector.
diff --git a/svtools/source/contnr/imivctl1.cxx
b/svtools/source/contnr/imivctl1.cxx
index eec11d1..4cbaa46 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -3558,25 +3558,13 @@ void SvxIconChoiceCtrl_Impl::SetPositionMode(
SvxIconChoiceCtrlPositionMode eMod
if( ePositionMode == IcnViewPositionModeAutoArrange )
{
-List aMovedEntries;
for( size_t nCur = 0; nCur nCount; nCur++ )
{
SvxIconChoiceCtrlEntry* pEntry = aEntries[ nCur ];
if( pEntry-GetFlags() (ICNVIEW_FLAG_POS_LOCKED |
ICNVIEW_FLAG_POS_MOVED))
-{
-SvxIconChoiceCtrlEntry_Impl* pE = new
SvxIconChoiceCtrlEntry_Impl(
-pEntry, GetEntryBoundRect( pEntry ));
-aMovedEntries.Insert( pE, LIST_APPEND );
-}
+SetEntryPos(pEntry, GetEntryBoundRect( pEntry ).TopLeft());
}
-nCount = aMovedEntries.Count();
-for( size_t nCur = 0; nCur nCount; nCur++ )
-{
-SvxIconChoiceCtrlEntry_Impl* pE =
(SvxIconChoiceCtrlEntry_Impl*)aMovedEntries.GetObject(nCur);
-SetEntryPos( pE-_pEntry, pE-_aPos );
-}
-for( size_t nCur = 0; nCur nCount; nCur++ )
-delete (SvxIconChoiceCtrlEntry_Impl*)aMovedEntries.GetObject( nCur
);
+
if( aEntries.size() )
aAutoArrangeTimer.Start();
}
commit a9a05a06ac275ec2695ff607ed118e1b46ab7a4e
Author: Rafael Dominguez venccsra...@gmail.com
Date: Thu Mar 29 19:26:11 2012 -0430
Replace deprecated List for vector.
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 179fe66..6ecad4c 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -804,7 +804,7 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
// der harten Attribute sowie der UserCall eingetragen, da
diese beim nachfolgenden
// mpDrawView-SetAttributes( *pSet, sal_True ) verloren gehen
und spaeter restauriert
// werden muessen
-List* pAttrList = new List();
+std::vectorstd::pairSfxItemSet*,SdrObjUserCall* aAttrList;
SdPage* pPresPage = (SdPage*)
mpDrawView-GetSdrPageView()-GetPage();
sal_uLong i;
@@ -816,8 +816,7 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
{
SfxItemSet* pNewSet = new SfxItemSet(
GetDoc()-GetPool(), SDRATTR_TEXT_MINFRAMEHEIGHT, SDRATTR_TEXT_AUTOGROWHEIGHT,
0 );
pNewSet-Put(pObj-GetMergedItemSet());
-pAttrList-Insert( pNewSet, LIST_APPEND );
-pAttrList-Insert( pObj-GetUserCall(), LIST_APPEND );
+aAttrList.push_back(std::make_pair(pNewSet,
pObj-GetUserCall()));
}
}
@@ -857,8 +856,10 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
if( pPresPage-IsPresObj( pObj ) )
{
-SfxItemSet* pNewSet = (SfxItemSet*)
pAttrList-GetObject(j++);
-SdrObjUserCall* pUserCall = (SdrObjUserCall*)
pAttrList-GetObject(j++);
+std::pairSfxItemSet*,SdrObjUserCall* rAttr =
aAttrList[j++];
+
+SfxItemSet* pNewSet = rAttr.first;
+SdrObjUserCall* pUserCall = rAttr.second;
if ( pNewSet pNewSet-GetItemState(
SDRATTR_TEXT_MINFRAMEHEIGHT ) == SFX_ITEM_ON )
{
@@ -876,8 +877,6 @@ void DrawViewShell::FuTemporary(SfxRequest rReq)
delete pNewSet;
}
}
-
-delete pAttrList;
}
delete pSet;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sd/source
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx| 21 +---
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 14 -
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 21 +++-
sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx |4 -
sd/source/ui/view/ToolBarManager.cxx | 46 ---
sd/source/ui/view/ViewShellManager.cxx | 44 +++---
6 files changed, 45 insertions(+), 105 deletions(-)
New commits:
commit 58d5e3032274b5a15ccc0bf2c9788cd18a5a63d4
Author: Rob Snelders programm...@ertai.nl
Date: Tue Apr 3 00:04:00 2012 +0200
SlsRequestQueue updated
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 966c5d2..a79ddaf 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -31,10 +31,6 @@
#include set
-
-#undef VERBOSE
-//#define VERBOSE
-
namespace sd { namespace slidesorter { namespace cache {
/** This class extends the actual request data with additional information
@@ -118,7 +114,7 @@ void RequestQueue::AddRequest (
// If the request is already a member of the queue then remove it so
// that the following insertion will use the new prioritization.
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL =2
bool bRemoved =
#endif
RemoveRequest(aKey);
@@ -130,13 +126,12 @@ void RequestQueue::AddRequest (
Request aRequest (aKey, nPriority, eRequestClass);
mpRequestQueue-insert(aRequest);
-SSCD_SET_REQUEST_CLASS(rRequestData.GetPage(),eRequestClass);
+SSCD_SET_REQUEST_CLASS(aKey,eRequestClass);
-#ifdef VERBOSE
-OSL_TRACE(%s request for page %d with priority class %d,
-bRemoved?replaced:added,
-(rRequestData.GetPage()-GetPageNum()-1)/2,
-eRequestClass);
+#if OSL_DEBUG_LEVEL =2
+SAL_INFO(sd.sls, OSL_THIS_FUNC : (bRemoved?replaced:added)
+ request for page ((aKey-GetPageNum()-1)/2)
+ with priority class static_castint(eRequestClass));
#endif
}
@@ -166,7 +161,7 @@ bool RequestQueue::RemoveRequest (
if (bRequestWasRemoved)
{
-SSCD_SET_STATUS(rRequest.GetPage(),NONE);
+SSCD_SET_STATUS(aKey,NONE);
}
}
else
@@ -195,7 +190,7 @@ void RequestQueue::ChangeClass (
if (iRequest!=mpRequestQueue-end() iRequest-meClass!=eNewRequestClass)
{
AddRequest(aKey, eNewRequestClass, true);
-SSCD_SET_REQUEST_CLASS(rRequestData.GetPage(),eNewRequestClass);
+SSCD_SET_REQUEST_CLASS(aKey,eNewRequestClass);
}
}
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index e59f7e3..9fe0dda 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -52,7 +52,7 @@ public:
/** Insert a request with highest or lowest priority in its priority
class. When the request is already present then it is first
removed. This effect is then a re-prioritization.
-@param rRequestData
+@param aKey
The request.
@param eRequestClass
The priority class in which to insert the request with highest
@@ -68,7 +68,7 @@ public:
bool bInsertWithHighestPriority = false);
/** Remove the specified request from the queue.
-@param rRequestData
+@param aKey
It is OK when the specified request is not a member of the
queue.
@return
commit 5ff6bf59c90cf3a55acffcb64e63f1da6dd5dec2
Author: Rob Snelders programm...@ertai.nl
Date: Mon Apr 2 22:54:08 2012 +0200
Removal of VERBOSE define
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index f369079..d556c5c 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -35,11 +35,6 @@
#include sdpage.hxx
#include drawdoc.hxx
-// Uncomment the following define for some more OSL_TRACE messages.
-#ifdef DEBUG
-//#define VERBOSE
-#endif
-
// Define the default value for the maximal cache size that is used for
// previews that are currently not visible. The visible previews are all
// held in memory at all times. This default is used only when the
@@ -421,9 +416,7 @@ void BitmapCache::ReCalculateTotalCacheSize (void)
}
mbIsFull = (mnNormalCacheSize = mnMaximalNormalCacheSize);
-#ifdef VERBOSE
-OSL_TRACE(cache size is %d/%d, mnNormalCacheSize, mnPreciousCacheSize);
-#endif
+SAL_INFO(sd.sls, OSL_THIS_FUNC : cache size is
mnNormalCacheSize / mnPreciousCacheSize);
}
@@ -527,9 +520,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry
rEntry, CacheOperation eOpe
if ( ! rEntry.IsPrecious()
[Libreoffice-commits] .: 2 commits - sd/source
sd/source/filter/eppt/pptexanimations.cxx |6 +-
sd/source/filter/eppt/pptx-epptooxml.cxx |6 +-
sd/source/filter/ppt/pptin.cxx|2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 2f432afdf6335d2e0a777cf89ceebe99550328d8
Author: Tor Lillqvist t...@iki.fi
Date: Fri Mar 2 12:16:45 2012 +0200
WaE: equality comparison with extraneous parentheses
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 1f8fd68..2d18836 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -740,7 +740,7 @@ sal_Bool ImplSdPPTImport::Import()
((SdPage*)pNotesClone)-SetLayoutName( aLayoutName );
}
}
-else if ( ( pPersist-bStarDrawFiller == sal_False ) )
+else if ( pPersist-bStarDrawFiller == sal_False )
{
PptSlidePersistEntry* pE = pPersist;
while( ( pE-aSlideAtom.nFlags 4 )
pE-aSlideAtom.nMasterId )
commit 51e3df40bc757b46636a3d74681a597fe35063ba
Author: Tor Lillqvist t...@iki.fi
Date: Fri Mar 2 12:15:35 2012 +0200
WaE: indexes past the end of an array
diff --git a/sd/source/filter/eppt/pptexanimations.cxx
b/sd/source/filter/eppt/pptexanimations.cxx
index 9705c38..1e65805 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -964,7 +964,11 @@ sal_Int16 AnimationExporter::exportAnimPropertySet(
SvStream rStrm, const Refer
// storing user data into pAny, to allow direct access later
const Sequence NamedValue aUserData = xNode-getUserData();
-const ::com::sun::star::uno::Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ];
+
+// ids start from 1, DFF_ANIM_PROPERTY_ID_COUNT is the highest id
+// number
+const ::com::sun::star::uno::Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT + 1 ];
+
GetUserData( aUserData, pAny, sizeof( pAny ) );
if( pAny[ DFF_ANIM_AFTEREFFECT ] )
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx
b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 4811289..1c11a69 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -986,7 +986,11 @@ void PowerPointExport::WriteAnimationNodeCommonPropsStart(
FSHelperPtr pFS, cons
}
const Sequence NamedValue aUserData = rXNode-getUserData();
-const Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT ];
+
+// ids start from 1, DFF_ANIM_PROPERTY_ID_COUNT is the highest id
+// number
+const Any* pAny[ DFF_ANIM_PROPERTY_ID_COUNT + 1];
+
AnimationExporter::GetUserData( aUserData, pAny, sizeof( pAny ) );
sal_Int16 nType = 0;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sd/source
sd/source/ui/func/fuoltext.cxx |5 +
sd/source/ui/view/outlview.cxx |6 --
2 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 57e6f04066cfddfa79eb2b79cf5c45653c79eff3
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 16:51:52 2012 +0100
Fix fdo#45177 - avoid linked undo for the while.
While I try to wrap head around subtleties for linked undo in
Impress outline view, disable that here for the while. Better than
a crash for sure.
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 8d4d1cc..f4c9dfe 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -1664,12 +1664,6 @@ void OutlineView::EndModelChange()
DBG_ASSERT( bHasUndoActions ==
(mrOutliner.GetUndoManager().GetUndoActionCount() != 0),
sd::OutlineView::EndModelChange(), undo actions not in sync! );
-if( bHasUndoActions )
-{
-SfxLinkUndoAction* pLink = new SfxLinkUndoAction(pDocUndoMgr);
-mrOutliner.GetUndoManager().AddUndoAction(pLink);
-}
-
mrOutliner.GetUndoManager().LeaveListAction();
if( bHasUndoActions
mrOutliner.GetEditEngine().HasTriedMergeOnLastAddUndo() )
commit 4fa7f074b38a65a6e0b5e9ceb164f31ce8086042
Author: Thorsten Behrens tbehr...@suse.com
Date: Wed Feb 15 16:50:59 2012 +0100
Cleanup: auto_ptr uses as a plain scope guard.
diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx
index df1108f..c48c254 100644
--- a/sd/source/ui/func/fuoltext.cxx
+++ b/sd/source/ui/func/fuoltext.cxx
@@ -230,10 +230,7 @@ sal_Bool FuOutlineText::KeyInput(const KeyEvent rKEvt)
{
mpWindow-GrabFocus();
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-std::auto_ptr OutlineViewModelChangeGuard aGuard;
-SAL_WNODEPRECATED_DECLARATIONS_POP
-
+boost::scoped_ptr OutlineViewModelChangeGuard aGuard;
if( (nKeyGroup != KEYGROUP_CURSOR) (nKeyGroup != KEYGROUP_FKEYS) )
aGuard.reset( new OutlineViewModelChangeGuard( *pOutlineView ) );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sd/source vcl/unx
sd/source/ui/slidesorter/controller/SlsListener.cxx |2
vcl/unx/generic/printer/cupsmgr.cxx | 93 ++--
2 files changed, 68 insertions(+), 27 deletions(-)
New commits:
commit 45a570f55b66c992d7dd1fccfae4424a40d624d5
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Dec 16 19:29:35 2011 +0100
Fix assertion in PageSelector::CheckConsistency()
Seems the recent merge from impress210 brought an inconsistency in
slide selection - shuffle calls to make it go away.
diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx
b/sd/source/ui/slidesorter/controller/SlsListener.cxx
index df67a53..fdd01a4 100644
--- a/sd/source/ui/slidesorter/controller/SlsListener.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx
@@ -509,8 +509,8 @@ void SAL_CALL Listener::propertyChange (
// nevertheless in order to make the new current page the
// last recently selected page of the PageSelector. This is
// used when making the selection visible.
-mrController.GetPageSelector().SelectPage(nCurrentPage-1);
mrController.GetCurrentSlideManager()-NotifyCurrentSlideChange(nCurrentPage-1);
+mrController.GetPageSelector().SelectPage(nCurrentPage-1);
}
catch (beans::UnknownPropertyException)
{
commit 33a6a9e9a4a3238887a533ada7b67b7727a27271
Author: Thorsten Behrens tbehr...@suse.com
Date: Fri Dec 16 19:22:33 2011 +0100
Fail fast if cups is non-operational.
Following advice from Johannes Meixner, fail fast, like lpstat -r
does first - then query detailed destinations list from cups in
init. This fixes n#722902.
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx
b/vcl/unx/generic/printer/cupsmgr.cxx
index c7e9516..381478d 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -28,6 +28,8 @@
#include cups/cups.h
+#include cups/http.h
+#include cups/ipp.h
#include cups/ppd.h
#include unistd.h
@@ -54,21 +56,25 @@ class CUPSWrapper
osl::Mutex m_aGetPPDMutex;
boolm_bPPDThreadRunning;
-int (*m_pcupsPrintFile)(const char*, const char*, const char*,
int, cups_option_t*);
-int (*m_pcupsGetDests)(cups_dest_t**);
-void(*m_pcupsSetDests)(int,cups_dest_t*);
-void(*m_pcupsFreeDests)(int,cups_dest_t*);
-const char* (*m_pcupsGetPPD)(const char*);
-int (*m_pcupsMarkOptions)(ppd_file_t*,int,cups_option_t*);
-int (*m_pcupsAddOption)(const char*,const
char*,int,cups_option_t**);
-void(*m_pcupsFreeOptions)(int,cups_option_t*);
-ppd_file_t* (*m_pppdOpenFile)(const char* pFile);
-void(*m_pppdClose)(ppd_file_t*);
-const char* (*m_pcupsServer)();
-void(*m_pcupsSetPasswordCB)(const char*(cb)(const char*));
-const char* (*m_pcupsUser)();
-void(*m_pcupsSetUser)(const char*);
-const char* (*m_pcupsGetOption)(const char*,int,cups_option_t*);
+int (*m_pcupsPrintFile)(const char*, const char*, const
char*, int, cups_option_t*);
+int (*m_pcupsGetDests)(cups_dest_t**);
+void (*m_pcupsSetDests)(int,cups_dest_t*);
+void (*m_pcupsFreeDests)(int,cups_dest_t*);
+const char* (*m_pcupsGetPPD)(const char*);
+int (*m_pcupsMarkOptions)(ppd_file_t*,int,cups_option_t*);
+int (*m_pcupsAddOption)(const char*,const
char*,int,cups_option_t**);
+void (*m_pcupsFreeOptions)(int,cups_option_t*);
+ppd_file_t* (*m_pppdOpenFile)(const char* pFile);
+void (*m_pppdClose)(ppd_file_t*);
+http_t* (*m_phttpConnectEncrypt)(const char*, int,
http_encryption_t);
+void (*m_phttpClose)(http_t*);
+int (*m_pippPort)();
+const char* (*m_pcupsServer)();
+http_encryption_t (*m_pcupsEncryption)();
+void (*m_pcupsSetPasswordCB)(const char*(cb)(const char*));
+const char* (*m_pcupsUser)();
+void (*m_pcupsSetUser)(const char*);
+const char* (*m_pcupsGetOption)(const char*,int,cups_option_t*);
oslGenericFunction loadSymbol( const char* );
public:
@@ -110,9 +116,21 @@ public:
void ppdClose( ppd_file_t* pPPD )
{ m_pppdClose( pPPD ); }
+http_t* httpConnectEncrypt(const char* host, int port, http_encryption_t
crypt)
+{ return m_phttpConnectEncrypt(host, port, crypt); }
+
+void httpClose(http_t* server)
+{ m_phttpClose(server); }
+
+int ippPort()
+{ return m_pippPort(); }
+
const char *cupsServer(void)
{ return m_pcupsServer(); }
+http_encryption_t cupsEncryption()
+{ return m_pcupsEncryption(); }
+
const char *cupsUser(void)
{ return m_pcupsUser(); }
@@
[Libreoffice-commits] .: 2 commits - sd/source svx/source
sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |4 ++--
sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx |4 +++-
svx/source/sdr/properties/attributeproperties.cxx |3 ++-
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit c8e7d34e3a238c9383151a09f99e7951877a6821
Author: alg a...@apache.org
Date: Thu Oct 6 14:55:24 2011 +
118414: applied patch, added forcing that SfxItemSet inside
AttributeProperties::SetModel
* found as LGPLv3-only fix at svn rev 1179654
(http://svn.apache.org/viewvc?view=revisionrevision=1179654)
diff --git a/svx/source/sdr/properties/attributeproperties.cxx
b/svx/source/sdr/properties/attributeproperties.cxx
index 9edc2a4..cece99f 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -479,8 +479,9 @@ namespace sdr
}
// each object gets the default Style if there is none set yet.
-if(mpItemSet !GetStyleSheet() pNewModel
!pNewModel-IsLoading())
+if(!GetStyleSheet() pNewModel !pNewModel-IsLoading())
{
+GetObjectItemSet(); // i#118414 force ItemSet to allow
style to be set
SetStyleSheet(pNewModel-GetDefaultStyleSheet(), sal_True);
}
}
commit f82da782158d8f5b89a6a9057df1a4695425ed75
Author: awf a...@openoffice.org
Date: Tue Nov 1 16:18:25 2011 +
i118560 - slide sorter: pass PageSelector object by reference
* found as LGPLv3-only fix at svn rev 1196092
(http://svn.apache.org/viewvc?view=revisionrevision=1196092)
diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index f3a0074..e3a86bb 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -1156,8 +1156,8 @@ void SlotManager::DuplicateSelectedSlides (SfxRequest
rRequest)
aPagesToSelect.end(),
::boost::bind(
static_castvoid (PageSelector::*)(const
SdPage*)(PageSelector::SelectPage),
-rSelector,
-_1));
+::boost::ref(rSelector),
+_1));
}
IMPL_LINK(SlotManager, UserEventCallback, void*, EMPTYARG)
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 42ab151..394dd89 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -34,6 +34,8 @@
#include com/sun/star/drawing/XDrawPage.hpp
#include vector
#include memory
+#include boost/noncopyable.hpp
+
class SdPage;
@@ -63,7 +65,7 @@ class SlideSorterController;
Indices of pages relate allways to the number of all pages in the model
(as returned by GetPageCount()) not just the selected pages.
*/
-class PageSelector
+class PageSelector : private ::boost::noncopyable
{
public:
PageSelector (SlideSorter rSlideSorter);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
