[Libreoffice-commits] .: 3 commits - desktop/source framework/source
David Tardon
dtardon at kemper.freedesktop.org
Fri Jan 21 04:03:04 PST 2011
desktop/source/deployment/manager/dp_manager.cxx | 2
framework/source/services/autorecovery.cxx | 107 -----------------------
2 files changed, 1 insertion(+), 108 deletions(-)
New commits:
commit 3c9137a7f17895a5e58fd3da73c9141c2e64150f
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jan 21 08:45:11 2011 +0100
remove unused code
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 09ab97f..efba645 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -249,103 +249,6 @@ static const sal_Int32 GIVE_UP_RETRY = 1; // in
#endif
//-----------------------------------------------
-// TODO debug - remove it!
-class DbgListener : private ThreadHelpBase
- , public ::cppu::OWeakObject
- , public css::frame::XStatusListener
-{
- public:
-
- FWK_DECLARE_XINTERFACE
-
- DbgListener()
- {
- WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::ctor()\n\n")
- }
-
- virtual ~DbgListener()
- {
- WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::dtor()\n\n")
- }
-
- void startListening(const css::uno::Reference< css::frame::XDispatch >& xBroadcaster)
- {
- ::rtl::OUStringBuffer sMsg1(256);
- sMsg1.appendAscii("//**********************************************************************************\n");
- sMsg1.appendAscii("start listening\n{\n");
- WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg1.makeStringAndClear()))
-
- ++m_refCount;
-
- css::util::URL aURL;
- aURL.Complete = ::rtl::OUString();
- xBroadcaster->addStatusListener(static_cast< css::frame::XStatusListener* >(this), aURL);
-
- --m_refCount;
-
- ::rtl::OUStringBuffer sMsg2(256);
- sMsg2.appendAscii("}\nstart listening\n");
- sMsg2.appendAscii("//**********************************************************************************\n");
- WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg2.makeStringAndClear()))
- }
-
- virtual void SAL_CALL disposing(const css::lang::EventObject&)
- throw(css::uno::RuntimeException)
- {
- WRITE_LOGFILE("autorecovery_states.txt", "\n\nDbgListener::dtor()\n\n")
- }
-
- virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& aEvent)
- throw(css::uno::RuntimeException)
- {
- ::rtl::OUStringBuffer sMsg(256);
-
- sMsg.appendAscii("//**********************************************************************************\n");
-
- sMsg.appendAscii("FeatureURL = \"");
- sMsg.append (aEvent.FeatureURL.Complete);
- sMsg.appendAscii("\"\n");
-
- sMsg.appendAscii("State = [");
- sal_Int32 nState = -1;
- aEvent.State >>= nState;
- if (nState==-1)
- {
- sMsg.appendAscii("?-");
- sMsg.append (::rtl::OUString::valueOf(nState));
- sMsg.appendAscii("-? ");
- }
- if (nState==0)
- sMsg.appendAscii("UNKNOWN ");
- if ((nState & 1)==1)
- sMsg.appendAscii("MODIFIED ");
- if ((nState & 2)==2)
- sMsg.appendAscii("TRYIT ");
- if ((nState & 4)==4)
- sMsg.appendAscii("HANDLED ");
- if ((nState & 8)==8)
- sMsg.appendAscii("POSTPONED ");
- if ((nState & 16)==16)
- sMsg.appendAscii("INCOMPLETE ");
- if ((nState & 32)==32)
- sMsg.appendAscii("DAMAGED ");
- sMsg.appendAscii("]\n");
-/*
- sMsg.appendAscii("IsEnabled = \"");
- sMsg.append (::rtl::OUString::valueOf(aEvent.IsEnabled));
- sMsg.appendAscii("\"\n");
-
- sMsg.appendAscii("Requery = \"");
- sMsg.append (::rtl::OUString::valueOf(aEvent.Requery));
- sMsg.appendAscii("\"\n");
-*/
- sMsg.appendAscii("\n");
-
- WRITE_LOGFILE("autorecovery_states.txt", U2B(sMsg.makeStringAndClear()))
- }
-};
-
-//-----------------------------------------------
class CacheLockGuard
{
private:
@@ -505,11 +408,6 @@ void DispatchParams::forget()
};
//-----------------------------------------------
-DEFINE_XINTERFACE_1(DbgListener ,
- OWeakObject ,
- DIRECT_INTERFACE(css::frame::XStatusListener))
-
-//-----------------------------------------------
DEFINE_XINTERFACE_10(AutoRecovery ,
OWeakObject ,
DIRECT_INTERFACE (css::lang::XTypeProvider ),
@@ -556,10 +454,6 @@ DEFINE_INIT_SERVICE(
// establish callback for our internal used timer.
// Note: Its only active, if the timer will be started ...
m_aTimer.SetTimeoutHdl(LINK(this, AutoRecovery, implts_timerExpired));
-/*
- DbgListener* pListener = new DbgListener();
- pListener->startListening(this);
-*/
}
)
commit 78118536b6b939e4d4cfbbf2ae208a1ba5c1e5ad
Author: David Tardon <dtardon at redhat.com>
Date: Fri Jan 21 08:40:42 2011 +0100
remove unused constant
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 74debc9..09ab97f 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -203,7 +203,6 @@ static const ::rtl::OUString PROP_DISPATCH_ASYNCHRON(RTL_CONSTASCII_USTRINGPARAM
static const ::rtl::OUString PROP_PROGRESS(RTL_CONSTASCII_USTRINGPARAM("StatusIndicator"));
static const ::rtl::OUString PROP_SAVEPATH(RTL_CONSTASCII_USTRINGPARAM("SavePath"));
static const ::rtl::OUString PROP_ENTRY_ID(RTL_CONSTASCII_USTRINGPARAM("EntryID"));
-static const ::rtl::OUString PROP_DBG_MAKE_IT_FASTER(RTL_CONSTASCII_USTRINGPARAM("DBGMakeItFaster"));
static const ::rtl::OUString PROP_AUTOSAVE_STATE(RTL_CONSTASCII_USTRINGPARAM("AutoSaveState"));
static const ::rtl::OUString OPERATION_START(RTL_CONSTASCII_USTRINGPARAM("start"));
commit 1f94c25d946edc115f659ab9550acac878c78661
Author: David Tardon <dtardon at redhat.com>
Date: Wed Jan 19 09:54:14 2011 +0100
extend assertion test
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 15de46d..ff1ec55 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -1305,7 +1305,7 @@ bool PackageManagerImpl::synchronizeRemovedExtensions(
//There may be another extensions at the same place
dp_misc::DescriptionInfoset infoset =
dp_misc::getDescriptionInfoset(url);
- OSL_ENSURE(infoset.hasDescription(),
+ OSL_ENSURE(infoset.hasDescription() && infoset.getIdentifier(),
"Extension Manager: bundled and shared extensions "
"must have an identifer and a version");
if (infoset.hasDescription() &&
More information about the Libreoffice-commits
mailing list