[Libreoffice-commits] .: sd/source
sd/source/ui/view/outlview.cxx |2 +-
sd/source/ui/view/sdview3.cxx | 10 +-
sd/source/ui/view/sdview4.cxx |2 +-
sd/source/ui/view/viewshe2.cxx |7 +++
4 files changed, 10 insertions(+), 11 deletions(-)
New commits:
commit fe51974e6515f48a6e6881e5837027d08c8d66e9
Author: Olivier Hallot
Date: Thu Apr 5 19:34:00 2012 -0300
More removal of RTL_CONSTASCII_USTRINGPARAM in sd
More removal of RTL_CONSTASCII_USTRINGPARAM in module sd
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index 67b802d..062cf34 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -174,7 +174,7 @@ OutlineView::OutlineView( DrawDocShell& rDocSh, ::Window*
pWindow, OutlineViewSh
Reference xFrame
(mrOutlineViewShell.GetViewShellBase().GetFrame()->GetTopFrame().GetFrameInterface(),
UNO_QUERY);
-const OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:ShowSlide" ));
+const OUString aSlotURL( ".uno:ShowSlide" );
maSlideImage = GetImage( xFrame, aSlotURL, true );
// Tell undo manager of the document about the undo manager of the
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 70f2a7a..339e808 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -975,12 +975,12 @@ sal_Bool View::InsertData( const TransferableDataHelper&
rDataHelper,
svt::EmbeddedObjectRef::TryRunningState( xObj );
uno::Reference< beans::XPropertySet > xProps(
xObj->getComponent(), uno::UNO_QUERY );
if ( xProps.is() &&
- ( xProps->getPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ) ) >>=
bDisableDataTableDialog ) &&
+ ( xProps->getPropertyValue( ::rtl::OUString(
"DisableDataTableDialog" ) ) >>= bDisableDataTableDialog ) &&
bDisableDataTableDialog )
{
-xProps->setPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DisableDataTableDialog" ) ),
+xProps->setPropertyValue( ::rtl::OUString(
"DisableDataTableDialog" ),
uno::makeAny( sal_False ) );
-xProps->setPropertyValue( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "DisableComplexChartTypes" ) ),
+xProps->setPropertyValue( ::rtl::OUString(
"DisableComplexChartTypes" ),
uno::makeAny( sal_False ) );
uno::Reference< util::XModifiable > xModifiable(
xProps, uno::UNO_QUERY );
if ( xModifiable.is() )
@@ -1023,12 +1023,12 @@ sal_Bool View::InsertData( const
TransferableDataHelper& rDataHelper,
uno::Reference< embed::XStorage > xTmpStor =
::comphelper::OStorageHelper::GetTemporaryStorage();
uno::Reference < embed::XEmbedObjectClipboardCreator >
xClipboardCreator(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.MSOLEObjectSystemCreator")) ),
+ ::rtl::OUString(
"com.sun.star.embed.MSOLEObjectSystemCreator") ),
uno::UNO_QUERY_THROW );
embed::InsertedObjectInfo aInfo =
xClipboardCreator->createInstanceInitFromClipboard(
xTmpStor,
-
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "DummyName" ) ),
+
::rtl::OUString( "DummyName" ),
uno::Sequence<
beans::PropertyValue >() );
// TODO/LATER: in future InsertedObjectInfo will be
used to get container related information
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index e109d8b..bd919e5 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -488,7 +488,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl)
//TODO/MBA: testing
::rtl::OUString aName;
uno::Sequence < beans::PropertyValue > aMedium(1);
-aMedium[0].Name = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+aMedium[0].Name = ::rtl::OUString( "URL" );
aMedium[0].Value <<= ::rtl::OUString( aCurrentDropFile
);
uno::Reference < embed::XEmbeddedObject > xObj =
mpDocSh->GetEmbeddedObjectContainer().
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index 7d
[Libreoffice-commits] .: sd/source
sd/source/ui/view/Outliner.cxx |2 +-
sd/source/ui/view/PresentationViewShellBase.cxx |4 ++--
sd/source/ui/view/ToolBarManager.cxx|2 +-
sd/source/ui/view/ViewShellBase.cxx |6 +++---
sd/source/ui/view/drviews5.cxx |2 +-
sd/source/ui/view/drviews7.cxx |2 +-
sd/source/ui/view/drviewsa.cxx |4 ++--
sd/source/ui/view/drviewsb.cxx |2 +-
sd/source/ui/view/drviewse.cxx | 20 ++--
sd/source/ui/view/drviewsf.cxx |8
10 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit e912c601843d505de9c92ea04fd54f11016d37c8
Author: Olivier Hallot
Date: Thu Apr 5 18:39:50 2012 -0300
More RTL_CONSTASCII_USTRINGPARAM cleanup
More RTL_CONSTASCII_USTRINGPARAM in module sd
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index d4a427f..d9858b1 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -212,7 +212,7 @@ Outliner::Outliner( SdDrawDocument* pDoc, sal_uInt16 nMode )
Any aAny;
aAny = aLinguConfig.GetProperty(
-rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UPN_IS_SPELL_AUTO
)) );
+rtl::OUString( UPN_IS_SPELL_AUTO ) );
aAny >>= bOnlineSpell;
}
catch( ... )
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx
b/sd/source/ui/view/PresentationViewShellBase.cxx
index 424b7ed..8c7315f 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -86,12 +86,12 @@ PresentationViewShellBase::PresentationViewShellBase (
if (xFrameSet.is())
{
Reference xLayouterSet (
-
xFrameSet->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LayoutManager"))),
+xFrameSet->getPropertyValue(::rtl::OUString("LayoutManager")),
UNO_QUERY);
if (xLayouterSet.is())
{
xLayouterSet->setPropertyValue(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutomaticToolbars")),
+::rtl::OUString("AutomaticToolbars"),
makeAny(sal_False));
}
}
diff --git a/sd/source/ui/view/ToolBarManager.cxx
b/sd/source/ui/view/ToolBarManager.cxx
index be97fd9..4d1ef89 100644
--- a/sd/source/ui/view/ToolBarManager.cxx
+++ b/sd/source/ui/view/ToolBarManager.cxx
@@ -59,7 +59,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
#undef OUSTRING // Remove definition made in the SFX
-#define OUSTRING(s) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(s)))
+#define OUSTRING(s) (::rtl::OUString(s))
namespace {
diff --git a/sd/source/ui/view/ViewShellBase.cxx
b/sd/source/ui/view/ViewShellBase.cxx
index 7948b94..340881b 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1142,14 +1142,14 @@ void ViewShellBase::SetViewTabBar (const
::rtl::Reference& rViewTabB
{
Reference< XMultiServiceFactory > xServiceManager(
::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-Reference< XModuleManager > xModuleManager(
xServiceManager->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.frame.ModuleManager") ) ), UNO_QUERY_THROW );
+Reference< XModuleManager > xModuleManager(
xServiceManager->createInstance( OUString( "com.sun.star.frame.ModuleManager")
), UNO_QUERY_THROW );
Reference< XInterface > xIfac( xFrame, UNO_QUERY_THROW );
::rtl::OUString aModuleIdentifier( xModuleManager->identify( xIfac ) );
if( !aModuleIdentifier.isEmpty() )
{
-Reference< XNameAccess > xNameAccess(
xServiceManager->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"com.sun.star.frame.UICommandDescription" ) ) ), UNO_QUERY );
+Reference< XNameAccess > xNameAccess(
xServiceManager->createInstance( rtl::OUString(
"com.sun.star.frame.UICommandDescription" ) ), UNO_QUERY );
if( xNameAccess.is() )
{
Reference< ::com::sun::star::container::XNameAccess >
m_xUICommandLabels( xNameAccess->getByName( aModuleIdentifier ),
UNO_QUERY_THROW );
@@ -1241,7 +1241,7 @@ void
ViewShellBase::Implementation::ProcessRestoreEditingViewSlot (void)
pHelper->GetViewURL(pFrameView->GetViewShellTypeOnLoad()),
FrameworkHelper::msCenterPaneURL);
pHelper->RunOnConfigurationEvent(
-
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ConfigurationUpdateEnd")),
+::rtl::OUString("ConfigurationUpdateEnd"),
CurrentPageSetter(mrBase));
}
}
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 9f1c3b7..
[Libreoffice-commits] .: sd/source
sd/source/ui/view/DocumentRenderer.cxx | 110 -
1 file changed, 55 insertions(+), 55 deletions(-)
New commits:
commit 8981d1d06f2f6225b70d2e51ba0b994a2469037e
Author: Olivier Hallot
Date: Thu Apr 5 18:19:31 2012 -0300
Cleanup of some RTL_CONSTASCII_USTRINGPARAM macro in sd
Cleanup of some RTL_CONSTASCII_USTRINGPARAM macro in module sd
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index af8f45f..d0b4249 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -412,14 +412,14 @@ namespace {
aOpt.GetModuleName( mbImpress ?
SvtModuleOptions::E_SIMPRESS : SvtModuleOptions::E_SDRAW ) );
AddDialogControl( vcl::PrinterOptionsHelper::getGroupControlOpt(
aAppGroupname,
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
".HelpID:vcl:PrintDialog:TabPage:AppPage" ) )
+rtl::OUString(
".HelpID:vcl:PrintDialog:TabPage:AppPage" )
) );
uno::Sequence< rtl::OUString > aHelpIds;
if( mbImpress )
{
vcl::PrinterOptionsHelper::UIControlOptions aPrintOpt;
-aPrintOpt.maGroupHint = rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "JobPage" ) );
+aPrintOpt.maGroupHint = rtl::OUString( "JobPage" );
AddDialogControl(
vcl::PrinterOptionsHelper::getSubgroupControlOpt(
String(
SdResId(_STR_IMPRESS_PRINT_UI_PRINT_GROUP) ),
rtl::OUString(),
@@ -427,42 +427,42 @@ namespace {
);
aHelpIds.realloc( 1 );
-aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
".HelpID:vcl:PrintDialog:PageContentType:ListBox" ) );
+aHelpIds[0] = rtl::OUString(
".HelpID:vcl:PrintDialog:PageContentType:ListBox" );
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_CONTENT ) ),
aHelpIds,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
"PageContentType" ) ),
+OUString( "PageContentType" ),
CreateChoice(_STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
0,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
"List" ) )
+OUString( "List" )
)
);
-aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
".HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" ) );
+aHelpIds[0] = rtl::OUString(
".HelpID:vcl:PrintDialog:SlidesPerPage:ListBox" );
vcl::PrinterOptionsHelper::UIControlOptions
-aContentOpt( OUString( RTL_CONSTASCII_USTRINGPARAM(
"PageContentType" ) ), 1 );
+aContentOpt( OUString( "PageContentType" ), 1 );
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_SLIDESPERPAGE ) ),
aHelpIds,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
"SlidesPerPage" ) ),
+OUString( "SlidesPerPage" ),
GetSlidesPerPageSequence(),
0,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
"List" ) ),
+OUString( "List" ),
Sequence< sal_Bool >(),
aContentOpt
)
);
-aHelpIds[0] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" ) );
+aHelpIds[0] = rtl::OUString(
".HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox" );
vcl::PrinterOptionsHelper::UIControlOptions
-aSlidesPerPageOpt( OUString( RTL_CONSTASCII_USTRINGPARAM(
"SlidesPerPage" ) ), -1, sal_True );
+aSlidesPerPageOpt( OUString( "SlidesPerPage" ), -1,
sal_True );
AddDialogControl(
vcl::PrinterOptionsHelper::getChoiceControlOpt(
String( SdResId(
_STR_IMPRESS_PRINT_UI_ORDER ) ),
aHelpIds,
-OUString( RTL_CONSTASCII_USTRINGPARAM(
"SlidesPerPageOrder" ) ),
+OUString( "SlidesPerPageOrder"
[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/source
vcl/source/uipreviewer/previewer.cxx |1 +
vcl/source/window/builder.cxx|2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 17e5b220876ea056fd12d80840cbaa220d163483
Author: Caolán McNamara
Date: Thu Apr 5 21:28:08 2012 +0100
make dialogs closeable in previewer
diff --git a/vcl/source/uipreviewer/previewer.cxx
b/vcl/source/uipreviewer/previewer.cxx
index 23aee4a..c1f787b 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -84,6 +84,7 @@ int UIPreviewApp::Main()
if (pDialog)
{
pDialog->SetText(rtl::OUString("LibreOffice ui-previewer"));
+pDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE);
pDialog->Execute();
}
else
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 413e861..98581bc 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -67,7 +67,7 @@ Window *VclBuilder::makeObject(Window *pParent, const
rtl::OString &name, bool b
Window *pWindow = NULL;
if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkDialog")))
{
-pWindow = new Dialog(pParent, WB_SIZEMOVE|WB_3DLOOK);
+pWindow = new Dialog(pParent, WB_SIZEMOVE|WB_3DLOOK|WB_CLOSEABLE);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkBox")))
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayout' - vcl/source
vcl/source/uipreviewer/previewer.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit e8045af0187b796e636d626aae294b13bb834523
Author: Caolán McNamara
Date: Thu Apr 5 21:18:01 2012 +0100
set a default title
diff --git a/vcl/source/uipreviewer/previewer.cxx
b/vcl/source/uipreviewer/previewer.cxx
index 7a27729..23aee4a 100644
--- a/vcl/source/uipreviewer/previewer.cxx
+++ b/vcl/source/uipreviewer/previewer.cxx
@@ -83,6 +83,7 @@ int UIPreviewApp::Main()
Dialog *pDialog = dynamic_cast(pWindow);
if (pDialog)
{
+pDialog->SetText(rtl::OUString("LibreOffice ui-previewer"));
pDialog->Execute();
}
else
@@ -92,7 +93,7 @@ int UIPreviewApp::Main()
}
catch (const uno::Exception &e)
{
-fprintf(stderr, "fatal error: \n", rtl::OUStringToOString(e.Message,
osl_getThreadTextEncoding()).getStr());
+fprintf(stderr, "fatal error: %s\n", rtl::OUStringToOString(e.Message,
osl_getThreadTextEncoding()).getStr());
}
return false;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayout' - 2 commits - vcl/qa vcl/source
vcl/qa/cppunit/builder/demo.ui | 78 -
vcl/source/window/builder.cxx | 22 +--
2 files changed, 95 insertions(+), 5 deletions(-)
New commits:
commit c53573ac477bbf0a1559cf1e58b67a1d8df93408
Author: Caolán McNamara
Date: Thu Apr 5 20:43:33 2012 +0100
import GtkGrid
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index a22c17d..ed75074 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -55,6 +55,8 @@
True
False
vertical
+6
+True
True
@@ -99,6 +101,7 @@
True
â
an edit
control
+True
False
@@ -110,7 +113,7 @@
False
True
-1
+2
@@ -246,6 +249,79 @@
4
+
+
+True
+False
+4
+2
+True
+True
+
+
+True
+False
+cell 1.1
+
+
+0
+0
+1
+1
+
+
+
+
+True
+False
+1
+cell 3.3
+
+
+2
+2
+1
+1
+
+
+
+
+True
+False
+A label that spans
three rows
+
+
+0
+1
+3
+1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+True
+True
+5
+
+
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 07f8dcd..413e861 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -83,6 +83,10 @@ Window *VclBuilder::makeObject(Window *pParent, const
rtl::OString &name, bool b
else
pWindow = new VclHButtonBox(pParent);
}
+else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkGrid")))
+{
+pWindow = new VclGrid(pParent);
+}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButton")))
{
pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
@@ -357,6 +361,7 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
{
name = reader.getAttributeValue(false);
rtl::OString sKey(name.begin, name.length);
+sKey = sKey.replace('_', '-');
reader.nextItem(
xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId);
rtl::OString sValue(name.begin, name.length);
@@ -371,10 +376,19 @@ void VclBuilder::applyPackingProperty(Window *pCurrent,
{
pCurrent->setChildProperty(sKey,
static_cast(sValue.toInt32()));
}
-else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("pack_type")))
+else if (sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("pack-type")))
{
sal_Int32 nPackType = (sValue[0] == 'e' || sValue[0] == 'e') ?
VCL_PACK_END : VCL_PACK_START;
-pCurrent->setChildProperty(rtl::OString("pack-type"),
nPackType);
+pCurrent->setChildProperty(sKey, nPackType);
+}
+else if (
+ sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("left-attach"))
||
+ sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("top-attach")) ||
+ sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("width")) ||
+ sKey.equalsL(RTL_CONSTASCII_STRINGPARAM("height"))
+)
+{
+pCurrent->setChildProperty(sKey, sValue.toInt32());
}
else
fprintf(stderr, "unknown packing %s\n", sKey.getStr());
@@ -396,7 +410,7 @@ void VclBuilder::collectProperty(xmlreader::XmlReader
&reader, stringmap &rMap)
reader.nextItem(
xmlreader::XmlReader::TEXT_NORMALIZED, &name, &nsId);
rtl::OString sValue(name.begin, name.length);
-rMap[sProperty] = sValue;
+rMap[sProperty] = sValue.replace('_', '-');;
}
}
}
commit c0aba0321b646c51cf0b09ff064d32dd32d41595
Author: Caolán McNamara
Date: Thu Apr 5 20:41:35 2012 +0100
[Libreoffice-commits] .: binfilter/bf_sc
binfilter/bf_sc/source/ui/docshell/makefile.mk |1
binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx | 94 ---
binfilter/bf_sc/source/ui/docshell/sc_impex.cxx | 569
binfilter/bf_sc/source/ui/inc/impex.hxx | 126 -
4 files changed, 3 insertions(+), 787 deletions(-)
New commits:
commit 79a1602c0a460cb85413f872d3a8574d23c51b42
Author: Eike Rathke
Date: Thu Apr 5 21:33:41 2012 +0200
removed dead code that used to handle Calc text imports
diff --git a/binfilter/bf_sc/source/ui/docshell/makefile.mk
b/binfilter/bf_sc/source/ui/docshell/makefile.mk
index 400d470..a462a94 100644
--- a/binfilter/bf_sc/source/ui/docshell/makefile.mk
+++ b/binfilter/bf_sc/source/ui/docshell/makefile.mk
@@ -51,7 +51,6 @@ SLOFILES = \
$(SLO)$/sc_arealink.obj\
$(SLO)$/sc_dbdocfun.obj\
$(SLO)$/sc_dbdocimp.obj\
-$(SLO)$/sc_impex.obj \
$(SLO)$/sc_docfunc.obj \
$(SLO)$/sc_pntlock.obj \
$(SLO)$/sc_sizedev.obj \
diff --git a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
index 88b1c31..468f2bb 100644
--- a/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
+++ b/binfilter/bf_sc/source/ui/docshell/sc_docsh.cxx
@@ -54,7 +54,6 @@
#include "filter.hxx"
#include "scmod.hxx"
#include "docfunc.hxx"
-#include "impex.hxx"
#include "scresid.hxx"
#include "bf_sc.hrc"
#include "globstr.hrc"
@@ -536,96 +535,6 @@ static const sal_Char pFilterRtf[] = "Rich Text
Format (StarCalc)";
/*?*/ else
/*?*/ OSL_FAIL("Calc3/4: kein Storage");
/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterAscii))
-/*N*/ {
-/*N*/ SfxItemSet* pSet = rMedium.GetItemSet();
-/*N*/ const SfxPoolItem* pItem;
-/*N*/ ScAsciiOptions aOptions;
-/*N*/ BOOL bOptInit = FALSE;
-/*N*/
-/*N*/ if ( pSet && SFX_ITEM_SET ==
-/*N*/pSet->GetItemState( SID_FILE_FILTEROPTIONS, TRUE, &pItem
) )
-/*N*/ {
-/*N*/ aOptions.ReadFromString( ((const
SfxStringItem*)pItem)->GetValue() );
-/*N*/ bOptInit = TRUE;
-/*N*/ }
-/*N*/
-/*N*/ if ( !bOptInit )
-/*N*/ {
-/*?*/ // default for ascii import (from API without options):
-/*?*/ // ISO8859-1/MS_1252 encoding, comma, double quotes
-/*?*/
-/*?*/ aOptions.SetCharSet( RTL_TEXTENCODING_MS_1252 );
-/*?*/ aOptions.SetFieldSeps( (sal_Unicode) ',' );
-/*?*/ aOptions.SetTextSep( (sal_Unicode) '"' );
-/*N*/ }
-/*N*/
-/*N*/ FltError eError = eERR_OK;
-/*N*/ BOOL bOverflow = FALSE;
-/*N*/
-/*N*/ if( ! rMedium.IsStorage() )
-/*N*/ {
-/*N*/ ScImportExport aImpEx( &aDocument );
-/*N*/ aImpEx.SetExtOptions( aOptions );
-/*N*/
-/*N*/ SvStream* pInStream = rMedium.GetInStream();
-/*N*/ if (pInStream)
-/*N*/ {
-/*N*/ pInStream->SetStreamCharSet( aOptions.GetCharSet() );
-/*N*/ pInStream->Seek( 0 );
-/*N*/ bRet = aImpEx.ImportStream( *pInStream );
-/*N*/ eError = bRet ? eERR_OK : SCERR_IMPORT_CONNECT;
-/*N*/ aDocument.StartAllListeners();
-/*N*/ aDocument.SetDirty();
-/*N*/ bOverflow = aImpEx.IsOverflow();
-/*N*/ }
-/*N*/ else
-/*N*/ OSL_FAIL( "No Stream" );
-/*N*/ }
-/*N*/
-/*N*/ if (eError != eERR_OK)
-/*N*/ {
-/*N*/ if (!GetError())
-/*N*/ SetError(eError);
-/*N*/ }
-/*N*/ else if ( bOverflow )
-/*N*/ {
-/*N*/ if (!GetError())
-/*N*/ SetError(SCWARN_IMPORT_RANGE_OVERFLOW);
-/*N*/ }
-/*N*/ bSetColWidths = TRUE;
-/*N*/ bSetSimpleTextColWidths = TRUE;
-/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterDif))
-/*N*/ {
-/*?*/ bSetColWidths = TRUE;
-/*?*/ bSetSimpleTextColWidths = TRUE;
-/*N*/ }
-/*N*/ else if (aFltName.EqualsAscii(pFilterSylk))
-/*N*/ {
-/*?*/ FltError eError = SCERR_IMPORT_UNKNOWN;
-/*?*/ if( !rMedium.IsStorage() )
-/*?*/ {
-/*?*/ ScImportExport aImpEx( &aDocument );
-/*?*/
-/*?*/ SvStream* pInStream = rMedium.GetInStream();
-/*?*/ if (pInStream)
-/*?*/ {
-/*?*/ pInStream->Seek( 0 );
-/*?*/ bRet = aImpEx.ImportStream( *pInStream,
SOT_FORMATSTR_ID_SYLK );
-/*?*/ eError = bRet ? eERR_OK : SCERR_IMPORT_UNKNOWN;
-/*?*/ aDocument.StartAllListeners();
-/*?*/ aDocument.SetDirty();
-/*?*/ }
-/*?*/ else
-/*?*/ OS
[Libreoffice-commits] .: desktop/source framework/source jvmfwk/source package/source
desktop/source/deployment/gui/dp_gui_extlistbox.cxx |2 +-
desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx |2 +-
desktop/source/deployment/manager/dp_extensionmanager.cxx|2 +-
desktop/source/deployment/manager/dp_properties.cxx |2 +-
desktop/source/deployment/registry/dp_backenddb.cxx |2 +-
desktop/source/deployment/registry/package/dp_package.cxx|4 ++--
framework/source/uielement/toolbarsmenucontroller.cxx|2 +-
jvmfwk/source/elements.cxx |2 +-
package/source/xstor/ohierarchyholder.cxx|2 +-
9 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 7d2508572a0389bcb1c803911024296f411af653
Author: Julien Nabet
Date: Thu Apr 5 21:15:13 2012 +0200
Fix Prefer prefix ++/-- operators
Includes too replacement < by != for comparison between current and end
iterators
diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 96c5b1c..03bf3cb 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -337,7 +337,7 @@ void ExtensionBox_Impl::select( const rtl::OUString & sName
)
const ::osl::MutexGuard aGuard( m_entriesMutex );
typedef ::std::vector< TEntry_Impl >::const_iterator It;
-for ( It iIter = m_vEntries.begin(); iIter < m_vEntries.end(); iIter++ )
+for ( It iIter = m_vEntries.begin(); iIter != m_vEntries.end(); ++iIter )
{
if ( sName.equals( (*iIter)->m_sTitle ) )
{
diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
index 8852e93..8023678 100644
--- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx
@@ -424,7 +424,7 @@ void UpdateInstallDialog::Thread::downloadExtensions()
//Construct a string of all messages contained in the
exceptions plus the respective download URLs
::rtl::OUStringBuffer buf(256);
typedef ::std::vector< ::std::pair >::const_iterator CIT;
-for (CIT j = vecExceptions.begin(); j !=
vecExceptions.end(); j++)
+for (CIT j = vecExceptions.begin(); j !=
vecExceptions.end(); ++j)
{
if (j != vecExceptions.begin())
buf.appendAscii("\n");
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx
b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index d7654b6..b5822ec 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1181,7 +1181,7 @@ uno::Sequence< uno::Sequence
> >
citVecVec = vecExtensions.begin();
sal_Int32 j = 0;
uno::Sequence< uno::Sequence > >
seqSeq(vecExtensions.size());
-for (;citVecVec != vecExtensions.end(); citVecVec++, j++)
+for (;citVecVec != vecExtensions.end(); ++citVecVec, j++)
{
seqSeq[j] = comphelper::containerToSequence(*citVecVec);
}
diff --git a/desktop/source/deployment/manager/dp_properties.cxx
b/desktop/source/deployment/manager/dp_properties.cxx
index ec8120f..160e8a5 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -69,7 +69,7 @@ ExtensionProperties::ExtensionProperties(
dp_misc::readProperties(props, contentProps);
typedef ::std::list< ::std::pair< OUString, OUString> >::const_iterator CI;
-for (CI i = props.begin(); i != props.end(); i++)
+for (CI i = props.begin(); i != props.end(); ++i)
{
if (i->first.equals(OUSTR(PROP_SUPPRESS_LICENSE)))
m_prop_suppress_license = i->second;
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx
b/desktop/source/deployment/registry/dp_backenddb.cxx
index a219f13..1d06860 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -311,7 +311,7 @@ void BackendDb::writeVectorOfPair(
Reference(
vectorNode, css::uno::UNO_QUERY_THROW));
typedef ::std::vector< ::std::pair< OUString, OUString >
>::const_iterator CIT;
-for (CIT i = vecPairs.begin(); i != vecPairs.end(); i++)
+for (CIT i = vecPairs.begin(); i != vecPairs.end(); ++i)
{
const Reference pairNode(
doc->createElementNS(sNameSpace, sPrefix + sPairTagName));
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx
b/desktop/source/deployment/registry/package/dp_package.cxx
index 997fef4..23f583e 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/dep
[Libreoffice-commits] .: extensions/Module_extensions.mk postprocess/packcomponents postprocess/packregistry scp2/source setup_native/scripts
extensions/Module_extensions.mk |7 ++- postprocess/packcomponents/makefile.mk |8 ++-- postprocess/packregistry/makefile.mk | 16 scp2/source/onlineupdate/file_onlineupdate.scp |2 ++ scp2/source/onlineupdate/module_onlineupdate.scp |5 - scp2/source/ooo/file_library_ooo.scp |2 -- scp2/source/ooo/file_resource_ooo.scp|2 ++ scp2/source/ooo/module_hidden_ooo.scp|1 - setup_native/scripts/makefile.mk |5 - 9 files changed, 32 insertions(+), 16 deletions(-) New commits: commit 7a56eef989b828c495d34c34de99d1b863f223e2 Author: Stephan Bergmann Date: Thu Apr 5 21:03:31 2012 +0200 Clean up optional online update module * The updatecheckui lib is part of that module; should its scp entry also be marked ComponentCondition="ISCHECKFORPRODUCTUPDATES=1"? * unpack_update (and other scripts as well?) need only be generated if ENABLE_ONLINE_UPDATE. * It is inconsistent that there is a distinct onlineupdate.xcd not merged into main.xcd, while the updchk and updatecheckui component files are merged into the global services.rdb. * The updchk res file should also go into (a resource sub-module of) the optional online update module. diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index 00b7d7c..30144de 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -52,10 +52,14 @@ endif ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,extensions,\ + Library_updatefeed \ +)) + +ifeq ($(ENABLE_ONLINE_UPDATE),TRUE) +$(eval $(call gb_Module_add_targets,extensions,\ AllLangResTarget_updchk \ Configuration_updchk \ Library_updatecheckui \ - Library_updatefeed \ Library_updchk \ )) @@ -63,6 +67,7 @@ $(eval $(call gb_Module_add_check_targets,extensions,\ CppunitTest_extensions_test_update \ )) endif +endif ifeq ($(OS),WNT) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 488e322..711e1a0 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -167,9 +167,7 @@ my_components += \ component/extensions/source/propctrlr/pcr \ component/extensions/source/resource/res \ component/extensions/source/scanner/scn \ -component/extensions/source/update/check/updchk.uno \ component/extensions/source/update/feed/updatefeed \ -component/extensions/source/update/ui/updchk \ component/fpicker/source/generic/fpicker \ component/fpicker/source/office/fps_office \ syssh \ @@ -262,6 +260,12 @@ my_components += kdebe1 my_components += kde4be1 .END +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" +my_components += \ +component/extensions/source/update/check/updchk.uno \ +component/extensions/source/update/ui/updchk +.END + .IF "$(ENABLE_OPENGL)" == "TRUE" my_components += component/slideshow/source/engine/OGLTrans/ogltrans .END diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index f17b944..c9a73bd 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -46,7 +46,6 @@ MY_XCDS = \ $(MISC)/lingucomponent.xcd \ $(MISC)/main.xcd \ $(MISC)/math.xcd \ -$(MISC)/onlineupdate.xcd \ $(MISC)/palm.xcd \ $(MISC)/pocketexcel.xcd \ $(MISC)/pocketword.xcd \ @@ -362,13 +361,6 @@ MY_FILES_math = \ $(MY_MOD)/org/openoffice/Office/Embedding-math.xcu \ $(MY_MOD)/org/openoffice/Setup-math.xcu -.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" -MY_DEPS_onlineupdate = main -MY_FILES_onlineupdate = \ -$(MY_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \ -$(MY_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu -.ENDIF - MY_DEPS_palm = main MY_FILES_palm = \ $(MY_MOD)/fcfg_palm_filters.xcu \ @@ -465,6 +457,14 @@ MY_FILES_gnome += \ .END .END +.IF "$(ENABLE_ONLINE_UPDATE)" == "TRUE" +MY_XCDS += $(MISC)/onlineupdate.xcd \ +MY_DEPS_onlineupdate = main +MY_FILES_onlineupdate = \ +$(MY_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \ +$(MY_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu +.ENDIF + .IF "$(ENABLE_OPENGL)" == "TRUE" MY_XCDS += $(MISC)/ogltrans.xcd MY_DEPS_ogltrans = main diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp index 63d1968..023097f 100644 --- a/scp2/source/onlineupdate/file_onlineupdate.scp +++ b/scp2/source/onlineupdate/file_onlineupdate.scp @@ -35,6 +35,8 @@ File gid_File_Lib_Updchk ComponentCondition="ISCHECKFORPRODUCTUPDATES=1"; End +STD_LIB_FILE(gid_File_Lib_Updchkui, updatecheckui) + File gid_File_Share_Registry_Onlineupdate_Xcd TXT_FILE_BODY; Styles = (PACKED); diff --git a/scp2/source/onlineupdate/module_on
[Libreoffice-commits] .: sc/source
sc/source/ui/unoobj/scdetect.cxx | 16
1 file changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 0de1b33bf73f075cff12fbe288129b2afff8216d
Author: Eike Rathke
Date: Thu Apr 5 19:48:10 2012 +0200
resolved fdo#48347 do not override preselected CSV with SYLK detection
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 0efb037..fdab373 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -444,8 +444,10 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
bool bIsXLS = false;
SvStream* pStream = aMedium.GetInStream();
const SfxFilter* pPreselectedFilter = pFilter;
+bool bCsvSelected = (pPreselectedFilter ?
+pPreselectedFilter->GetFilterName().EqualsAscii(
pFilterAscii ) : false);
if ( pPreselectedFilter && ( (
pPreselectedFilter->GetName().SearchAscii("Excel") != STRING_NOTFOUND ) ||
-( !aPreselectedFilterName.Len() &&
pPreselectedFilter->GetFilterName().EqualsAscii( pFilterAscii ) ) ) )
+( !aPreselectedFilterName.Len() && bCsvSelected ) ) )
bIsXLS = true;
pFilter = 0;
if ( pStream )
@@ -676,9 +678,15 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
for ( nFilter = 0 ; nFilter < nFilterCount ; nFilter++
)
{
+pSearch = ppFilterPatterns[ nFilter ];
+if (bCsvSelected && pSearch == pSylk)
+// SYLK 4 characters is really too weak to
+// override preselected CSV, already ID;Name
+// would trigger that. fdo#48347
+continue;
+
rStr.Seek( 0 ); // am Anfang war alles Uebel...
rStr >> nAkt;
-pSearch = ppFilterPatterns[ nFilter ];
bSync = sal_True;
while( !rStr.IsEof() && bSync )
{
@@ -759,7 +767,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
}
else if (
pPreselectedFilter->GetName().EqualsAscii(pFilterDBase) && lcl_MayBeDBase( rStr
) )
pFilter = pPreselectedFilter;
-else if (
pPreselectedFilter->GetFilterName().EqualsAscii(pFilterAscii) && bMaybeText )
+else if ( bCsvSelected && bMaybeText )
pFilter = pPreselectedFilter;
else if (
HTMLParser::IsHTMLFormat(aHeader.getStr()) )
{
@@ -789,7 +797,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
{
// 0-length stream, preselected Text/CSV is ok, user
// may want to write to that file later.
-if (
pPreselectedFilter->GetFilterName().EqualsAscii(pFilterAscii) )
+if ( bCsvSelected )
pFilter = pPreselectedFilter;
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - android/Bootstrap android/experiments cppu/source sal/osl
android/Bootstrap/src/org/libreoffice/android/Bootstrap.java
|6
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
|2
cppu/source/uno/lbmap.cxx
|4
sal/osl/unx/file.cxx
| 78 --
4 files changed, 70 insertions(+), 20 deletions(-)
New commits:
commit 0d5f437bf7ee3ea8cf9787ccf8bf22d67eee92b8
Author: Tor Lillqvist
Date: Thu Apr 5 20:36:08 2012 +0300
Catch attempts to open /assets files read-write. Improve debugging output
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 5e59f7c..dbf256d 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -856,11 +856,11 @@ static int osl_file_queryLocking (sal_uInt32 uFlags)
#ifdef UNX
-oslFileError
-SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle
*pHandle )
+static oslFileError
+osl_openMemoryAsFile( void *address, size_t size, oslFileHandle *pHandle,
const char *path )
{
oslFileError eRet;
-FileHandle_Impl * pImpl = new FileHandle_Impl (-1,
FileHandle_Impl::KIND_MEM);
+FileHandle_Impl * pImpl = new FileHandle_Impl (-1,
FileHandle_Impl::KIND_MEM, path);
if (!pImpl)
{
eRet = oslTranslateFileError (OSL_FET_ERROR, ENOMEM);
@@ -879,6 +879,12 @@ SAL_CALL osl_openMemoryAsFile( void *address, size_t size,
oslFileHandle *pHandl
return osl_File_E_None;
}
+oslFileError
+SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle
*pHandle )
+{
+return osl_openMemoryAsFile( address, size, pHandle, "" );
+}
+
#endif
/
@@ -901,20 +907,27 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle* pHandle, sal_u
/* Opening a file from /assets read-only means
* we should mmap it from the .apk file
*/
-if (!(uFlags & osl_File_OpenFlag_Write) &&
-strncmp (cpFilePath, "/assets/", sizeof ("/assets/") - 1) == 0)
+if (strncmp (cpFilePath, "/assets/", sizeof ("/assets/") - 1) == 0)
{
+if (uFlags & osl_File_OpenFlag_Write)
+{
+// Or should we just silently "open" it read-only and let write
+// attempts, if any, fail then later?
+OSL_TRACE("osl_openFile(%s, writeable), not possible!",
cpFilePath);
+errno = EPERM;
+return osl_File_E_PERM;
+}
void *address;
size_t size;
address = lo_apkentry(cpFilePath, &size);
-OSL_TRACE("osl_openFile(%s): %p",
+OSL_TRACE("osl_openFile(%s) => %p",
cpFilePath, address);
if (address == NULL)
{
errno = ENOENT;
return osl_File_E_NOENT;
}
-return osl_openMemoryAsFile(address, size, pHandle);
+return osl_openMemoryAsFile(address, size, pHandle, cpFilePath);
}
#endif
@@ -952,7 +965,14 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle* pHandle, sal_u
/* open the file */
int fd = open( cpFilePath, flags, mode );
if (-1 == fd)
-return oslTranslateFileError (OSL_FET_ERROR, errno);
+{
+int saved_errno = errno;
+OSL_TRACE("osl_openFile(%s, %s) failed: %s",
+ cpFilePath,
+ flags & O_RDWR ? "writeable":"readonly",
+ strerror(saved_errno));
+return oslTranslateFileError (OSL_FET_ERROR, saved_errno);
+}
/* reset O_NONBLOCK flag */
if (flags & O_NONBLOCK)
@@ -960,13 +980,25 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
oslFileHandle* pHandle, sal_u
int f = fcntl (fd, F_GETFL, 0);
if (-1 == f)
{
-eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+int saved_errno = errno;
+OSL_TRACE("osl_openFile(%s, %s): fcntl(%d, F_GETFL) failed: %s",
+ cpFilePath,
+ flags & O_RDWR ? "writeable":"readonly",
+ fd,
+ strerror(saved_errno));
+eRet = oslTranslateFileError (OSL_FET_ERROR, saved_errno);
(void) close(fd);
return eRet;
}
if (-1 == fcntl (fd, F_SETFL, (f & ~O_NONBLOCK)))
{
-eRet = oslTranslateFileError (OSL_FET_ERROR, errno);
+int saved_errno = errno;
+OSL_TRACE("osl_openFile(%s, %s): fcntl(%d, F_SETFL) failed: %s",
+ cpFilePath,
+ flags & O_RDWR ? "writeable":"readonly",
+ fd,
+ strerror(saved_errno));
+eRet = oslTranslateFileError (OSL_FET_ERROR, saved_errno);
(void) close(fd);
return eRet;
}
@@ -976,13 +1008,21 @@ SAL_CALL osl_openFilePath( const char *cpFilePath,
[Libreoffice-commits] .: sc/source sfx2/inc sfx2/source sw/source
sc/source/ui/view/tabview.cxx| 25 +
sfx2/inc/sfx2/viewsh.hxx | 11 ---
sfx2/source/view/viewimp.hxx |3 ---
sfx2/source/view/viewsh.cxx |8
sw/source/ui/uiview/viewport.cxx | 38 ++
5 files changed, 11 insertions(+), 74 deletions(-)
New commits:
commit c5154a179f435cc23798057895b0db8312bcd6f6
Author: Ivan Timofeev
Date: Thu Apr 5 21:08:26 2012 +0400
SfxViewShell::GetScrollingMode always returns SCROLLING_DEFAULT
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index a2784e1..219f9d2 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -407,13 +407,6 @@ void ScTabView::DoResize( const Point& rOffset, const
Size& rSize, bool bInner )
bool bHOutline = bOutlMode && lcl_HasColOutline(aViewData);
bool bVOutline = bOutlMode && lcl_HasRowOutline(aViewData);
-// Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
-SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
-if ( eMode == SCROLLING_NO )
-bHScroll = bVScroll = false;
-else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto
???
-bHScroll = bVScroll = true;
-
if ( aViewData.GetDocShell()->IsPreview() )
bHScroll = bVScroll = bTabControl = bHeaders = bOutlMode = bHOutline =
bVOutline = false;
@@ -899,16 +892,7 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const
Size& /* rSize */ )
IMPL_LINK_NOARG(ScTabView, TabBarResize)
{
-sal_Bool bHScrollMode = aViewData.IsHScrollMode();
-
-// Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
-SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
-if ( eMode == SCROLLING_NO )
-bHScrollMode = false;
-else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto
???
-bHScrollMode = sal_True;
-
-if( bHScrollMode )
+if (aViewData.IsHScrollMode())
{
const long nOverlap = 0;// ScrollBar::GetWindowOverlapPixel();
long nSize = pTabControl->GetSplitSize();
@@ -1572,13 +1556,6 @@ void ScTabView::UpdateShow()
sal_Bool bShowH = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE );
sal_Bool bShowV = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE );
-// Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden:
-SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode();
-if ( eMode == SCROLLING_NO )
-bHScrollMode = bVScrollMode = false;
-else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto
???
-bHScrollMode = bVScrollMode = sal_True;
-
if ( aViewData.GetDocShell()->IsPreview() )
bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode =
bHOutline = bVOutline = false;
diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx
index 869de36..d2da4cb 100644
--- a/sfx2/inc/sfx2/viewsh.hxx
+++ b/sfx2/inc/sfx2/viewsh.hxx
@@ -83,14 +83,6 @@ class NotifyEvent;
#define SFX_PRINTERROR_NONE 0
#define SFX_PRINTERROR_BUSY 1
-enum SfxScrollingMode
-{
-SCROLLING_NO,
-SCROLLING_YES,
-SCROLLING_AUTO,
-SCROLLING_DEFAULT
-};
-
// "Verified" using www.apple.com and Netscape 3.01
#define DEFAULT_MARGIN_WIDTH 8
#define DEFAULT_MARGIN_HEIGHT 12
@@ -207,9 +199,6 @@ public:
virtual voidJumpToMark( const String& rMark );
voidVisAreaChanged(const Rectangle& rRect);
-// Behavior Flags
-SfxScrollingModeGetScrollingMode() const;
-
// Misc
virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True,
sal_Bool bForBrowsing = sal_False );
virtual String GetSelectionText( sal_Bool bCompleteWords =
sal_False );
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx
index 3d77c18..31dfdc7 100644
--- a/sfx2/source/view/viewimp.hxx
+++ b/sfx2/source/view/viewimp.hxx
@@ -63,11 +63,8 @@ struct SfxViewShell_Impl
boolm_bHasPrintOptions;
boolm_bPlugInsActive;
boolm_bIsShowView;
-// FIXME UNUSED ???
-//boolm_bOwnsMenu;
boolm_bGotOwnership;
boolm_bGotFrameOwnership;
-SfxScrollingModem_eScroll;
sal_uInt16 m_nFamily;
::rtl::Reference m_pController;
::std::auto_ptr< ::svt::AcceleratorExecute >m_pAccExec;
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 3c6a2de..dc7cdf6 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -301,7 +301,6 @@ SfxViewShell_Impl::SfxViewShell_Impl(sal_uInt16 const
nFlags)
, m_bIsShowView(SFX_VIEW_NO_SHOW != (nFlags & SFX_VIEW_NO_SHOW))
, m_bGotOwnership(false)
, m_bGotFrameOwnership(false)
-,
[Libreoffice-commits] .: 2 commits - sfx2/source shell/source
sfx2/source/dialog/filedlghelper.cxx | 11 ++-
shell/source/win32/shlxthandler/propsheets/makefile.mk |2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
New commits:
commit dc2fe18e95731dcb7c9e2027f45fdaf265490592
Author: Michael Stahl
Date: Thu Apr 5 18:09:41 2012 +0200
fdo#43895 lp#905355: fix the fix so it doesn't crash
rtl::OUString rtl::OUString::copy(sal_Int32) const: Assertion
`beginIndex >= 0 && beginIndex <= getLength()' failed.
(regression from dd2fe95cce75f1157bd1c75d286a0047b2e4175e)
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index 0018912..37a2f29 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1641,8 +1641,17 @@ void FileDialogHelper_Impl::getRealFilter( String&
_rFilter ) const
void FileDialogHelper_Impl::verifyPath()
{
#ifdef UNX
+static char const s_FileScheme[] = "file://";
+if (0 != rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
+maPath.getStr(), maPath.getLength(),
+s_FileScheme, RTL_CONSTASCII_LENGTH(s_FileScheme)))
+{
+return;
+}
+const OString sFullPath = OUStringToOString(
+maPath.copy(RTL_CONSTASCII_LENGTH(s_FileScheme)) + maFileName,
+osl_getThreadTextEncoding() );
struct stat aFileStat;
-const OString sFullPath = OUStringToOString(
maPath.copy(RTL_CONSTASCII_LENGTH("file://")) + maFileName,
osl_getThreadTextEncoding() );
stat( sFullPath.getStr(), &aFileStat );
// lp#905355, fdo#43895
// Check that the file has read only permission and is in /tmp -- this is
commit d564c79e6d0780882845a28d8ab32f9eb3dee03b
Author: Michael Stahl
Date: Thu Apr 5 12:59:37 2012 +0200
shell: fix silly flags from 2c5a817591
diff --git a/shell/source/win32/shlxthandler/propsheets/makefile.mk
b/shell/source/win32/shlxthandler/propsheets/makefile.mk
index 1d67510..08adff7 100644
--- a/shell/source/win32/shlxthandler/propsheets/makefile.mk
+++ b/shell/source/win32/shlxthandler/propsheets/makefile.mk
@@ -41,7 +41,7 @@ CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE
-D_WIN32_IE=0x501
CFLAGS+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
CFLAGS_X64+=-DISOLATION_AWARE_ENABLED -DWIN32_LEAN_AND_MEAN -DXML_UNICODE
-D_NTSDK -DUNICODE -D_UNICODE
CFLAGS_X64+=-wd4710 -wd4711 -wd4514 -wd4619 -wd4217 -wd4820
-CDEFS_X64+=-U_WIN32_IE -D_WIN32_WINNT=0x0501 -U_WIN32_WINNT -D_WIN32_IE=0x501
+CDEFS_X64+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0501 -U_WIN32_IE -D_WIN32_IE=0x501
.ENDIF
.IF "$(SYSTEM_ZLIB)" == "YES"
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - vcl/source
vcl/source/gdi/outdev2.cxx | 84 -
1 file changed, 45 insertions(+), 39 deletions(-)
New commits:
commit 7a9ea6e5696af0816651675d8f7538198cdce4da
Author: Muthu Subramanian
Date: Thu Mar 29 16:08:56 2012 +0530
n714787: Duplicate code removal.
(cherry picked from commit 27d9df17c13b22aed7d9194d9dfcf7980b632b3c)
Signed-off-by: Caolán McNamara
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 23a7952..2b2e375 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1623,6 +1623,36 @@ namespace
(int)nDstAlpha*nDestColor*nSourceAlpha/255 ) /
(int)nResAlpha : 0;
return sal_uInt8( c );
}
+
+inline BitmapColor lcl_AlphaBlend( int nX, int nY,
+ const longnMapX,
+ const longnMapY,
+ BitmapReadAccess* pP,
+ BitmapReadAccess* pA,
+ BitmapReadAccess* pB,
+ BitmapWriteAccess*pAlphaW,
+ sal_uInt8&nResAlpha )
+{
+BitmapColor aDstCol,aSrcCol;
+aSrcCol = pP->GetColor( nMapY, nMapX );
+aDstCol = pB->GetColor( nY, nX );
+
+// vcl stores transparency, not alpha - invert it
+const sal_uInt8 nSrcAlpha = 255 - pA->GetPixel( nMapY, nMapX
).GetBlueOrIndex();
+const sal_uInt8 nDstAlpha = 255 - pAlphaW->GetPixel( nY, nX
).GetBlueOrIndex();
+
+// Perform porter-duff compositing 'over' operation
+//
+// Co = Cs + Cd*(1-As)
+// Ad = As + Ad*(1-As)
+nResAlpha = (int)nSrcAlpha + (int)nDstAlpha - (int)nDstAlpha*nSrcAlpha/255;
+
+aDstCol.SetRed( lcl_calcColor( aSrcCol.GetRed(), nSrcAlpha, nDstAlpha,
nResAlpha, aDstCol.GetRed() ) );
+aDstCol.SetBlue( lcl_calcColor( aSrcCol.GetBlue(), nSrcAlpha, nDstAlpha,
nResAlpha, aDstCol.GetBlue() ) );
+aDstCol.SetGreen( lcl_calcColor( aSrcCol.GetGreen(), nSrcAlpha, nDstAlpha,
nResAlpha, aDstCol.GetGreen() ) );
+
+return aDstCol;
+}
}
//
@@ -1638,9 +1668,10 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap
aBmp,
const long* pMapX,
const long* pMapY )
{
-BitmapColor aDstCol,aSrcCol;
+BitmapColor aDstCol;
Bitmap res;
int nX, nY;
+sal_uInt8 nResAlpha;
OSL_ENSURE(mpAlphaVDev,
"ImplBlendWithAlpha(): call me only with valid alpha VDev!" );
@@ -1673,22 +1704,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap
aBmp,
const long nMapX = pMapX[ nX ];
const sal_uLong nD = nVCLDitherLut[ nModY | ( nOutX &
0x0FL ) ];
-aSrcCol = pP->GetColor( nMapY, nMapX );
-aDstCol = pB->GetColor( nY, nX );
-
-// vcl stores transparency, not alpha - invert it
-const sal_uInt8 nSrcAlpha = 255 - pA->GetPixel( nMapY,
nMapX ).GetBlueOrIndex();
-const sal_uInt8 nDstAlpha = 255 - pAlphaW->GetPixel( nY,
nX ).GetBlueOrIndex();
-
-// Perform porter-duff compositing 'over' operation
-//
-// Co = Cs + Cd*(1-As)
-// Ad = As + Ad*(1-As)
-const sal_uInt8 nResAlpha = (int)nSrcAlpha +
(int)nDstAlpha - (int)nDstAlpha*nSrcAlpha/255;
-
-aDstCol.SetRed( lcl_calcColor( aSrcCol.GetRed(),
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetRed() ) );
-aDstCol.SetBlue( lcl_calcColor( aSrcCol.GetBlue(),
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetBlue() ) );
-aDstCol.SetGreen( lcl_calcColor( aSrcCol.GetGreen(),
nSrcAlpha, nDstAlpha, nResAlpha, aDstCol.GetGreen() ) );
+aDstCol = lcl_AlphaBlend( nX, nY, nMapX, nMapY, pP, pA,
pB, pAlphaW, nResAlpha );
aIndex.SetIndex( (sal_uInt8) ( nVCLRLut[ ( nVCLLut[
aDstCol.GetRed() ] + nD ) >> 16UL ] +
nVCLGLut[ ( nVCLLut[
aDstCol.GetGreen() ] + nD ) >> 16UL ] +
@@ -1719,23 +1735,7 @@ Bitmap OutputDevice::ImplBlendWithAlpha( Bitmap
aBmp,
for( nX = 0; nX < nDstWidth; nX++ )
{
const long nMapX = pMapX[ nX ];
-
-aSrcCol = pP->GetColor( nMapY, nMapX );
-aDstCol = pB->GetColor( nY, nX );
-
-// vcl stores transparency, not alpha - invert it
-const sal_uInt8 nSrcAlpha = 255 - pA->GetPixel( nMapY,
nMapX ).GetBlueOrIndex();
-const sal_uInt8 nDstAlpha = 255 - pAlphaW->GetPixel( nY,
nX ).GetBlue
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - stoc/source
stoc/source/inspect/introspection.cxx | 83 +++---
1 file changed, 47 insertions(+), 36 deletions(-)
New commits:
commit 964f6cd7e891e39bf97dfec772bc3125e147b489
Author: Caolán McNamara
Date: Thu Apr 5 14:08:39 2012 +0100
Resolves: fdo#47068 use of pointer to deleted object
Signed-off-by: Stephan Bergmann
diff --git a/stoc/source/inspect/introspection.cxx
b/stoc/source/inspect/introspection.cxx
index 3b0ecf6..e8a2084 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -735,9 +735,6 @@ class ImplIntrospectionAdapter :
public XEnumerationAccess, public XIdlArray,
public OWeakObject
{
-// Parent-Objekt
-ImplIntrospectionAccess* mpAccess;
-
// Untersuchtes Objekt
const Any& mrInspectedObject;
@@ -757,8 +754,7 @@ class ImplIntrospectionAdapter :
ReferencemxObjIdlArray;
public:
-ImplIntrospectionAdapter( ImplIntrospectionAccess* pAccess_,
-const Any& obj, IntrospectionAccessStatic_Impl* pStaticImpl_ );
+ImplIntrospectionAdapter( const Any& obj, IntrospectionAccessStatic_Impl*
pStaticImpl_ );
~ImplIntrospectionAdapter();
// Methoden von XInterface
@@ -836,9 +832,9 @@ public:
throw( IllegalArgumentException, ArrayIndexOutOfBoundsException,
RuntimeException );
};
-ImplIntrospectionAdapter::ImplIntrospectionAdapter( ImplIntrospectionAccess*
pAccess_,
-const Any& obj, IntrospectionAccessStatic_Impl* pStaticImpl_ )
-: mpAccess( pAccess_), mrInspectedObject( obj ), mpStaticImpl(
pStaticImpl_ )
+ImplIntrospectionAdapter::ImplIntrospectionAdapter( const Any& obj,
+IntrospectionAccessStatic_Impl* pStaticImpl_ )
+: mrInspectedObject( obj ), mpStaticImpl( pStaticImpl_ )
{
mpStaticImpl->acquire();
@@ -1077,16 +1073,54 @@ Sequence< Property >
ImplIntrospectionAdapter::getProperties(void) throw( Runtim
return mpStaticImpl->getProperties();
}
+namespace
+{
+Property getPropertyImpl(IntrospectionAccessStatic_Impl *pStaticImpl,
const OUString& Name, sal_Int32 PropertyConcepts)
+throw( NoSuchElementException, RuntimeException )
+{
+Property aRet;
+sal_Int32 i = pStaticImpl->getPropertyIndex( Name );
+sal_Bool bFound = sal_False;
+if( i != -1 )
+{
+sal_Int32 nConcept =
pStaticImpl->getPropertyConcepts().getConstArray()[ i ];
+if( (PropertyConcepts & nConcept) != 0 )
+{
+const Property* pProps =
pStaticImpl->getProperties().getConstArray();
+aRet = pProps[ i ];
+bFound = sal_True;
+}
+}
+if( !bFound )
+throw NoSuchElementException() ;
+return aRet;
+}
+
+sal_Bool hasPropertyImpl(IntrospectionAccessStatic_Impl *pStaticImpl,
const OUString& Name, sal_Int32 PropertyConcepts)
+throw( RuntimeException )
+{
+sal_Int32 i = pStaticImpl->getPropertyIndex( Name );
+sal_Bool bRet = sal_False;
+if( i != -1 )
+{
+sal_Int32 nConcept =
pStaticImpl->getPropertyConcepts().getConstArray()[ i ];
+if( (PropertyConcepts & nConcept) != 0 )
+bRet = sal_True;
+}
+return bRet;
+}
+}
+
Property ImplIntrospectionAdapter::getPropertyByName(const OUString& Name)
throw( RuntimeException )
{
-return mpAccess->getProperty( Name, PropertyConcept::ALL );
+return getPropertyImpl(mpStaticImpl, Name, PropertyConcept::ALL);
}
sal_Bool ImplIntrospectionAdapter::hasPropertyByName(const OUString& Name)
throw( RuntimeException )
{
-return mpAccess->hasProperty( Name, PropertyConcept::ALL );
+return hasPropertyImpl(mpStaticImpl, Name, PropertyConcept::ALL);
}
// Methoden von XElementAccess
@@ -1231,36 +1265,13 @@ sal_Int32
ImplIntrospectionAccess::getSuppliedPropertyConcepts(void)
Property ImplIntrospectionAccess::getProperty(const OUString& Name, sal_Int32
PropertyConcepts)
throw( NoSuchElementException, RuntimeException )
{
-Property aRet;
-sal_Int32 i = mpStaticImpl->getPropertyIndex( Name );
-sal_Bool bFound = sal_False;
-if( i != -1 )
-{
-sal_Int32 nConcept =
mpStaticImpl->getPropertyConcepts().getConstArray()[ i ];
-if( (PropertyConcepts & nConcept) != 0 )
-{
-const Property* pProps =
mpStaticImpl->getProperties().getConstArray();
-aRet = pProps[ i ];
-bFound = sal_True;
-}
-}
-if( !bFound )
-throw NoSuchElementException() ;
-return aRet;
+return getPropertyImpl(mpStaticImpl, Name, PropertyConcepts);
}
sal_Bool ImplIntrospectionAccess::hasProperty(const OUString& Name, sal_Int32
PropertyConcepts)
throw( RuntimeException )
{
-sal_Int32 i = mpStaticImpl->getPropertyIndex( Name );
-sal_Bool bRet = sal_False;
-if( i != -1 )
-{
-sal_Int32 nConcept =
m
[Libreoffice-commits] .: sc/source
sc/source/filter/oox/formulaparser.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 735a2cba30c55b5aff4883389f65255fb2d07458
Author: Caolán McNamara
Date: Thu Apr 5 15:43:49 2012 +0100
cppcheck Uninitialized variable
diff --git a/sc/source/filter/oox/formulaparser.cxx
b/sc/source/filter/oox/formulaparser.cxx
index eeb683f..aa4c0f7 100644
--- a/sc/source/filter/oox/formulaparser.cxx
+++ b/sc/source/filter/oox/formulaparser.cxx
@@ -2613,6 +2613,7 @@ bool BiffFormulaParserImpl::readNlrSAddrAddData( BiffNlr&
orNlr, BiffInputStream
bool BiffFormulaParserImpl::readNlrSRangeAddData( BiffNlr& orNlr, bool&
orbIsRow, BiffInputStream& rStrm )
{
+orbIsRow = false;
swapStreamPosition( rStrm );
// read number of cell addresses and relative flag
sal_uInt32 nCount;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/unoobj/scdetect.cxx | 39 ---
1 file changed, 24 insertions(+), 15 deletions(-)
New commits:
commit c2a26cf9dab637c292e431d5cdf7bab5bbda571d
Author: Eike Rathke
Date: Thu Apr 5 02:01:26 2012 +0200
resolved fdo#40021 CSV import got confused by erroneous HTML detection
HTMLParser::IsHTMLFormat() is convinced that anything containing a valid
HTML
tag would indeed be HTML, which is a rather idiotic assumption for us in the
case of "foo bar" with a preselected CSV filter. So keep this
detection to
the end.
The original order where preselected CSV had precedence over others was
changed
with 9f1cc58c20ee365ff2a158ad69c1091e6ad11ac6
(cherry picked from commit a5eadc6aaafec92df23c57e258882a2c98ece0ad)
Signed-off-by: Kohei Yoshida
Conflicts:
sc/source/ui/unoobj/scdetect.cxx
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index 9d33f09..556d54f 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -729,6 +729,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
// further checks for filters only if they are
preselected: ASCII, HTML, RTF, DBase
// without the preselection other filters (Writer)
take precedence
// DBase can't be detected reliably, so it also
needs preselection
+
bool bMaybeText = lcl_MayBeAscii( rStr );
// get file header
@@ -736,21 +737,7 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
const sal_Size nTrySize = 80;
ByteString aHeader = read_uInt8s_AsOString(rStr,
nTrySize);
-if ( HTMLParser::IsHTMLFormat( aHeader.GetBuffer()
) )
-{
-// test for HTML
-if (
pPreselectedFilter->GetName().EqualsAscii(pFilterHtml) )
-{
-pFilter = pPreselectedFilter;
-}
-else
-{
-pFilter = aMatcher.GetFilter4FilterName(
String::CreateFromAscii(pFilterHtmlWeb) );
-if ( bIsXLS )
-bFakeXLS = true;
-}
-}
-else if ( aHeader.CompareTo( "{\\rtf", 5 ) ==
COMPARE_EQUAL )
+if ( aHeader.CompareTo( "{\\rtf", 5 ) ==
COMPARE_EQUAL )
{
// test for RTF
pFilter = aMatcher.GetFilter4FilterName(
String::CreateFromAscii(pFilterRtf) );
@@ -769,6 +756,28 @@ static sal_Bool lcl_MayBeDBase( SvStream& rStream )
pFilter = pPreselectedFilter;
else if (
pPreselectedFilter->GetFilterName().EqualsAscii(pFilterAscii) && bMaybeText )
pFilter = pPreselectedFilter;
+else if ( HTMLParser::IsHTMLFormat(
aHeader.GetBuffer() ) )
+{
+// test for HTML
+
+// HTMLParser::IsHTMLFormat() is convinced that
+// anything containing a valid HTML tag would
+// indeed be HTML, which is a rather idiotic
+// assumption for us in the case of
+// "foo bar" with a preselected CSV
+// filter. So keep this detection to the end.
+
+if (
pPreselectedFilter->GetName().EqualsAscii(pFilterHtml) )
+{
+pFilter = pPreselectedFilter;
+}
+else
+{
+pFilter = aMatcher.GetFilter4FilterName(
String::CreateFromAscii(pFilterHtmlWeb) );
+if ( bIsXLS )
+bFakeXLS = true;
+}
+}
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/index/cnttab.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 37c1a9fde189f3010eec7392c44404e403555c52
Author: Ivan Timofeev
Date: Wed Apr 4 18:38:07 2012 +0400
fdo#40948: TOC dialog, Entries tab: the right arrow button does not work
regression from 39b8a5f87f55abe53488c9c3c35b65fb0df84cd.
(cherry picked from commit b49f69aee6f48fb9367a2a9548182dcd84eb5296)
Signed-off-by: Caolán McNamara
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 30f3a84..cb07f71 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -3419,7 +3419,7 @@ IMPL_LINK(SwTokenWindow, ScrollHdl, ImageButton*, pBtn )
{
//move the right neighbor to the right edge right aligned
ctrl_reverse_iterator itRight = it;
---it;
+--itRight;
Control *pRight = *itRight;
nMove = nSpace - pRight->GetPosPixel().X() -
pRight->GetSizePixel().Width();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sd/source
sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
| 29 ++
sd/source/ui/framework/configuration/Configuration.cxx
| 18 +--
sd/source/ui/framework/configuration/ConfigurationClassifier.cxx
| 24 +
sd/source/ui/framework/configuration/ConfigurationController.cxx
| 32 +-
sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.cxx
| 47 +++---
sd/source/ui/framework/configuration/ConfigurationUpdater.cxx
| 43 ++---
sd/source/ui/framework/module/ModuleController.cxx
| 15 ---
sd/source/ui/tools/TimerBasedTaskExecution.cxx
| 15 ---
sd/source/ui/view/ToolBarManager.cxx
|8 -
9 files changed, 72 insertions(+), 159 deletions(-)
New commits:
commit 45413e32fe643bda1cc1647c8af7eae3309e9c7d
Author: Rob Snelders
Date: Wed Apr 4 19:57:05 2012 +0200
Removal VERBOSE
diff --git
a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
index 92982b7..cbefb08 100644
--- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
+++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx
@@ -42,18 +42,15 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::drawing::framework;
-#undef VERBOSE
-//#define VERBOSE 1
-
namespace {
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL > 0
void TraceRequest (const Reference& rxRequest)
{
Reference xNamed (rxRequest, UNO_QUERY);
if (xNamed.is())
-OSL_TRACE("%s\n",
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ":" <<
::rtl::OUStringToOString(xNamed->getName(),
RTL_TEXTENCODING_UTF8).getStr());
}
@@ -105,14 +102,14 @@ void ChangeRequestQueueProcessor::AddRequest (
{
::osl::MutexGuard aGuard (maMutex);
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL >= 2
if (maQueue.empty())
{
-OSL_TRACE("Adding requests to empty queue");
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Adding requests to empty
queue");
ConfigurationTracer::TraceConfiguration(
mxConfiguration, "current configuration of queue processor");
}
-OSL_TRACE("Adding request");
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": Adding request");
TraceRequest(rxRequest);
#endif
@@ -131,9 +128,7 @@ void ChangeRequestQueueProcessor::StartProcessing (void)
&& mxConfiguration.is()
&& ! maQueue.empty())
{
-#ifdef VERBOSE
-OSL_TRACE("ChangeRequestQueueProcessor scheduling processing");
-#endif
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ChangeRequestQueueProcessor
scheduling processing");
mnUserEventId = Application::PostUserEvent(
LINK(this,ChangeRequestQueueProcessor,ProcessEvent));
}
@@ -168,9 +163,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
{
::osl::MutexGuard aGuard (maMutex);
-#ifdef VERBOSE
-OSL_TRACE("ProcessOneEvent");
-#endif
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": ProcessOneEvent");
if (mxConfiguration.is()
&& ! maQueue.empty())
@@ -182,7 +175,7 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
// Execute the change request.
if (xRequest.is())
{
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL >= 2
TraceRequest(xRequest);
#endif
xRequest->execute(mxConfiguration);
@@ -190,14 +183,12 @@ void ChangeRequestQueueProcessor::ProcessOneEvent (void)
if (maQueue.empty())
{
-#ifdef VERBOSE
-OSL_TRACE("All requests are processed");
-#endif
+SAL_INFO("sd.fwk", OSL_THIS_FUNC << ": All requests are
processed");
// The queue is empty so tell the ConfigurationManager to update
// its state.
if (mpConfigurationUpdater.get() != NULL)
{
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL >= 2
ConfigurationTracer::TraceConfiguration (
mxConfiguration, "updating to configuration");
#endif
diff --git a/sd/source/ui/framework/configuration/Configuration.cxx
b/sd/source/ui/framework/configuration/Configuration.cxx
index 16b25eb..0e01cc9 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -40,8 +40,6 @@ using namespace ::com::sun::star::drawing::framework;
using ::sd::framework::FrameworkHelper;
using ::rtl::OUString;
-#undef VERBOSE
-
namespace {
/** Use the XResourceId::compareTo() method to implement a compare operator
for STL containers.
@@ -163,11 +161,9 @@ void SAL_CALL Configuration::addResource (const
Reference& rxResour
if (mpResourceContainer->find(rxResourceId) == mpResourceContainer->end())
{
-#ifdef VERBOSE
-OSL_T
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 182 +
writerfilter/source/rtftok/rtfdocumentimpl.hxx | 33 +++-
2 files changed, 149 insertions(+), 66 deletions(-)
New commits:
commit 830c2151d48e0821b183348c1778856f7d85d296
Author: Miklos Vajna
Date: Sat Mar 24 14:55:09 2012 +0100
fdo#47036 fix RTF import of multi-paragraph exact height textboxes
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 16d5c75..2d82e28 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3493,6 +3493,7 @@ RTFFrame::RTFFrame(RTFParserState* pParserState)
nHoriAnchor(0),
nVertAlign(0),
nVertAnchor(0),
+nHRule(NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto),
nAnchorType(0)
{
}
@@ -3580,7 +3581,12 @@ RTFSprms RTFFrame::getSprms()
break;
case NS_sprm::LN_PWHeightAbs:
if ( nH != 0 )
-pValue.reset(new RTFValue(nH));
+{
+if (nHRule ==
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact)
+pValue.reset(new RTFValue(-nH)); // The negative value
just sets nHRule
+else
+pValue.reset(new RTFValue(nH));
+}
break;
case NS_sprm::LN_PDxaWidth:
if ( nW != 0 )
@@ -3610,12 +3616,8 @@ RTFSprms RTFFrame::getSprms()
break;
case NS_ooxml::LN_CT_FramePr_hRule:
{
-sal_Int32 nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_auto;
if ( nH < 0 )
-{
nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_exact;
-nH = -nH; // The negative value just sets nHRule
-}
else if ( nH > 0 )
nHRule =
NS_ooxml::LN_Value_wordprocessingml_ST_HeightRule_atLeast;
pValue.reset(new RTFValue(nHRule));
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 3a148f5..9626063 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -214,6 +214,7 @@ namespace writerfilter {
sal_Int32 nX, nY, nW, nH;
sal_Int32 nHoriPadding, nVertPadding;
sal_Int32 nHoriAlign, nHoriAnchor, nVertAlign, nVertAnchor;
+Id nHRule;
public:
RTFFrame(RTFParserState* pParserState);
sal_Int16 nAnchorType;
commit 3e59fa4f3ba1408939e4f937cea29fa614f84b37
Author: Miklos Vajna
Date: Sat Mar 24 13:04:54 2012 +0100
fdo#47036 fix RTF import of shapes inside text frames at the start of the
doc
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index aca4519..16d5c75 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3266,6 +3266,12 @@ int RTFDocumentImpl::popState()
Mapper().startShape(xShape);
Mapper().endShape();
}
+else if (m_aStates.top().nDestinationState == DESTINATION_SHAPE &&
m_aStates.top().aFrame.inFrame())
+{
+m_aStates.top().resetFrame();
+parBreak();
+m_bNeedPap = true;
+}
// See if we need to end a track change
RTFValue::Pointer_t pTrackchange =
m_aStates.top().aCharacterSprms.find(NS_ooxml::LN_trackchange);
@@ -3493,6 +3499,11 @@ RTFFrame::RTFFrame(RTFParserState* pParserState)
void RTFFrame::setSprm(Id nId, Id nValue)
{
+if (m_pParserState->m_pDocumentImpl->getFirstRun())
+{
+m_pParserState->m_pDocumentImpl->checkFirstRun();
+m_pParserState->m_pDocumentImpl->setNeedPar(false);
+}
switch (nId)
{
case NS_sprm::LN_PDxaWidth:
commit eff7424629df3fa30afb35c56d9605e77c69241e
Author: Miklos Vajna
Date: Sat Mar 24 10:07:40 2012 +0100
rtftok: various refactoring
To allow frame keywords at the start of the document, we need to:
- a single setter method for all frame properties
- make the parser state know about its document
- make the frame know about its parser state
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9600414..aca4519 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -268,7 +268,7 @@
RTFDocumentImpl::RTFDocumentImpl(uno::Reference const& x
m_xFrame(xFrame),
m_xStatusIndicator(xStatusIndicator),
m_nGroup(0),
-m_aDefaultState(),
+m_aDefaultState(this),
m_bSkipUnknown(false),
m_aFontEncodings(),
m_aFontIndexes(),
@@ -413,6 +413,1
[Libreoffice-commits] .: sc/source
sc/source/ui/app/scdll.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 8ae3e12fa8f1a1410622bc2bea1eccdec86e0acf Author: Winfried Donkers Date: Thu Apr 5 11:58:32 2012 +0200 remove unused code diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 2d9af16..505e9fd 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -202,7 +202,6 @@ void ScDLL::Init() SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod); SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod); SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod); -// SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod); SvxColorExtToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod); SvxColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod); SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/cmclayout' - 4 commits - vcl/qa vcl/source
vcl/qa/cppunit/builder/demo.ui | 114 ++---
vcl/source/window/builder.cxx | 18 +++---
2 files changed, 84 insertions(+), 48 deletions(-)
New commits:
commit bc610d9683619c1b9da62ba381f158dcd5ab6ad3
Author: Caolán McNamara
Date: Wed Apr 4 09:30:41 2012 +0100
implement ListBox dropdown
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 0c0cb7c..a22c17d 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -228,6 +228,17 @@
0
+
+
+True
+False
+
+
+True
+True
+1
+
+
False
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 4d02ce3..2780ddf 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -28,12 +28,12 @@
#include
#include
-#include
#include
#include
+#include
#include
#include
-#include
+#include
VclBuilder::VclBuilder(Window *pParent, rtl::OUString sUri)
{
@@ -85,31 +85,31 @@ Window *VclBuilder::makeObject(Window *pParent, const
rtl::OString &name, bool b
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkButton")))
{
-pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new PushButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkRadioButton")))
{
-pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new RadioButton(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkCheckButton")))
{
-pWindow = new CheckBox(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new CheckBox(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkSpinButton")))
{
-pWindow = new NumericField(pParent, WB_RIGHT|WB_SPIN|WB_BORDER);
+pWindow = new NumericField(pParent,
WB_RIGHT|WB_SPIN|WB_BORDER|WB_3DLOOK);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkComboBox")))
{
-pWindow = new ComboBox(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new ListBox(pParent,
WB_DROPDOWN|WB_CENTER|WB_VCENTER|WB_3DLOOK);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkLabel")))
{
-pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER);
+pWindow = new FixedText(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK);
}
else if (name.equalsL(RTL_CONSTASCII_STRINGPARAM("GtkEntry")))
{
-pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER );
+pWindow = new Edit(pParent, WB_LEFT|WB_VCENTER|WB_BORDER|WB_3DLOOK );
}
else
{
commit a86bfdd3b3442996b69d9231444bd6753e73b1f4
Author: Caolán McNamara
Date: Wed Apr 4 09:12:06 2012 +0100
rearrange demo to help glade out
diff --git a/vcl/qa/cppunit/builder/demo.ui b/vcl/qa/cppunit/builder/demo.ui
index 985c866..0c0cb7c 100644
--- a/vcl/qa/cppunit/builder/demo.ui
+++ b/vcl/qa/cppunit/builder/demo.ui
@@ -10,69 +10,6 @@
False
vertical
2
-
-
-True
-False
-
-
-True
-True
-â
-True
-
-
-False
-True
-0
-
-
-
-
-False
-True
-0
-
-
-
-
-True
-False
-
-
-EXPAND
-True
-True
-True
-False
-
-
-True
-True
-0
-
-
-
-
-FILL
-True
-True
-True
-False
-
-
-False
-True
-1
-
-
-
-
-False
-True
-0
-
-
False
@@ -234,6 +171,70 @@
2
+
+
+True
+False
+
+
+EXPAND
+True
+True
+True
+False
+
+
+True
+True
+0
+
+
+
+
+FILL
+True
+True
+True
+Fa
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/dump/dumperbase.hxx | 18 --
oox/inc/oox/dump/oledumper.hxx | 21 ---
oox/source/dump/dumperbase.cxx | 107 -
oox/source/dump/oledumper.cxx | 114
unusedcode.easy | 17 -
5 files changed, 277 deletions(-)
New commits:
commit 07ff032c805835355ff0dff75b8ad534dfb770e9
Author: Petr Vorel
Date: Mon Apr 2 11:40:06 2012 +0200
remove unused code (oox)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 7f18220..a099886 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -395,7 +395,6 @@ public:
// token list -
static void appendToken( ::rtl::OUStringBuffer& rStr, const
::rtl::OUString& rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
-static void appendToken( ::rtl::OUStringBuffer& rStr, sal_Int64
nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
static void appendIndex( ::rtl::OUStringBuffer& rStr, const
::rtl::OUString& rIdx );
static void appendIndex( ::rtl::OUStringBuffer& rStr, sal_Int64
nIdx );
@@ -1074,9 +1073,6 @@ public:
voidwriteColRowRange( sal_Int32 nColRow1, sal_Int32
nColRow2 );
voidwriteColRange( sal_Int32 nCol1, sal_Int32 nCol2 );
voidwriteRowRange( sal_Int32 nRow1, sal_Int32 nRow2 );
-voidwriteAddress( const Address& rPos );
-voidwriteRange( const Range& rRange );
-voidwriteRangeList( const RangeList& rRanges );
template< typename Type >
inline void writeDec( Type nData, sal_Int32 nWidth = 0,
sal_Unicode cFill = ' ' )
@@ -1349,17 +1345,6 @@ protected:
voidwriteArrayItem( const String& rName, const sal_uInt8*
pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
voidwriteDateTimeItem( const String& rName, const
::com::sun::star::util::DateTime& rDateTime );
voidwriteGuidItem( const String& rName, const
::rtl::OUString& rGuid );
-voidwriteColIndexItem( const String& rName, sal_Int32 nCol
);
-voidwriteRowIndexItem( const String& rName, sal_Int32 nRow
);
-voidwriteColRangeItem( const String& rName, sal_Int32
nCol1, sal_Int32 nCol2 );
-voidwriteRowRangeItem( const String& rName, sal_Int32
nRow1, sal_Int32 nRow2 );
-voidwriteAddressItem( const String& rName, const Address&
rPos );
-voidwriteRangeItem( const String& rName, const Range&
rRange );
-voidwriteRangeListItem( const String& rName, const
RangeList& rRanges );
-voidwriteTokenAddressItem( const String& rName, const
TokenAddress& rPos, bool bNameMode );
-voidwriteTokenAddress3dItem( const String& rName, const
::rtl::OUString& rRef, const TokenAddress& rPos, bool bNameMode );
-voidwriteTokenRangeItem( const String& rName, const
TokenRange& rRange, bool bNameMode );
-voidwriteTokenRange3dItem( const String& rName, const
::rtl::OUString& rRef, const TokenRange& rRange, bool bNameMode );
template< typename Type >
voidaddNameToItem( Type nData, const NameListWrapper&
rListWrp );
@@ -1753,9 +1738,6 @@ protected:
const OutputObjectBase& rParent,
const BinaryInputStreamRef& rxStrm,
rtl_TextEncoding eTextEnc );
-voidconstruct(
-const InputObjectBase& rParent,
-rtl_TextEncoding eTextEnc );
virtual boolimplIsValid() const;
virtual voidimplDump();
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 4d3ceaa..64d3d5c 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -84,27 +84,6 @@ protected:
};
//
-
-class StdHlinkObject : public OleInputObjectBase
-{
-public:
-explicitStdHlinkObject( const InputObjectBase& rParent );
-
-protected:
-virtual voidimplDump();
-
-private:
-::rtl::OUString dumpHyperlinkString( const String& rName, bool
bUnicode );
-
-booldumpGuidAndMoniker();
-voiddumpUrlMoniker();
-voiddumpFileMoniker();
-voiddumpItemMoniker();
-voiddumpAntiMoniker();
-voiddumpCompositeMoniker();
-};
-
-//
//
class OleStreamObject : pu
[Libreoffice-commits] .: android/experiments
android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
|6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit 45d1ebeca54c22d35777c57cdbb6b3a9dad55632
Author: Tor Lillqvist
Date: Thu Apr 5 12:13:20 2012 +0300
Open the document read-only
diff --git
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index 93ed87e..1be2395 100644
---
a/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++
b/android/experiments/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -102,16 +102,20 @@ public class DocumentLoader
// Loading the wanted document
com.sun.star.beans.PropertyValue propertyValues[] =
-new com.sun.star.beans.PropertyValue[1];
+new com.sun.star.beans.PropertyValue[2];
propertyValues[0] = new com.sun.star.beans.PropertyValue();
propertyValues[0].Name = "Hidden";
propertyValues[0].Value = new Boolean(true);
+propertyValues[1] = new com.sun.star.beans.PropertyValue();
+propertyValues[1].Name = "ReadOnly";
+propertyValues[1].Value = new Boolean(true);
String sUrl = "file://" + input;
Object oDoc =
xCompLoader.loadComponentFromURL
(sUrl, "_blank", 0, propertyValues);
+Log.i(TAG, "oDoc is " + (oDoc!=null ? oDoc.toString() : "null"));
}
catch (Exception e) {
e.printStackTrace(System.err);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - oovbaapi/ttt.diff sw/CppunitTest_sw_regression_test.mk sw/source
oovbaapi/ttt.diff| 410 ---
sw/CppunitTest_sw_regression_test.mk |4
sw/source/core/layout/paintfrm.cxx | 20 +
3 files changed, 20 insertions(+), 414 deletions(-)
New commits:
commit 5913506b2193e93ca2767ab7365ab2e76ed7848f
Author: Michael Stahl
Date: Wed Apr 4 22:35:08 2012 +0200
fdo#45562: paint borders in SwFlyFrm::Paint:
Painting borders of Flys in the heaven layer cannot be done correctly in
SwRootFrm::Paint, because delaying until then paints over other drawing
objects that are on top of the frame, so do it in SwFlyFrm::Paint,
like the old border painting code used to.
(regression from 804d0a896731629397c5328c13c04a45bc55f459)
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index bac034e..80ec5a1 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3025,8 +3025,6 @@ SwRootFrm::Paint(SwRect const& rRect, SwPrintData
const*const pPrintData) const
if ( bExtraData )
pPage->RefreshExtraData( aPaintRect );
-// have to paint frame borders added in heaven layer here...
-ProcessPrimitives(g_pBorderLines->GetBorderLines_Clear());
DELETEZ(g_pBorderLines);
pVout->Leave();
@@ -3741,12 +3739,28 @@ void SwCellFrm::Paint(SwRect const& rRect, SwPrintData
const*const) const
void MA_FASTCALL lcl_PaintLowerBorders( const SwLayoutFrm *pLay,
const SwRect &rRect, const SwPageFrm *pPage );
+struct BorderLinesGuard
+{
+explicit BorderLinesGuard() : m_pBorderLines(g_pBorderLines)
+{
+g_pBorderLines = new BorderLines;
+}
+~BorderLinesGuard()
+{
+delete g_pBorderLines;
+g_pBorderLines = m_pBorderLines;
+}
+private:
+BorderLines *const m_pBorderLines;
+};
+
void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const
{
//because of the overlapping of frames and drawing objects the flys have to
//paint their borders (and those of the internal ones) directly.
//e.g. #33066#
pLines->LockLines(sal_True);
+BorderLinesGuard blg; // this should not paint borders added from PaintBaBo
SwRect aRect( rRect );
aRect._Intersection( Frm() );
@@ -3957,6 +3971,8 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData
const*const) const
// and then unlock other lines.
pLines->PaintLines( pOut );
pLines->LockLines( sal_False );
+// have to paint frame borders added in heaven layer here...
+ProcessPrimitives(g_pBorderLines->GetBorderLines_Clear());
pOut->Pop();
commit 6e8cbfc63a30c3924d61e22d9cdf43ede78ee288
Author: Michael Stahl
Date: Thu Apr 5 12:10:34 2012 +0200
sw: remove more silly realpath from makefile
diff --git a/sw/CppunitTest_sw_regression_test.mk
b/sw/CppunitTest_sw_regression_test.mk
index ca83d32..27b9c07 100644
--- a/sw/CppunitTest_sw_regression_test.mk
+++ b/sw/CppunitTest_sw_regression_test.mk
@@ -71,8 +71,8 @@ $(eval $(call
gb_CppunitTest_add_linked_libs,sw_regression_test, \
))
$(eval $(call gb_CppunitTest_set_include,sw_regression_test,\
--I$(realpath $(SRCDIR)/sw/source/ui/inc) \
--I$(realpath $(SRCDIR)/sw/inc) \
+-I$(SRCDIR)/sw/source/ui/inc \
+-I$(SRCDIR)/sw/inc \
$$(INCLUDE) \
))
commit cd546c166ed5ec72f97994f2eddf292e06bbb052
Author: Michael Stahl
Date: Thu Apr 5 12:09:57 2012 +0200
oovbaapi: remove bogus ttt.diff
diff --git a/oovbaapi/ttt.diff b/oovbaapi/ttt.diff
deleted file mode 100644
index 4af8d1f..000
--- a/oovbaapi/ttt.diff
+++ /dev/null
@@ -1,410 +0,0 @@
-diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile
-new file mode 100644
/dev/null
-+++ b/oovbaapi/Makefile
-@@ -0,0 +1,38 @@
-+#*
-+#
-+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+#
-+# Copyright 2000, 2010 Oracle and/or its affiliates.
-+#
-+# OpenOffice.org - a multi-platform office productivity suite
-+#
-+# This file is part of OpenOffice.org.
-+#
-+# OpenOffice.org is free software: you can redistribute it and/or modify
-+# it under the terms of the GNU Lesser General Public License version 3
-+# only, as published by the Free Software Foundation.
-+#
-+# OpenOffice.org is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+# GNU Lesser General Public License version 3 for more details
-+# (a copy is included in the LICENSE file that accompanied this code).
-+#
-+# You should have received a copy of the GNU Lesser General Public License
-+# version 3 along with OpenOffice.org. If not, see
-+#
-+# for a copy of the LGPLv3 License.
-+#
-+#**
[Libreoffice-commits] .: sal/qa sal/textenc sal/workben
sal/qa/osl/process/osl_Thread.cxx| 22 +++
sal/qa/rtl_strings/rtl_old_testostring.cxx |1
sal/textenc/tcvtmb.cxx | 26 -
sal/workben/clipboardwben/testcopy/cbcpytest.cxx | 61 ++---
sal/workben/clipboardwben/testpaste/cbptest.cxx | 65 ++-
sal/workben/clipboardwben/testviewer/cbvtest.cxx | 57 +---
sal/workben/testpipe.cxx | 20 +++
7 files changed, 121 insertions(+), 131 deletions(-)
New commits:
commit 8307fe9f65ef6011014d75041b3ddbc90d421b6a
Author: Mark Wolf
Date: Wed Apr 4 17:35:53 2012 -0400
Translated German comments to English in folder 'sal'.
sal/qa/rtl_strings/rtl_old_testostring.cxx contains some German comments
still
but the code itself uses test strings in German. When the test strings
appear
in the comments, they were left unchanged to maintain consistency.
Mark Wolf
diff --git a/sal/qa/osl/process/osl_Thread.cxx
b/sal/qa/osl/process/osl_Thread.cxx
index 47aa9ee..65b2943 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -70,23 +70,23 @@ using namespace osl;
using ::rtl::OString;
//
-
-// Kleine Stopuhr
+// Small stopwatch
class StopWatch {
-TimeValue t1,t2;// Start und Stopzeit
+TimeValue t1,t2;// Start and stoptime
protected:
sal_Int32 m_nNanoSec;
sal_Int32 m_nSeconds;
-bool m_bIsValid; // TRUE, wenn gestartet
und gestoppt
-bool m_bIsRunning; // TRUE, wenn gestartet.
+bool m_bIsValid; // TRUE, when started
and stopped
+bool m_bIsRunning; // TRUE, when started
public:
StopWatch();
~StopWatch() {}
-void start(); // Startet Timer
-void stop(); // Stoppt Timer
+void start(); // Starts time
+void stop(); // Stops time
double getSeconds() const;
double getTenthSec() const;
@@ -94,7 +94,7 @@ public:
// = Stop Watch
=
-// Eine kleine Stop-Uhr fuer den internen Gebrauch.
+// A small stopwatch for internal use
// (c) Lars Langhans 29.12.1996 22:10
StopWatch::StopWatch():m_bIsValid(false),m_bIsRunning(false) {}
@@ -116,12 +116,12 @@ void StopWatch::stop()
// pre: Timer should be started
// post: Timer will stopped
-// gettimeofday(&t2, 0); // Timer ausfragen
+// gettimeofday(&t2, 0); // Ask timer
osl_getSystemTime( &t2 );
t_print("# %u %u nsecs\n", (unsigned) t2.Seconds, (unsigned) t2.Nanosec);
if (m_bIsRunning)
-{// check ob gestartet.
+{// check if started.
m_nSeconds = static_cast(t2.Seconds) -
static_cast(t1.Seconds);
if ( t2.Nanosec > t1.Nanosec )
m_nNanoSec = static_cast(t2.Nanosec) -
static_cast(t1.Nanosec);
@@ -143,8 +143,8 @@ void StopWatch::stop()
double StopWatch::getSeconds() const
{
-// pre: gueltig = TRUE
-// BACK: Zeit in Sekunden.
+// pre: valid = TRUE
+// BACK: time in seconds
double nValue = 0.0;
if (m_bIsValid)
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx
b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 70fca4d..435b428 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -80,7 +80,6 @@ void oldtests::test_OString()
TEST_ENSURE( s2.lastIndexOf('M') == 0, "test_OString error 10");
TEST_ENSURE( s2.lastIndexOf('t', s2.getLength() - 8) == 8, "test_OString
error 9");
-
// "Mein erster RTL OString ist ein String aus der RTL Library\n"
// ||||||||||||
// Index0510 15 20 25 30 35 40 45 50 55
diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx
index cea7cda..c696c84 100644
--- a/sal/textenc/tcvtmb.cxx
+++ b/sal/textenc/tcvtmb.cxx
@@ -160,13 +160,12 @@ sal_Size ImplDBCSToUnicode( const void* pData,
SAL_UNUSED_PARAMETER void*,
if ( !cConv )
{
-/* Wir vergleichen den kompletten Trailbereich den wir */
-/* definieren, der normalerweise groesser sein kann als */
-/* der definierte. Dies machen wir, damit Erweiterungen
von */
-/* uns nicht beruecksichtigten Encodings so weit wie */
-/* moeglich auch richtig zu behandeln, das double byte */
-/* characters auch al
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 25 +-
writerfilter/source/dmapper/PropertyIds.cxx |1
writerfilter/source/dmapper/PropertyIds.hxx |1
3 files changed, 26 insertions(+), 1 deletion(-)
New commits:
commit 1cb273098188b5749109b8f58516e7003600a704
Author: Miklos Vajna
Date: Thu Apr 5 12:06:39 2012 +0200
n#751017 dmapper: fix handling of GetExpression and SetExpression fields
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5ba7ddc..5b1f4d2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2157,6 +2157,8 @@ void DomainMapper_Impl::handleFieldAsk
uno::Reference< beans::XPropertySet > xMaster =
FindOrCreateFieldMaster
("com.sun.star.text.FieldMaster.SetExpression", sVariable );
+// An ASK field is always a string of characters
+xMaster->setPropertyValue(rPropNameSupplier.GetName(PROP_SUB_TYPE),
uno::makeAny(text::SetVariableType::STRING));
// attach the master to the field
uno::Reference< text::XDependentTextField > xDependentField
@@ -2170,6 +2172,9 @@ void DomainMapper_Impl::handleFieldAsk
xFieldProperties->setPropertyValue(
rPropNameSupplier.GetName(PROP_HINT),
uno::makeAny( sHint ));
+
xFieldProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_SUB_TYPE),
uno::makeAny(text::SetVariableType::STRING));
+// The ASK has no field value to display
+
xFieldProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_IS_VISIBLE),
uno::makeAny(sal_False));
}
else
{
@@ -2889,6 +2894,13 @@ void DomainMapper_Impl::CloseFieldCommand()
bool bPageRef = aIt->second.eFieldId == FIELD_PAGEREF;
::rtl::OUString sBookmark =
lcl_ExtractParameter(pContext->GetCommand(),
(bPageRef ? sizeof(" PAGEREF") : sizeof("
REF")));
+
+// Do we need a GetReference (default) or a
GetExpression field?
+uno::Reference< text::XTextFieldsSupplier >
xFieldsSupplier( GetTextDocument(), uno::UNO_QUERY );
+uno::Reference< container::XNameAccess >
xFieldMasterAccess = xFieldsSupplier->getTextFieldMasters();
+
+if
(!xFieldMasterAccess->hasByName("com.sun.star.text.FieldMaster.SetExpression."
+ sBookmark))
+{
xFieldProperties->setPropertyValue(
rPropNameSupplier.GetName(PROP_REFERENCE_FIELD_SOURCE),
uno::makeAny(
sal_Int16(text::ReferenceFieldSource::BOOKMARK)) );
@@ -2919,6 +2931,14 @@ void DomainMapper_Impl::CloseFieldCommand()
}
xFieldProperties->setPropertyValue(
rPropNameSupplier.GetName(
PROP_REFERENCE_FIELD_PART ), uno::makeAny( nFieldPart ));
+}
+else
+{
+xFieldInterface =
m_xTextFactory->createInstance("com.sun.star.text.TextField.GetExpression");
+xFieldProperties.set(xFieldInterface,
uno::UNO_QUERY);
+
xFieldProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_CONTENT),
uno::makeAny(sBookmark));
+
xFieldProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_SUB_TYPE),
uno::makeAny(text::SetVariableType::STRING));
+}
}
break;
case FIELD_REVNUM : break;
@@ -3067,8 +3087,11 @@ void DomainMapper_Impl::SetFieldResult( ::rtl::OUString&
rResult )
else
{
uno::Reference< beans::XPropertySet >
xFieldProperties( xTextField, uno::UNO_QUERY_THROW);
+// In case of SetExpression, the field result contains
the content of the variable.
+uno::Reference
xServiceInfo(xTextField, uno::UNO_QUERY);
+bool bIsSetExpression =
xServiceInfo->supportsService("com.sun.star.text.TextField.SetExpression");
xFieldProperties->setPropertyValue(
-
rPropNameSupplier.GetName(PROP_CURRENT_PRESENTATION),
+rPropNameSupplier.GetName(bIsSetExpression ?
PROP_CONTENT : PROP_CURRENT_PRESENTATION),
uno::makeAny( rResult ));
}
}
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx
b/writerfilter/source/dmapper/PropertyIds.cxx
index 4c176cb..64f562a 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -321,6 +
[Libreoffice-commits] .: Branch 'feature/tubes2' - 2 commits - configure.in tubes/inc tubes/source
configure.in |2
tubes/inc/tubes/conference.hxx | 19 +
tubes/source/conference.cxx| 149 -
3 files changed, 50 insertions(+), 120 deletions(-)
New commits:
commit 263dece8f15e448709d6e4753c5287eae368f147
Author: Will Thompson
Date: Thu Apr 5 10:53:21 2012 +0100
conference: remove a stray dbus-glib import.
This is no longer needed since the switch to using GDBus for the tube
connection.
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index 088bf4b..6841f9a 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -37,7 +37,6 @@
#include
#include
#include
-#include
#include
typedef ::std::queue TelePacketQueue;
commit d157e12e3f204fe41fa37f27e1e6eaf7f29eda20
Author: Will Thompson
Date: Sun Apr 1 15:50:20 2012 +0100
tubes: use tp_dbus_tube_channel_offer/accept_async
I added these to the recently-released telepathy-glib 0.18.0 mainly to
let us simplify the code here. With this new API, tp-glib takes care of
waiting for the state changes, creating the GDBusConnection, etc.
diff --git a/configure.in b/configure.in
index 34a8b8b..ebdf217 100644
--- a/configure.in
+++ b/configure.in
@@ -8369,7 +8369,7 @@ AC_MSG_CHECKING([whether to enable Telepathy support])
if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_telepathy" =
"yes"; then
ENABLE_TELEPATHY="TRUE"
AC_MSG_RESULT([yes])
-PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.17.1 glib-2.0
gobject-2.0 gthread-2.0 gio-2.0 dbus-1 dbus-glib-1 )
+PKG_CHECK_MODULES( TELEPATHY, telepathy-glib >= 0.18.0 glib-2.0
gobject-2.0 gthread-2.0 gio-2.0 )
else
AC_MSG_RESULT([no])
fi
diff --git a/tubes/inc/tubes/conference.hxx b/tubes/inc/tubes/conference.hxx
index fca6e2e..088bf4b 100644
--- a/tubes/inc/tubes/conference.hxx
+++ b/tubes/inc/tubes/conference.hxx
@@ -84,20 +84,14 @@ public:
boolofferTube();
boolacceptTube();
/// got tube accepted on other end as well?
-boolisTubeOpen() const { return meTubeChannelState ==
TP_TUBE_CHANNEL_STATE_OPEN; }
+boolisTubeOpen() const { return mpTube != NULL; }
// Only for callbacks.
voidsetTubeOfferedHandlerInvoked( bool b ) {
mbTubeOfferedHandlerInvoked = b; }
boolisTubeOfferedHandlerInvoked() const { return
mbTubeOfferedHandlerInvoked; }
-boolisTubeChannelStateChangedToOpen() const
-{ return meTubeChannelState ==
TP_TUBE_CHANNEL_STATE_OPEN; };
-voidsetTubeChannelState( TpTubeChannelState eState ) {
meTubeChannelState = eState; }
-
-static void TubeChannelStateChangedHandler(TpChannel*, guint,
void*, GObject*);
-static void TubeOfferedHandler(TpChannel* pChannel, const
gchar* pAddress, const GError* pError,
- gpointer pUserData,
GObject*pWeakObject);
-static void TubeAcceptedHandler(TpChannel* pChannel, const
gchar* pAddress, const GError* pError,
- gpointer pUserData,
GObject*pWeakObject);
+
+static void TubeOfferedHandler(GObject* pSource, GAsyncResult*
pResult, gpointer pUserData);
+static void TubeAcceptedHandler(GObject* pSource,
GAsyncResult* pResult, gpointer pUserData);
static void FTReady( EmpathyFTHandler *handler, GError *error,
gpointer user_data);
static void methodCallHandler(GDBusConnection*
pConnection,
@@ -110,9 +104,8 @@ public:
void*
pUserData);
private:
-booltryToOpen();
boolspinUntilTubeEstablished();
-boolsetTube( const char* pTube );
+boolsetTube( GDBusConnection* pTube);
rtl::OStringmaSessionId;
TeleManager*mpManager;
@@ -122,7 +115,6 @@ private:
GDBusConnection*mpTube;
guint maObjectRegistrationId;
TelePacketQueue maPacketQueue;
-TpTubeChannelState meTubeChannelState;
boolmbTubeOfferedHandlerInvoked : 1;
diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx
index 1cd9248..3df23c6 100644
--- a/tubes/source/conference.cxx
+++ b/tubes/source/conference.cxx
@@ -142,80 +142,62 @@ static void TeleConference_ChannelCloseHandler(
void TeleConference::TubeOfferedHandler(
-TpChannel* pBaseChannel,
-const gchar*pAddress,
-const GError* pError,
-gpointerpUserData,
-GObject*/*weak_object*/
-)
+GObject* pSource,
+GAsyncResult* pResult,
+gp
[Libreoffice-commits] .: starmath/source
starmath/source/dialog.cxx | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 85197292605df14a10c6ee3ee75e614b2abf1c7d
Author: Olivier Hallot
Date: Thu Apr 5 06:22:07 2012 -0300
Remove macro RTL_CONSTASCII_USTRINGPARAM
Remove macro RTL_CONSTASCII_USTRINGPARAM in starmath (partial)
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 0437c0c..0871fec 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -334,7 +334,7 @@ IMPL_LINK( SmFontDialog, HelpButtonClickHdl, Button *,
EMPTYARG /*pButton*/ )
Help* pHelp = Application::GetHelp();
if( pHelp )
{
-pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"HID_SMA_FONTDIALOG" ) ), &aHelpButton1 );
+pHelp->Start( rtl::OUString( "HID_SMA_FONTDIALOG" ), &aHelpButton1 );
}
return 0;
}
@@ -457,7 +457,7 @@ IMPL_LINK( SmFontSizeDialog, HelpButtonClickHdl, Button *,
EMPTYARG /*pButton*/
Help* pHelp = Application::GetHelp();
if( pHelp )
{
-pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"HID_SMA_FONTSIZEDIALOG" ) ), &aHelpButton1 );
+pHelp->Start( rtl::OUString( "HID_SMA_FONTSIZEDIALOG" ), &aHelpButton1
);
}
return 0;
}
@@ -577,7 +577,7 @@ IMPL_LINK( SmFontTypeDialog, HelpButtonClickHdl, Button *,
EMPTYARG /*pButton*/
Help* pHelp = Application::GetHelp();
if( pHelp )
{
-pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"HID_SMA_FONTTYPEDIALOG" ) ), &aHelpButton1 );
+pHelp->Start( rtl::OUString( "HID_SMA_FONTTYPEDIALOG" ), &aHelpButton1
);
}
return 0;
}
@@ -790,7 +790,7 @@ IMPL_LINK( SmDistanceDialog, HelpButtonClickHdl, Button *,
EMPTYARG /*pButton*/
Help* pHelp = Application::GetHelp();
if( pHelp )
{
-pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"HID_SMA_DISTANCEDIALOG" ) ), &aHelpButton1 );
+pHelp->Start( rtl::OUString( "HID_SMA_DISTANCEDIALOG" ), &aHelpButton1
);
}
return 0;
}
@@ -1113,7 +1113,7 @@ IMPL_LINK( SmAlignDialog, HelpButtonClickHdl, Button *,
EMPTYARG /*pButton*/ )
Help* pHelp = Application::GetHelp();
if( pHelp )
{
-pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"HID_SMA_ALIGNDIALOG" ) ), &aHelpButton1 );
+pHelp->Start( rtl::OUString( "HID_SMA_ALIGNDIALOG" ), &aHelpButton1 );
}
return 0;
}
@@ -1559,7 +1559,7 @@ IMPL_LINK( SmSymbolDialog, HelpButtonClickHdl, Button *,
EMPTYARG /*pButton*/ )
Help* pHelp = Application::GetHelp();
if( pHelp )
{
-pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"HID_SMA_SYMBOLDIALOG" ) ), &aHelpBtn );
+pHelp->Start( rtl::OUString( "HID_SMA_SYMBOLDIALOG" ), &aHelpBtn );
}
return 0;
}
@@ -2096,7 +2096,7 @@ IMPL_LINK( SmSymDefineDialog, HelpButtonClickHdl, Button
*, EMPTYARG /*pButton*/
Help* pHelp = Application::GetHelp();
if( pHelp )
{
-pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
"HID_SMA_SYMDEFINEDIALOG" ) ), &aHelpBtn );
+pHelp->Start( rtl::OUString( "HID_SMA_SYMDEFINEDIALOG" ), &aHelpBtn );
}
return 0;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - svx/inc svx/source
svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx |3 -
svx/inc/svx/tbcontrl.hxx | 39 -
svx/source/sdr/attribute/sdrfilltextattribute.cxx |7 ---
svx/source/tbxctrls/tbcontrl.cxx |1
4 files changed, 50 deletions(-)
New commits:
commit 11f5d3db58dcce64a964d1e4d26eb81e2bb709f1
Author: Winfried Donkers
Date: Thu Apr 5 14:34:22 2012 +0530
Unused code removal.
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 7cc2479..fcf3e5d 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -48,14 +48,6 @@
Additional information
from DocShell: SvxFontListItem (SID_ATTR_CHAR_FONTLIST)
-SvxFontHeightToolBoxControl
----
-Item type: SvxFontHeightItem
-Execute-Id: SID_ATTR_CHAR_FONTHEIGHT
--> SvxFontHeightItem
-Additional information
-from DocShell: SvxFontListItem (SID_ATTR_CHAR_FONTLIST)
-
SvxFontColorToolBoxControl
--
Item type: SvxFontColorItem
@@ -173,7 +165,6 @@
class SvxLineItem;
class SvxBoxInfoItem;
class SvxFontItem;
-class SvxFontHeightItem;
class SfxStyleControllerItem_Impl;
class SfxStyleSheetBasePool;
class SfxTemplateItem;
@@ -256,35 +247,6 @@ public:
//
-// class SvxFontHeightToolBoxControl -
-//
-
-/*
-class SvxFontSizeItem;
-class SvxFontItem;
-class SvxFontSizeBox_Impl;
-
-class SVX_DLLPUBLIC SvxFontHeightToolBoxControl : public SfxToolBoxControl
-{
-SvxFontSizeBox_Impl* pBox; // ItemWindow f"ur
quick-access
-::com::sun::star::awt::FontDescriptor aCurrentFont; // Kopie des aktuellen
Fonts
-
-public:
-SFX_DECL_TOOLBOX_CONTROL();
-SvxFontHeightToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox&
rTbx );
-~SvxFontHeightToolBoxControl();
-
-// new controller API
-// XStatusListener
-virtual void SAL_CALL statusChanged( const
::com::sun::star::frame::FeatureStateEvent& Event )
-throw ( ::com::sun::star::uno::RuntimeException );
-
-virtual Window* CreateItemWindow( Window *pParent );
-};
-*/
-
-
-//
// class SvxFontColorToolBoxControl --
//
@@ -334,7 +296,6 @@ public:
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
virtual voidSelect( sal_Bool bMod1 = sal_False );
-
};
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f9f25a8..b504d68 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -68,7 +68,6 @@
#include
#include
#include
-#include
#include
#include
commit 62f5df61ff89269e177dd2b8a9d939f49cdbea2d
Author: Santiago Martinez
Date: Thu Apr 5 14:33:20 2012 +0530
Unused code removal.
diff --git a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
index 30fad2d..3dfeea9 100644
--- a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
@@ -56,9 +56,6 @@ namespace drawinglayer
SdrFillTextAttribute(const SdrFillTextAttribute& rCandidate);
SdrFillTextAttribute& operator=(const SdrFillTextAttribute&
rCandidate);
-// checks if the incarnation is default constructed
-bool isDefault() const;
-
// compare operator
bool operator==(const SdrFillTextAttribute& rCandidate) const;
diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx
b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
index 3ab55bd..f36cf7f 100644
--- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
@@ -68,13 +68,6 @@ namespace drawinglayer
return *this;
}
-bool SdrFillTextAttribute::isDefault() const
-{
-return(getFill().isDefault()
-&& getFillFloatTransGradient().isDefault()
-&& getText().isDefault());
-}
-
bool SdrFillTextAttribute::operator==(const SdrFillTextAttribute&
rCandidate) const
{
return(getFill() == rCandidate.getFill()
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
