Skip to content

C
core
Kaydet (Commit) f18378b2 authored tarafından Petr Mladek's avatar Petr Mladek
Dosyalara gözat
Seçenekler

Merge remote-tracking branch 'origin/libreoffice-3-4'

üst 34d4fb1f c385e76c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 402 deletions
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
Dosyayı görüntüle @ f18378b2
......@@ -1147,17 +1147,18 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables(
switch (m_pConnection->getSDBCAddressType()) {
case SDBCAddress::EVO_GWISE:
if (0==strncmp( "groupwise://", p, 11 ))
if ( !strncmp( "groupwise://", p, 11 ))
break;
else
continue;
case SDBCAddress::EVO_LOCAL:
if (0==strncmp( "file://", p, 6 ))
if ( !strncmp( "file://", p, 6 ) ||
!strncmp( "local://", p, 6 ) )
break;
else
continue;
case SDBCAddress::EVO_LDAP:
if (0==strncmp( "ldap://", p, 6 ))
if ( !strncmp( "ldap://", p, 6 ))
break;
else
continue;
......
connectivity/source/drivers/evoab2/NResultSet.cxx
Dosyayı görüntüle @ f18378b2
......@@ -182,7 +182,8 @@ static bool isLDAP( EBook *pBook )
static bool isLocal( EBook *pBook )
{
return pBook && !strncmp( "file://", e_book_get_uri( pBook ), 6 );
return pBook && ( !strncmp( "file://", e_book_get_uri( pBook ), 6 ) ||
!strncmp( "local:", e_book_get_uri( pBook ), 6 ) );
}
static bool isAuthRequired( EBook *pBook )
......
desktop/unx/source/splashx.c
Dosyayı görüntüle @ f18378b2
......@@ -336,6 +336,7 @@ static void create_pixmap()
int x, y; \
for ( y = 0; y < height; ++y ) \
{ \
out = data + y * bytes_per_line; \
unsigned long red_delta = 0, green_delta = 0, blue_delta = 0; \
color_t *in = (color_t *)bitmap_rows[y]; \
for ( x = 0; x < width; ++x, ++in ) \
......@@ -379,7 +380,7 @@ static void create_pixmap()
{
if ( machine_byte_order == byte_order && byte_order == LSBFirst )
COPY_IN_OUT( 3, *( (color_t *)out ) = *( (color_t *)( &pixel ) ); out += 3; )
if ( machine_byte_order == byte_order && byte_order == MSBFirst )
else if ( machine_byte_order == byte_order && byte_order == MSBFirst )
COPY_IN_OUT( 3, uint32_t tmp = pixel;
*( (uint8_t *)out ) = *( (uint8_t *)(&tmp) + 1 );
*( (uint8_t *)out + 1 ) = *( (uint8_t *)(&tmp) + 2 );
......
embeddedobj/source/msole/oleregister.cxx
Dosyayı görüntüle @ f18378b2
......@@ -84,42 +84,6 @@ void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServic
return pRet;
}
sal_Bool SAL_CALL component_writeInfo( void * /*pServiceManager*/, void * pRegistryKey )
{
if (pRegistryKey)
{
try
{
uno::Reference< registry::XRegistryKey > xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) );
uno::Reference< registry::XRegistryKey > xNewKey;
xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
OleEmbeddedObjectFactory::impl_staticGetImplementationName() +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
uno::Sequence< ::rtl::OUString > rServices = OleEmbeddedObjectFactory::impl_staticGetSupportedServiceNames();
for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
xNewKey->createKey( rServices.getConstArray()[ind] );
#ifdef WNT
// the following service makes sence only on windows
xNewKey = xKey->createKey( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
MSOLEDialogObjectCreator::impl_staticGetImplementationName() +
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
rServices = MSOLEDialogObjectCreator::impl_staticGetSupportedServiceNames();
for( sal_Int32 ind = 0; ind < rServices.getLength(); ind++ )
xNewKey->createKey( rServices.getConstArray()[ind] );
#endif
return sal_True;
}
catch (registry::InvalidRegistryException &)
{
OSL_FAIL( "### InvalidRegistryException!" );
}
}
return sal_False;
}
} // extern "C"
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
fpicker/prj/d.lst
Dosyayı görüntüle @ f18378b2
......@@ -10,10 +10,4 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
..\%__SRC%\misc\fop.component %_DEST%\xml%_EXT%\fop.component
..\%__SRC%\misc\fpicker.component %_DEST%\xml%_EXT%\fpicker.component
..\%__SRC%\misc\fps.component %_DEST%\xml%_EXT%\fps.component
..\%__SRC%\misc\fps_aqua.component %_DEST%\xml%_EXT%\fps_aqua.component
..\%__SRC%\misc\fps_gnome.component %_DEST%\xml%_EXT%\fps_gnome.component
..\%__SRC%\misc\fps_kde4.component %_DEST%\xml%_EXT%\fps_kde4.component
..\%__SRC%\misc\fps_office.component %_DEST%\xml%_EXT%\fps_office.component
..\%__SRC%\misc\*.component %_DEST%\xml%_EXT%\*.component
framework/source/lomenubar/exports.cxx
Dosyayı görüntüle @ f18378b2
......@@ -53,37 +53,12 @@ static void writeInfo(const css::uno::Reference< css::registry::XRegistryKey >&
extern "C"
{
//==================================================================================================
SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(const sal_Char** ppEnvTypeName,
uno_Environment** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
//==================================================================================================
SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(void* /*pServiceManager*/,
void* pRegistryKey )
{
if (!pRegistryKey)
return sal_False;
try
{
css::uno::Reference< css::registry::XRegistryKey > xKey(reinterpret_cast< css::registry::XRegistryKey* >(pRegistryKey), css::uno::UNO_QUERY);
writeInfo( xKey, DESKTOPJOB_IMPLEMENTATION_NAME, DESKTOPJOB_SERVICE_NAME);
writeInfo( xKey, FRAMEJOB_IMPLEMENTATION_NAME, FRAMEJOB_SERVICE_NAME);
return sal_True;
}
catch(const css::registry::InvalidRegistryException&)
{ OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); }
return sal_False;
}
//==================================================================================================
SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* pImplName ,
void* pServiceManager,
void* /*pRegistryKey*/ )
......
sfx2/inc/about.hxx deleted 100644 → 0
Dosyayı görüntüle @ 34d4fb1f
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* 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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _ABOUT_HXX
#define _ABOUT_HXX
// include ---------------------------------------------------------------
#include <tools/resary.hxx>
#include <vcl/button.hxx>
#include <vcl/accel.hxx>
#include <svtools/svmedit.hxx>
#include <svtools/stdctrl.hxx>
#include "svtools/fixedhyper.hxx"
#include <sfx2/basedlgs.hxx> // SfxModalDialog
#include <vector>
typedef ::std::vector< Accelerator* > AccelList;
// class AboutDialog -----------------------------------------------------
class AboutDialog : public SfxModalDialog
{
private:
OKButton aOKButton;
Image aAppLogo;
MultiLineEdit aVersionText;
MultiLineEdit aCopyrightText;
svt::FixedHyperlink aInfoLink;
ResStringArray aDeveloperAry;
String aDevVersionStr;
String aAccelStr;
String aVersionData;
String aVersionTextStr;
String aCopyrightTextStr;
String aLinkStr;
AccelList aAccelList;
AutoTimer aTimer;
long nOff;
long m_nDeltaWidth;
int m_nPendingScrolls;
BOOL bNormal;
protected:
virtual BOOL Close();
virtual void Paint( const Rectangle& );
public:
AboutDialog( Window* pParent, const ResId& rId, const String& rVerStr );
~AboutDialog();
DECL_LINK( TimerHdl, Timer * );
DECL_LINK( AccelSelectHdl, Accelerator * );
DECL_LINK( HandleHyperlink, svt::FixedHyperlink * );
};
#endif // #ifndef _ABOUT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sfx2/inc/sfx2/sfx.hrc
Dosyayı görüntüle @ f18378b2
......@@ -200,16 +200,11 @@
#define RID_DEFAULTINTRO (RID_SFX_START+0)
#define RID_DEFAULTINTRO_ADABAS (RID_SFX_START+1)
#define RID_DEFAULTINTRO_PORTAL (RID_SFX_START+2)
#define RID_DEFAULT_ABOUT_BMP_LOGO (RID_SFX_START+3)
#define RID_STYLECATALOG (RID_SFX_START+1201)
#define RID_DEFAULTABOUT (RID_SFX_START+0)
#define ABOUT_FTXT_LINK 3
#define ABOUT_STR_VERSION 4
#define ABOUT_STR_COPYRIGHT 5
#define ABOUT_STR_LINK 6
#define RID_APPTITLE (RID_SFX_START+4)
#define RID_DOCALREADYLOADED_DLG (RID_SFX_START+1)
......
sfx2/source/dialog/about.cxx deleted 100644 → 0
Dosyayı görüntüle @ 34d4fb1f
This diff is collapsed.
svx/AllLangResTarget_about.mk deleted 100644 → 0
Dosyayı görüntüle @ 34d4fb1f
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# Copyright 2000, 2011 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
# <http://www.openoffice.org/license.html>
# for a copy of the LGPLv3 License.
#
#*************************************************************************
$(eval $(call gb_AllLangResTarget_AllLangResTarget,about))
$(eval $(call gb_AllLangResTarget_set_reslocation,about,svx))
$(eval $(call gb_AllLangResTarget_add_srs,about,svx/about))
$(eval $(call gb_SrsTarget_SrsTarget,svx/about))
$(eval $(call gb_SrsTarget_set_include,svx/about,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
-I$(SRCDIR)/svx/inc/ \
))
$(eval $(call gb_SrsTarget_add_files,svx/about,\
svx/source/intro/about_ooo.src \
))
svx/source/intro/about_ooo.hrc deleted 100755 → 0
Dosyayı görüntüle @ 34d4fb1f
This diff is collapsed.
svx/source/intro/iso.src deleted 100644 → 0
Dosyayı görüntüle @ 34d4fb1f
This diff is collapsed.
svx/source/intro/ooo.src deleted 100644 → 0
Dosyayı görüntüle @ 34d4fb1f
/*************************************************************************
*
* 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
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _SVTOOLS_HRC
#include <svtools/svtools.hrc>
#endif
#ifndef _SVTOOLS_IMAGEMGR_HRC
#include <svtools/imagemgr.hrc>
#endif
#ifndef _SFX_HRC
#include <sfx2/sfx.hrc>
#endif
#include <svx/svxids.hrc>
#include "intro.hrc"
String RID_APPTITLE
{
Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ;
};
// der String wird fuer die Registrierung gebraucht: 01 Voll, 02 OEM, 03 Vobis
String STR_VERSION_TYPE
{
Text = "01";
};
// der String wird fuer die Registrierung gebraucht - hier steht die Version zweistellig!
String STR_VERSION_ID
{
Text = "50";
};
String RID_BUILDVERSION
{
Text = UPDVER ;
};
ModalDialog RID_DEFAULTABOUT
{
OutputSize = TRUE ;
Size = MAP_APPFONT ( 245 , 280 ) ;
Moveable = TRUE ;
SVLook = TRUE ;
TEXT_DEFAULTABOUT
OKButton ABOUT_BTN_OK
{
DefButton = TRUE ;
Pos = MAP_APPFONT ( 174 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
};
MultiLineEdit ABOUT_FTXT_VERSION
{
Border = FALSE ;
Pos = MAP_APPFONT ( 54 , 6 ) ;
Size = MAP_APPFONT ( 118 , 16 ) ;
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
AutoVScroll = TRUE ;
};
MultiLineEdit ABOUT_FTXT_COPYRIGHT
{
Border = FALSE ;
Pos = MAP_APPFONT ( 54 , 25 ) ;
Size = MAP_APPFONT ( 168 , 71 ) ;
IgnoreTab = TRUE ;
ReadOnly = TRUE ;
AutoVScroll = TRUE ;
};
FixedText ABOUT_FTXT_LINK
{
NoLabel = TRUE;
TabStop = TRUE;
Text [ en-US ] = "Contributor credits";
Pos = MAP_APPFONT ( 54 , 100 ) ;
Size = MAP_APPFONT ( 168 , 10 ) ;
};
String ABOUT_STR_VERSION
{
Text[ en-US ] = "%PRODUCTNAME %ABOUTBOXPRODUCTVERSION %PRODUCTEXTENSION";
};
String ABOUT_STR_COPYRIGHT
{
Text[ en-US ] = "Copyright © 2000, 2010 LibreOffice contributors and/or their affiliates. All rights reserved.\nThis product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyright 2000, 2010 Oracle and/or its affiliates.\n%OOOVENDOR acknowledges all community members, please find more info at the link below:";
};
String ABOUT_STR_LINK
{
Text[ en-US ] = "http://www.libreoffice.org/credits.html";
};
StringArray ABOUT_STR_DEVELOPER_ARY
{
OOO_CONTRIBUTOR_LIST
};
String ABOUT_STR_ACCEL
{
Text = "SDT" ;
};
};
// imagelist with images of the "New" menu and the file open dialog
#define MASK_COL2 MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; } ;
#define X_IMAGE_LIST \
IdList = { \
IMG_IMPRESS ; \
IMG_CALC ; \
IMG_CALCTEMPLATE ; \
IMG_CHART ; \
IMG_IMPRESSTEMPLATE ; \
IMG_HTML ; \
IMG_MATH ; \
IMG_WRITER ; \
IMG_WRITERTEMPLATE ; \
IMG_MACROLIB ; \
IMG_GLOBAL_DOC ; \
IMG_DRAW ; \
IMG_DRAWTEMPLATE ; \
IMG_NEWFROMTEMPLATE ; \
IMG_DATABASE; \
}; \
IdCount = { \
15; \
};
ImageList RID_SVTOOLS_IMAGELIST_BIG
{
Prefix = "lx";
MASK_COL2
X_IMAGE_LIST
};
ImageList RID_SVTOOLS_IMAGELIST_SMALL
{
Prefix = "sx";
MASK_COL2
X_IMAGE_LIST
};
#define MASK_COL MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; } ;
#define IMGLST_IDLST \
IdList = { \
SID_GENERAL_OPTIONS; \
SID_LANGUAGE_OPTIONS; \
SID_INET_DLG; \
SID_SW_EDITOPTIONS; \
SID_SW_ONLINEOPTIONS; \
SID_SC_EDITOPTIONS; \
SID_SD_EDITOPTIONS; \
SID_SD_GRAPHIC_OPTIONS; \
SID_SM_EDITOPTIONS; \
SID_SCH_EDITOPTIONS; \
SID_SB_STARBASEOPTIONS; \
SID_FILTER_DLG; \
}; \
IdCount = { \
12; \
};
ImageList RID_IMGLIST_TREEOPT
{
Prefix = "tr";
MASK_COL
IMGLST_IDLST
};
uui/source/openlocked.cxx
Dosyayı görüntüle @ f18378b2
......@@ -44,6 +44,15 @@ OpenLockedQueryBox::OpenLockedQueryBox( Window* pParent, ResMgr* pResMgr, const
AddButton( BUTTON_CANCEL, RET_CANCEL, BUTTONDIALOG_CANCELBUTTON );
SetButtonHelpText( RET_YES, String() );
SetButtonHelpText( RET_NO, String() );
#ifdef WNT
// bnc#656566
// Yes, it is silly to do this only for this dialog but not the
// other similar ones. But hey, it was about this dialog that the
// customer complained. You who read this and feel the itch, feel
// free to fix the problem in a better way.
EnableAlwaysOnTop( true );
#endif
}
OpenLockedQueryBox::~OpenLockedQueryBox()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment